Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create geoip plugin #4688

Merged
merged 23 commits into from
Jul 14, 2021
Merged

Create geoip plugin #4688

merged 23 commits into from
Jul 14, 2021

Conversation

snebel29
Copy link
Collaborator

@snebel29 snebel29 commented Jun 13, 2021 •
edited
Loading

1. Why is this pull request needed and what does it do?

This plugin add support for configuring maxmind geoIP2 City database to add geo location data to request metadata.

2. Which issues (if any) are related?

Discussed in #4685.

3. Which documentation changes (if any) need to be made?

I still have to check everywhere a documentation change is required.

4. Does this introduce a backward incompatible change or deprecation?

As a new plugin there is no backward incompatible changes.

@snebel29 snebel29 marked this pull request as draft June 13, 2021 20:27
@snebel29 snebel29 force-pushed the plugin/create-mmdb branch 2 times, most recently from 5359059 to d012dce Compare June 13, 2021 20:35
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/README.md Outdated Show resolved Hide resolved
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/README.md Outdated Show resolved Hide resolved
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/README.md Outdated Show resolved Hide resolved
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/README.md Outdated Show resolved Hide resolved
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/README.md Outdated Show resolved Hide resolved
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/README.md Outdated Show resolved Hide resolved
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/README.md Outdated Show resolved Hide resolved
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/README.md Outdated Show resolved Hide resolved
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/README.md Outdated Show resolved Hide resolved
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/README.md Outdated Show resolved Hide resolved
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/README.md Outdated Show resolved Hide resolved
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/README.md Outdated Show resolved Hide resolved
miekg
miekg reviewed Jun 14, 2021
View reviewed changes
plugin/mmdb/mmdb.go Outdated Show resolved Hide resolved
snebel29 and others added 19 commits July 13, 2021 16:53
@snebel29 @miekg
Update plugin/geoip/README.md
9d9a23a 
Co-authored-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29 @miekg
Update plugin/geoip/README.md
0ed1d33 
Co-authored-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Move DBFILE bullet below example
8f8c896 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29 @miekg
Update plugin/geoip/README.md
946d047 
Co-authored-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Remove plugin name test case
f3e80fa 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Remove languages option
8edc6f6 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Update free database link
e3b512d 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Remove last language bits
b5f3282 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Use 127.0.0.1 as probing IP
c3b84a1 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29 @miekg
Update plugin/geoip/geoip.go
c331b38 
Co-authored-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29 @miekg
Update plugin/geoip/geoip.go
a1b3c3f 
Co-authored-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Use relative path for fixtures dir
32bcbed 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Set names with default string zero value
33e33de 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Remove unused db types
77ffd3f 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Remove non city databases in testdata
38b5585 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Remove create databases main
2722ff7 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Fix metadata label format test case
0feee7b 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Fix import path block
66c6db0 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
go fmt after changes
afc5301 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29 snebel29 force-pushed the plugin/create-mmdb branch from 6051586 to afc5301 Compare July 13, 2021 15:54
@snebel29
Tidy up go.mod and go.sum
bda1da5 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Copy link
Collaborator Author

snebel29 commented Jul 13, 2021 •
edited
Loading

@miekg

I just rebased all changes from master and resolved the conflicts in go.mod and go.sum followed by a go mod tidy, after that I also created a plugin line (sorted) in CODEOWNERS with you (should it be you and me or just me?) followed by me.

Is that everything?

@snebel29
Add plugin to CODEOWNERS
37e6d61 
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
@snebel29
Copy link
Collaborator Author

Go Covergae check failed, with what smells some sort of flaky test

--- FAIL: TestMultiZoneBlockConfigs (0.00s)
    server_test.go:124: Could not get CoreDNS serving instance: Listen: listen tcp :40000: bind: address already in use

@miekg
Copy link
Member

miekg commented Jul 14, 2021

yes, that test turns out to be flaky, in general fix port numbers are a bad idea, but there you sorta need it... Maybe some stupid retrying is in order there.

@miekg miekg merged commit 21f1207 into coredns:master Jul 14, 2021
@snebel29 snebel29 deleted the plugin/create-mmdb branch July 14, 2021 07:39
@snebel29
Copy link
Collaborator Author

Thanks!

jinglina pushed a commit to jinglina/coredns that referenced this pull request Dec 23, 2021
@snebel29 @miekg @jinglina
Create geoip plugin (coredns#4688)
bc86203 
* Create geoip plugin

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Update plugin/geoip/README.md

Co-authored-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Update plugin/geoip/README.md

Co-authored-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Update plugin/geoip/README.md

Co-authored-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Move DBFILE bullet below example

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Update plugin/geoip/README.md

Co-authored-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Remove plugin name test case

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Remove languages option

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Update free database link

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Remove last language bits

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Use 127.0.0.1 as probing IP

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Update plugin/geoip/geoip.go

Co-authored-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Update plugin/geoip/geoip.go

Co-authored-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Use relative path for fixtures dir

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Set names with default string zero value

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Remove unused db types

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Remove non city databases in testdata

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Remove create databases main

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Fix metadata label format test case

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Fix import path block

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* go fmt after changes

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Tidy up go.mod and go.sum

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

* Add plugin to CODEOWNERS

Signed-off-by: Sven Nebel <nebel.sven@gmail.com>

Co-authored-by: Miek Gieben <miek@miek.nl>
Signed-off-by: jinglinax@163.com <jinglinax@163.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miekg miekg miekg approved these changes

@bradbeam bradbeam Awaiting requested review from bradbeam bradbeam is a code owner

@chrisohaver chrisohaver Awaiting requested review from chrisohaver chrisohaver is a code owner

@dilyevsky dilyevsky Awaiting requested review from dilyevsky dilyevsky is a code owner

@greenpau greenpau Awaiting requested review from greenpau greenpau is a code owner

@Isolus Isolus Awaiting requested review from Isolus Isolus is a code owner

@johnbelamaric johnbelamaric Awaiting requested review from johnbelamaric johnbelamaric is a code owner

@pmoroney pmoroney Awaiting requested review from pmoroney pmoroney is a code owner

@rajansandeep rajansandeep Awaiting requested review from rajansandeep rajansandeep is a code owner

@stp-ip stp-ip Awaiting requested review from stp-ip stp-ip is a code owner

@SuperQ SuperQ Awaiting requested review from SuperQ SuperQ is a code owner

@yongtang yongtang Awaiting requested review from yongtang yongtang is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@snebel29 @miekg