Merge pull request #69 from SamWhited/modules

Use Go Modules

Author: thaJeztah

circle.yml

@@ -1,8 +1,8 @@
 version: 2
 jobs:
   build:
-    machine: true
-    working_directory: ~/go/src/github.com/docker/go-connections
+    machine:
+      image: ubuntu-1604:202004-01
     steps:
       - checkout
       - run:
@@ -11,10 +11,7 @@ jobs:
       - run:
           name: Get dependencies
           command: |
-            go get -u golang.org/x/lint/golint &&
-            go get -d github.com/pkg/errors &&
-            go get -d github.com/stretchr/testify &&
-            go get -d golang.org/x/net/proxy
+            go get -u golang.org/x/lint/golint
       - run:
           name: Run analysis before tests
           command: go vet ./...
@@ -35,7 +32,6 @@ jobs:
       - run:
           name: Build for Windows
           command: |
-            go get -d github.com/Microsoft/go-winio &&
             go build ./...
           environment:
             GOOS: windows

go.mod

@@ -0,0 +1,8 @@
+module github.com/docker/go-connections
+
+go 1.13
+
+require (
+	github.com/Microsoft/go-winio v0.4.14
+	github.com/pkg/errors v0.9.1
+)

go.sum

@@ -0,0 +1,16 @@
+github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
+github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b h1:ag/x1USPSsqHud38I9BAC88qdNLDHHtQ4mlgQIZPPNA=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

nat/nat_test.go

@@ -1,9 +1,8 @@
 package nat
 
 import (
+	"reflect"
 	"testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func TestParsePort(t *testing.T) {
@@ -175,7 +174,9 @@ func TestSplitProtoPort(t *testing.T) {
 
 func TestParsePortSpecFull(t *testing.T) {
 	portMappings, err := ParsePortSpec("0.0.0.0:1234-1235:3333-3334/tcp")
-	assert.Nil(t, err)
+	if err != nil {
+		t.Fatalf("expected nil error, got: %v", err)
+	}
 
 	expected := []PortMapping{
 		{
@@ -194,12 +195,16 @@ func TestParsePortSpecFull(t *testing.T) {
 		},
 	}
 
-	assert.Equal(t, expected, portMappings)
+	if !reflect.DeepEqual(expected, portMappings) {
+		t.Fatalf("wrong port mappings: got=%v, want=%v", portMappings, expected)
+	}
 }
 
 func TestPartPortSpecIPV6(t *testing.T) {
 	portMappings, err := ParsePortSpec("[2001:4860:0:2001::68]::333")
-	assert.Nil(t, err)
+	if err != nil {
+		t.Fatalf("expected nil error, got: %v", err)
+	}
 
 	expected := []PortMapping{
 		{
@@ -210,12 +215,16 @@ func TestPartPortSpecIPV6(t *testing.T) {
 			},
 		},
 	}
-	assert.Equal(t, expected, portMappings)
+	if !reflect.DeepEqual(expected, portMappings) {
+		t.Fatalf("wrong port mappings: got=%v, want=%v", portMappings, expected)
+	}
 }
 
 func TestPartPortSpecIPV6WithHostPort(t *testing.T) {
 	portMappings, err := ParsePortSpec("[::1]:80:80")
-	assert.Nil(t, err)
+	if err != nil {
+		t.Fatalf("expected nil error, got: %v", err)
+	}
 
 	expected := []PortMapping{
 		{
@@ -226,7 +235,9 @@ func TestPartPortSpecIPV6WithHostPort(t *testing.T) {
 			},
 		},
 	}
-	assert.Equal(t, expected, portMappings)
+	if !reflect.DeepEqual(expected, portMappings) {
+		t.Fatalf("wrong port mappings: got=%v, want=%v", portMappings, expected)
+	}
 }
 
 func TestParsePortSpecs(t *testing.T) {