Merge pull request #18 from Financial-Times/UPPSF-143-improvements

Uppsf 143 improvements

.circleci/config.yml

@@ -1,43 +1,43 @@
 version: 2
 jobs:
   build:
-    working_directory: /go/src/github.com/Financial-Times/content-collection-unfolder
     docker:
-      - image: golang:1.8.3
-        environment:
-          GOPATH: /go
-          CIRCLE_TEST_REPORTS: /tmp/test-results
-          CIRCLE_COVERAGE_REPORT: /tmp/coverage-results
+      - image: golang:1.11
+    working_directory: /go/src/github.com/Financial-Times/content-collection-unfolder
+    environment:
+      GOPATH: /go
+      CIRCLE_TEST_REPORTS: /tmp/test-results
+      CIRCLE_COVERAGE_REPORT: /tmp/coverage-results
+
     steps:
       - checkout
       - run:
           name: External Dependencies
           command: |
             go get -u github.com/mattn/goveralls
             go get -u github.com/jstemmer/go-junit-report
-            go get -u github.com/kardianos/govendor
             go get -u github.com/haya14busa/goverage
+            go get -u github.com/golang/dep/cmd/dep
       - run:
-          name: Test Results
+          name: Create Test Folders
           command: |
-            mkdir -p ${CIRCLE_TEST_REPORTS}
-            mkdir -p ${CIRCLE_COVERAGE_REPORT}
+            mkdir -p $CIRCLE_TEST_REPORTS
+            mkdir -p $CIRCLE_COVERAGE_REPORT
       - run:
-          name: Govendor Sync
-          command: govendor sync -v
+          name: Download Vendored Dependencies
+          command: dep ensure -v -vendor-only
       - run:
           name: Go Build
-          command: go build -v
+          command: go build
       - run:
           name: Run Tests
-          command: |
-            govendor test -race -v +local | /go/bin/go-junit-report > ${CIRCLE_TEST_REPORTS}/main.xml
-            goverage -covermode=atomic -race -coverprofile=${CIRCLE_COVERAGE_REPORT}/coverage.out ./...
+          command: go test -race -cover -coverprofile=${CIRCLE_COVERAGE_REPORTS}/coverage.out ./... | go-junit-report > ${CIRCLE_TEST_REPORTS}/junit.xml
       - run:
           name: Upload Coverage
-          command: /go/bin/goveralls -coverprofile=${CIRCLE_COVERAGE_REPORT}/coverage.out -service=circle-ci -repotoken=$COVERALLS_TOKEN
+          command: goveralls -coverprofile=${CIRCLE_COVERAGE_REPORTS}/coverage.out -service=circle-ci -repotoken=${COVERALLS_TOKEN}
       - store_test_results:
           path: /tmp/test-results
+
   dockerfile:
     working_directory: /content-collection-unfolder
     docker:

Dockerfile

@@ -1,9 +1,9 @@
-FROM golang:1.8-alpine
+FROM golang:1.11-alpine
 
 ENV PROJECT=content-collection-unfolder
 COPY . /${PROJECT}-sources/
 
-RUN apk --no-cache --virtual .build-dependencies add git \
+RUN apk --no-cache --virtual .build-dependencies add git curl \
   && ORG_PATH="github.com/Financial-Times" \
   && REPO_PATH="${ORG_PATH}/${PROJECT}" \
   && mkdir -p $GOPATH/src/${ORG_PATH} \
@@ -19,8 +19,8 @@ RUN apk --no-cache --virtual .build-dependencies add git \
   && LDFLAGS="-X '"${BUILDINFO_PACKAGE}$VERSION"' -X '"${BUILDINFO_PACKAGE}$DATETIME"' -X '"${BUILDINFO_PACKAGE}$REPOSITORY"' -X '"${BUILDINFO_PACKAGE}$REVISION"' -X '"${BUILDINFO_PACKAGE}$BUILDER"'" \
   && echo "Build flags: $LDFLAGS" \
   && echo "Fetching dependencies..." \
-  && go get -u github.com/kardianos/govendor \
-  && $GOPATH/bin/govendor sync \
+  && curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh \
+  && dep ensure -vendor-only \
   && go build -ldflags="${LDFLAGS}" \
   && mv ${PROJECT} /${PROJECT} \
   && apk del .build-dependencies \

Gopkg.toml

@@ -0,0 +1,36 @@
+
+[[constraint]]
+  name = "github.com/Financial-Times/go-fthealth"
+  version = "0.4.0"
+
+[[constraint]]
+  name = "github.com/Financial-Times/go-logger"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/Financial-Times/message-queue-go-producer"
+  version = "0.2.0"
+
+[[constraint]]
+  name = "github.com/Financial-Times/service-status-go"
+  version = "0.1.0"
+
+[[constraint]]
+  name = "github.com/Financial-Times/transactionid-utils-go"
+  version = "0.2.0"
+
+[[constraint]]
+  name = "github.com/Financial-Times/uuid-utils-go"
+  version = "1.0.1"
+
+[[constraint]]
+  name = "github.com/Workiva/go-datastructures"
+  version = "1.0.43"
+
+[[constraint]]
+  name = "github.com/gorilla/handlers"
+  version = "1.2.1"
+
+[prune]
+  go-tests = true
+  unused-packages = true

README.md

@@ -20,18 +20,18 @@ Dependencies are:
       
 Download the source code, dependencies and test dependencies:
 
-        go get -u github.com/kardianos/govendor
+        curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
         go get -u github.com/Financial-Times/content-collection-unfolder
         cd $GOPATH/src/github.com/Financial-Times/content-collection-unfolder
-        govendor sync
+        dep ensure -vendor-only
         go build .
 
 ## Running locally
 
 1. Run the tests and install the binary:
 
-        govendor sync
-        govendor test -v -race
+        dep ensure -vendor-only
+        go test -v -race ./...
         go install
 
 2. Run the binary (using the `help` flag to see the available optional arguments):

config_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestDefaults(t *testing.T) {
-	app := cli.App("content-collection-unfolder", appDescription)
+	app := cli.App("content-collection-unfolder", serviceDescription)
 
 	sc := createServiceConfiguration(app)