Correction for tests for case with merging slices with override. go.mod fixes

Author: smgladkovskiy

.circleci/config.yml

@@ -2,15 +2,14 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.12
     parallelism: 4
 
     # directory where steps are run. Path must conform to the Go Workspace requirements
     working_directory: /go/src/github.com/microparts/configuration-golang
 
     environment: # environment variables for the build itself
       - IN_CONTAINER: true
-      - DEP_VERSION: 0.5.0
       - GOCACHE: /tmp/go/cache
       - TEST_RESULTS: /tmp/test-results # path to where test results will be saved
 
@@ -22,8 +21,6 @@ jobs:
           command: |
             sudo apt-get update
             sudo apt-get install make
-            sudo curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o /bin/dep
-            sudo chmod +x /bin/dep
             make deps
             go get github.com/jstemmer/go-junit-report
       - run:

Dockerfile

@@ -1,22 +1,15 @@
 # Dockerfile for test image
-FROM golang:alpine as build-env
+FROM golang:1.12.1-alpine as build-env
 MAINTAINER Sergey Gladkovskiy <[email protected]>
 
-ARG DEP_VERSION="0.5.0"
-ENV IN_CONTAINER="true"
+ENV GO111MODULE=on
 
 RUN apk update \
  && apk add --no-cache \
-    ca-certificates \
     curl \
     git \
     make \
-    openssl \
     openssh-client \
-    gcc \
-    musl-dev \
- && curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o /bin/dep \
- && chmod +x /bin/dep \
  && rm -rf /var/cache/apk/* \
  && rm -rf /tmp/*
 

Makefile

@@ -2,7 +2,7 @@ IMAGE = golang-pkg-test
 TEST_CONTAINER = docker run --rm -i --name golang-config $(IMAGE)
 
 deps: ## Get the dependencies
-	@dep ensure
+	@go mod vendor
 
 race: ## Run data race detector
 	@go test -race ./...

reader_test.go

@@ -1,9 +1,10 @@
 package config
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v2"
-	"testing"
 )
 
 func TestReadConfigs(t *testing.T) {
@@ -81,7 +82,7 @@ func TestReadConfigs(t *testing.T) {
 				Username:    "TESt_USERNAME",
 				Password:    "PASSWORD",
 			},
-			DefaultList: []string{"foo", "bar", "baz"},
+			DefaultList: []string{"bar", "baz"},
 			Logging:     "info",
 			Databases: struct {
 				Redis struct {