Merge pull request #3 from launchdarkly/eb/ch78731/modules

make this repo a module

Author: eli-darkly

.circleci/config.yml

@@ -15,46 +15,70 @@ workflows:
       - go-test:
           name: Go 1.12
           docker-image: circleci/golang:1.12
+          with-modules: false
+          work-dir: /go/src/github.com/launchdarkly/go-test-helpers
       - go-test:
           name: Go 1.11
           docker-image: circleci/golang:1.11
+          with-modules: false
+          work-dir: /go/src/github.com/launchdarkly/go-test-helpers
       - go-test:
           name: Go 1.10
           docker-image: circleci/golang:1.10
           run-lint: false # the version of golangci-lint we're using doesn't work with older Go versions
+          with-modules: false
+          work-dir: /go/src/github.com/launchdarkly/go-test-helpers
       - go-test:
           name: Go 1.9
           docker-image: circleci/golang:1.9
           run-lint: false # the version of golangci-lint we're using doesn't work with older Go versions
+          with-modules: false
+          work-dir: /go/src/github.com/launchdarkly/go-test-helpers
       - go-test:
           name: Go 1.8
           docker-image: circleci/golang:1.8
           run-lint: false # the version of golangci-lint we're using doesn't work with older Go versions
+          with-modules: false
+          work-dir: /go/src/github.com/launchdarkly/go-test-helpers
       - go-test-windows:
           name: Windows
 
 jobs:
   go-test:
     parameters:
+      docker-image:
+        type: string
       run-lint:
         type: boolean
         default: true
-      docker-image:
+      with-modules:
+        type: boolean
+        default: true
+      work-dir:
         type: string
+        default: ~/project
 
     docker:
       - image: <<parameters.docker-image>>
         environment:
           CIRCLE_TEST_REPORTS: /tmp/circle-reports
           CIRCLE_ARTIFACTS: /tmp/circle-artifacts
-          COMMON_GO_PACKAGES: >
-            github.com/jstemmer/go-junit-report
 
-    working_directory: /go/src/github.com/launchdarkly/go-test-helpers
+    working_directory: <<parameters.work-dir>>
 
     steps:
       - checkout
-      - run: go get -u $COMMON_GO_PACKAGES
+      - run:
+          name: install go-junit-report
+          command: go get -u github.com/jstemmer/go-junit-report
+
+      - unless:
+          condition: <<parameters.with-modules>>
+          steps:
+            - run:
+                name: get dependencies
+                command: go get -t ./...
+
       - when:
           condition: <<parameters.run-lint>>
           steps:
@@ -81,20 +105,11 @@ jobs:
 
     environment:
       GOPATH: C:\Users\VssAdministrator\go
-      PACKAGE_PATH: github.com/launchdarkly/go-test-helpers
 
     steps:
       - checkout
       - run: go version
-      - run:
-          name: move source
-          command: |
-            go env GOPATH
-            mkdir ${env:GOPATH}\src\${env:PACKAGE_PATH}
-            mv * ${env:GOPATH}\src\${env:PACKAGE_PATH}
       - run:
           name: build and test
           command: |
-            cd ${env:GOPATH}\src\${env:PACKAGE_PATH}
-            go get -t ./...
             go test -race ./...

Makefile

@@ -7,14 +7,12 @@ LINTER_VERSION_FILE=./bin/.golangci-lint-version-$(GOLANGCI_LINT_VERSION)
 .PHONY: build clean test lint
 
 build:
-	go get ./...
 	go build ./...
 
 clean:
 	go clean
 
 test: build
-	go get -t ./...
 	@# Note, we need to specify all these packages individually for go test in order to remain 1.8-compatible
 	go test -race -v . ./httphelpers ./ldservices
 

go.mod

@@ -0,0 +1,12 @@
+module github.com/launchdarkly/go-test-helpers
+
+go 1.13
+
+require (
+	github.com/davecgh/go-spew v1.1.1
+	github.com/launchdarkly/eventsource v0.0.0-20190617224151-6b837031c9ca
+	github.com/pmezard/go-difflib v1.0.0
+	github.com/stretchr/testify v1.5.1
+	gopkg.in/launchdarkly/go-sdk-common.v1 v1.0.0-20200204015611-d48d1b4f4e70
+	gopkg.in/yaml.v2 v2.2.8
+)

go.sum

@@ -0,0 +1,16 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+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/launchdarkly/eventsource v0.0.0-20190617224151-6b837031c9ca h1:0RzZ6zhhZtjksMG/uea93SH1PYItuHaxByioaEePUks=
+github.com/launchdarkly/eventsource v0.0.0-20190617224151-6b837031c9ca/go.mod h1:y6+/PY1Az/AQyjCMsFt5mOZq1tfM0/KOQRS4f0pVe3M=
+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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/launchdarkly/go-sdk-common.v1 v1.0.0-20200204015611-d48d1b4f4e70 h1:P1LaXpioVaqT2ltbaIsNBcigVLzj/7NEiOKzersfuEQ=
+gopkg.in/launchdarkly/go-sdk-common.v1 v1.0.0-20200204015611-d48d1b4f4e70/go.mod h1:2kE5FCTDQ53bqRSOfJpE5fdiAQYiN9LESONDNyEBFjI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=