Merge pull request #7 from launchdarkly/eb/ch81628/modules

remove dep files, prepare for module-only v2 release

Author: eli-darkly

.circleci/config.yml

@@ -12,34 +12,6 @@ workflows:
       - go-test:
           name: Go 1.13
           docker-image: circleci/golang:1.13
-      - 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
 
@@ -51,34 +23,19 @@ jobs:
       run-lint:
         type: boolean
         default: true
-      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
 
-    working_directory: <<parameters.work-dir>>
-
     steps:
       - checkout
       - 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:

.ldrelease/config.yml

@@ -3,6 +3,10 @@ template:
   env:
     LD_RELEASE_GO_IMPORT_PATH: github.com/launchdarkly/go-test-helpers
 
+releasableBranches:
+  - name: v1
+  - name: v2
+
 publications:
-  - url: https://godoc.org/github.com/launchdarkly/go-test-helpers
+  - url: https://pkg.go.dev/github.com/launchdarkly/go-test-helpers
     description: documentation

CHANGELOG.md

@@ -10,7 +10,6 @@ All notable changes to the project will be documented in this file. This project
 ### Added:
 - Added `go.mod` so this package can be consumed as a module. This does not affect code that is currently consuming it via `go get`, `dep`, or `govendor`.
 
-
 ## [1.1.2] - 2020-04-01
 ### Fixed:
 - Patch event type for client-side streams.

CONTRIBUTING.md

@@ -12,7 +12,7 @@ We encourage pull requests and other contributions from the community. Before su
 
 ### Prerequisites
 
-This project should be built against Go 1.8 or newer.
+This project should be built against Go 1.13 or newer.
 
 ### Building
 

Gopkg.lock

@@ -1,11 +1,13 @@
 # LaunchDarkly Go Test Helpers
 
-[![Circle CI](https://circleci.com/gh/launchdarkly/go-test-helpers.svg?style=svg)](https://circleci.com/gh/launchdarkly/go-test-helpers)
+[![Circle CI](https://circleci.com/gh/launchdarkly/go-test-helpers.svg?style=svg)](https://circleci.com/gh/launchdarkly/go-test-helpers) [![Documentation](https://img.shields.io/static/v1?label=go.dev&message=reference&color=00add8)](https://pkg.go.dev/github.com/launchdarkly/go-test-helpers)
 
-This package centralizes some test support code that is used by LaunchDarkly's Go SDK and related components, and that may be useful in other Go projects.
+This project centralizes some test support code that is used by LaunchDarkly's Go SDK and related components, and that may be useful in other Go projects.
 
 While this code may be useful in other projects, it is primarily geared toward LaunchDarkly's own development needs and is not meant to provide a large general-purpose framework. It is meant for unit test code and should not be used as a runtime dependency.
 
+This version of the project requires Go 1.13 or higher.
+
 ## Contents
 
 The main package provides general-purpose helper functions.
@@ -22,10 +24,10 @@ Import any of these packages in your test code:
 
 ```go
 import (
-    "github.com/launchdarkly/go-test-helpers"
-    "github.com/launchdarkly/go-test-helpers/httphelpers"
-    "github.com/launchdarkly/go-test-helpers/ldservices"
-    "github.com/launchdarkly/go-test-helpers/testbox"
+    "github.com/launchdarkly/go-test-helpers/v2"
+    "github.com/launchdarkly/go-test-helpers/v2/httphelpers"
+    "github.com/launchdarkly/go-test-helpers/v2/ldservices"
+    "github.com/launchdarkly/go-test-helpers/v2/testbox"
 )
 ```
 

Gopkg.toml

@@ -3,10 +3,7 @@ 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/davecgh/go-spew v1.1.1 // indirect
 	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
+	gopkg.in/yaml.v2 v2.2.8 // indirect
 )

README.md

@@ -1,16 +1,14 @@
 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 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 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 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 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=