Skip to content

Commit 3eb9752

Browse files
damturdamtur
authored
Merge pull request #75 from sagikazarmark/updates
Various updates that bring the module up to modern standards
2 parents fce5cf4 + 0391efb commit 3eb9752

18 files changed

+270
-126
lines changed

‎.github/workflows/ci.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
pull_request:
6+
branches:
7+
- master
8+
9+
jobs:
10+
build:
11+
name: Build
12+
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
go: ["1.15", "1.16"]
16+
eureka: ["1.1.147", "1.3.1"]
17+
env:
18+
GOFLAGS: -mod=readonly
19+
20+
steps:
21+
- name: Set up Go
22+
uses: actions/setup-go@v2
23+
with:
24+
go-version: ${{ matrix.go }}
25+
26+
- name: Checkout code
27+
uses: actions/checkout@v2
28+
29+
- name: Launch Eureka
30+
env:
31+
EUREKA_VERSION: ${{ matrix.eureka }}
32+
run: |
33+
cp docker-compose.override.yml.dist docker-compose.override.yml
34+
docker-compose up -d
35+
echo "Waiting for Eureka to come up"
36+
sleep 120
37+
38+
- name: Run tests
39+
run: go test -v ./...

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
*.test
22
eureka
33
.vagrant/
4-
.idea/
4+
.idea/
5+
6+
/docker-compose.override.yml

‎Godeps/Godeps.json

-45
This file was deleted.

‎Godeps/Readme

-5
This file was deleted.

‎LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2013 Hudl <@Hudl>
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to
7+
deal in the Software without restriction, including without limitation the
8+
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
9+
sell copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
20+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
21+
IN THE SOFTWARE.

‎README.md

+8-46
Original file line numberDiff line numberDiff line change
@@ -115,62 +115,24 @@ get started.
115115

116116
1. Clone Fargo
117117
1. If you don't have it, [install Docker](https://docs.docker.com/).
118-
1. Change into the `docker` directory of this repository.
119118

120119
```bash
121-
# Build the image, change "1.3.1" to 1.1.147 for the older version
122-
VERSION=1.3.1
123-
docker build -f Dockerfile-v$VERSION -t hudloss/eureka:$VERSION .
124-
# Run two copies of the image (the containers will communicate with each other)
125-
docker run -d --name eureka1 hudloss/eureka:$VERSION
126-
docker run -d --name eureka2 hudloss/eureka:$VERSION
127-
128-
docker build -f Dockerfile-fargo-master -t hudloss/fargo:master .
129-
130-
# Run fargo container which launches shell
131-
docker run --name fargo -it hudloss/fargo:master
132-
# Once shell is attached, checkout your branch and run `go test ./...`
133-
```
120+
# Defaults to 1.1.147, can be set to 1.3.1
121+
EUREKA_VERSION=1.1.147
134122

135-
Once all containers are running, please check that the IP addresses for
136-
`eureka1` and `eureka2` are `172.17.0.2` and `172.17.0.3`. Eureka apps
137-
will be available at those IPs on port 8080 from inside containers.
138-
To expose the ports to your local machine, start containers using:
123+
cp docker-compose.override.yml.dist docker-compose.override.yml
139124

140-
```bash
141-
# forward port 8080 to local port 48000
142-
docker run -d -p 48000:8080 --name eureka1 hudloss/eureka:1.1.147
143-
# forward port 8080 to local port 49000
144-
docker run -d -p 49000:8080 --name eureka2 hudloss/eureka:1.3.1
125+
docker-compose up -d
126+
127+
# Run the tests
145128
```
146129

130+
147131
# Contributors
148132

149133
* Ryan S. Brown (ryansb)
150134
* Carl Quinn (cquinn)
151135

152136
# MIT License
153137

154-
```
155-
The MIT License (MIT)
156-
157-
Copyright (c) 2013 Hudl <@Hudl>
158-
159-
Permission is hereby granted, free of charge, to any person obtaining a copy
160-
of this software and associated documentation files (the "Software"), to
161-
deal in the Software without restriction, including without limitation the
162-
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
163-
sell copies of the Software, and to permit persons to whom the Software is
164-
furnished to do so, subject to the following conditions:
165-
166-
The above copyright notice and this permission notice shall be included in
167-
all copies or substantial portions of the Software.
168-
169-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
170-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
171-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
172-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
173-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
174-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
175-
IN THE SOFTWARE.
176-
```
138+
The MIT License (MIT). Please see [License File](LICENSE) for more information.

‎dns_discover.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ package fargo
44

55
import (
66
"fmt"
7-
"github.com/cenkalti/backoff"
7+
"time"
8+
9+
"github.com/cenkalti/backoff/v4"
810
"github.com/franela/goreq"
911
"github.com/miekg/dns"
10-
"time"
1112
)
1213

1314
const azURL = "http://169.254.169.254/latest/meta-data/placement/availability-zone"

‎dns_discover_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package fargo
33
// MIT Licensed (see README.md) - Copyright (c) 2013 Hudl <@Hudl>
44

55
import (
6-
. "github.com/smartystreets/goconvey/convey"
76
"testing"
87
"time"
8+
9+
. "github.com/smartystreets/goconvey/convey"
910
)
1011

1112
func TestGetNXDomain(t *testing.T) {
@@ -17,6 +18,8 @@ func TestGetNXDomain(t *testing.T) {
1718
}
1819

1920
func TestGetNetflixTestDomain(t *testing.T) {
21+
t.Skip("netflix domain discovery doesn't work")
22+
2023
Convey("Given domain txt.us-east-1.discoverytest.netflix.net.", t, func() {
2124
// TODO: use a mock DNS server to eliminate dependency on netflix
2225
// keeping their discoverytest domain up

‎docker-compose.override.yml.dist

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: "3.8"
2+
3+
services:
4+
eureka1:
5+
ports:
6+
- "127.0.0.1:8081:8080"
7+
8+
eureka2:
9+
ports:
10+
- "127.0.0.1:8082:8080"

‎docker-compose.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
version: "3.8"
2+
3+
services:
4+
eureka1:
5+
build:
6+
dockerfile: Dockerfile-v${EUREKA_VERSION:-1.1.147}
7+
context: docker/
8+
volumes:
9+
- $PWD/docker/eureka-client-test-docker.properties:/tomcat/webapps/eureka/WEB-INF/classes/eureka-client-test.properties
10+
11+
eureka2:
12+
build:
13+
dockerfile: Dockerfile-v${EUREKA_VERSION:-1.1.147}
14+
context: docker/
15+
volumes:
16+
- $PWD/docker/eureka-client-test-docker.properties:/tomcat/webapps/eureka/WEB-INF/classes/eureka-client-test.properties

‎docker/Dockerfile-fargo-master

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM golang:1.6
2-
3-
ENV GOROOT=/usr/local/go
1+
FROM golang:1.16
42

53
RUN go get github.com/tools/godep
6-
RUN go get github.com/hudl/fargo
74

8-
WORKDIR /go/src/github.com/hudl/fargo/
9-
RUN godep restore
5+
RUN git clone https://github.com/hudl/fargo.git /usr/local/src/fargo
6+
7+
WORKDIR /usr/local/src/fargo
8+
9+
RUN go mod download

‎docker/eureka-client-test-docker.properties

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eureka.serviceUrl.default=http://eureka1:8080/eureka/v2/
2+
eureka.vipAddress=eureka

‎go.mod

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
module github.com/hudl/fargo
2+
3+
go 1.16
4+
5+
require (
6+
github.com/cenkalti/backoff/v4 v4.1.1
7+
github.com/clbanning/mxj v1.8.4
8+
github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2 // indirect
9+
github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8
10+
github.com/miekg/dns v1.1.43
11+
github.com/onsi/gomega v1.13.0 // indirect
12+
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
13+
github.com/smartystreets/goconvey v1.6.4
14+
gopkg.in/gcfg.v1 v1.2.3
15+
gopkg.in/warnings.v0 v0.1.2 // indirect
16+
)

0 commit comments

Comments
 (0)