Use golang 1.9.4 from website (#2383)

1. go1.9.4 from website to run tests without coverage and build the binary 2. go1.11 from epel to run tests with coverage (we need go >= 1.10 because test cache was introduced in go 1.10)
fabric8-services · Dec 19, 2018 · 6423598 · 6423598
1 parent fe049a7
commit 6423598
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 36 deletions.
diff --git a/.make/test.mk b/.make/test.mk
@@ -156,7 +156,7 @@ test-unit: prebuild-check clean-coverage-unit $(COV_PATH_UNIT)
 test-unit-no-coverage: prebuild-check $(SOURCES)
 	$(call log-info,"Running test: $@")
 	$(eval TEST_PACKAGES:=$(shell go list ./... | grep -v $(ALL_PKGS_EXCLUDE_PATTERN)))
-	F8_DEVELOPER_MODE_ENABLED=1 F8_RESOURCE_UNIT_TEST=1 F8_LOG_LEVEL=$(F8_LOG_LEVEL) go test $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES)
+	F8_DEVELOPER_MODE_ENABLED=1 F8_RESOURCE_UNIT_TEST=1 F8_LOG_LEVEL=$(F8_LOG_LEVEL) go test -vet off $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES)
 
 .PHONY: test-unit-no-coverage-junit
 test-unit-no-coverage-junit: prebuild-check ${GO_JUNIT_BIN} ${TMP_PATH}
@@ -173,12 +173,12 @@ test-integration: prebuild-check clean-coverage-integration migrate-database $(C
 test-integration-no-coverage: prebuild-check migrate-database $(SOURCES)
 	$(call log-info,"Running test: $@")
 	$(eval TEST_PACKAGES:=$(shell go list ./... | grep -v $(ALL_PKGS_EXCLUDE_PATTERN)))
-	F8_DEVELOPER_MODE_ENABLED=1 F8_RESOURCE_DATABASE=1 F8_RESOURCE_UNIT_TEST=0 F8_LOG_LEVEL=$(F8_LOG_LEVEL) go test $(GO_TEST_BINARIES_PARALLEL_FLAG) $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES)
+	F8_DEVELOPER_MODE_ENABLED=1 F8_RESOURCE_DATABASE=1 F8_RESOURCE_UNIT_TEST=0 F8_LOG_LEVEL=$(F8_LOG_LEVEL) go test -vet off $(GO_TEST_BINARIES_PARALLEL_FLAG) $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES)
 
 test-integration-benchmark: prebuild-check migrate-database $(SOURCES)
 	$(call log-info,"Running benchmarks: $@")
 	$(eval TEST_PACKAGES:=$(shell go list ./... | grep -v $(ALL_PKGS_EXCLUDE_PATTERN)))
-	F8_DEVELOPER_MODE_ENABLED=1 F8_RESOURCE_DATABASE=1 F8_RESOURCE_UNIT_TEST=0 F8_LOG_LEVEL=$(F8_LOG_LEVEL) go test -run=^$$ -bench=. -cpu 1,2,4 -test.benchmem $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES) | grep -E "Bench|allocs"
+	F8_DEVELOPER_MODE_ENABLED=1 F8_RESOURCE_DATABASE=1 F8_RESOURCE_UNIT_TEST=0 F8_LOG_LEVEL=$(F8_LOG_LEVEL) go test -vet off -run=^$$ -bench=. -cpu 1,2,4 -test.benchmem $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES) | grep -E "Bench|allocs"
 
 .PHONY: test-remote
 ## Runs the remote tests and produces coverage files for each package.
@@ -189,13 +189,13 @@ test-remote: prebuild-check clean-coverage-remote $(COV_PATH_REMOTE)
 test-remote-no-coverage: prebuild-check $(SOURCES)
 	$(call log-info,"Running test: $@")
 	$(eval TEST_PACKAGES:=$(shell go list ./... | grep -v $(ALL_PKGS_EXCLUDE_PATTERN)))
-	F8_DEVELOPER_MODE_ENABLED=1 F8_RESOURCE_REMOTE=1 F8_RESOURCE_UNIT_TEST=0 F8_LOG_LEVEL=$(F8_LOG_LEVEL) go test $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES)
+	F8_DEVELOPER_MODE_ENABLED=1 F8_RESOURCE_REMOTE=1 F8_RESOURCE_UNIT_TEST=0 F8_LOG_LEVEL=$(F8_LOG_LEVEL) go test -vet off $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES)
 
 .PHONY: test-migration
 ## Runs the migration tests and should be executed before running the integration tests
 ## in order to have a clean database
 test-migration: prebuild-check migration/sqlbindata.go migration/sqlbindata_test.go
-	F8_RESOURCE_DATABASE=1 F8_LOG_LEVEL=$(F8_LOG_LEVEL) go test $(GO_TEST_VERBOSITY_FLAG) github.com/fabric8-services/fabric8-wit/migration
+	F8_RESOURCE_DATABASE=1 F8_LOG_LEVEL=$(F8_LOG_LEVEL) go test -vet off $(GO_TEST_VERBOSITY_FLAG) github.com/fabric8-services/fabric8-wit/migration
 
 # Starts the WIT server and waits until its running
 define start-wit
@@ -473,6 +473,7 @@ $(eval COV_OUT_FILE := $(COV_DIR)/$(PACKAGE_NAME)/coverage.$(TEST_NAME).mode-$(C
 	go test  $(PACKAGE_NAME) \
 		$(GO_TEST_BINARIES_PARALLEL_FLAG) \
 		$(GO_TEST_VERBOSITY_FLAG) \
+		-vet off \
 		-coverprofile $(COV_OUT_FILE) \
 		-coverpkg $(ALL_PKGS_COMMA_SEPARATED) \
 		-covermode=$(COVERAGE_MODE) \

diff --git a/Dockerfile.builder b/Dockerfile.builder
@@ -2,13 +2,14 @@ FROM centos:7
 LABEL maintainer "Devtools <[email protected]>"
 LABEL author "Konrad Kleine <[email protected]>"
 ENV LANG=en_US.utf8
-ARG USE_GO_VERSION_FROM_WEBSITE=0
+ARG USE_GO_VERSION_FROM_WEBSITE=1
 
 # Some packages might seem weird but they are required by the RVM installer.
-RUN yum --enablerepo=centosplus install -y --quiet \
+RUN yum install epel-release -y \
+    && yum install --enablerepo=centosplus install -y --quiet \
       findutils \
       git \
-      $(test -z $USE_GO_VERSION_FROM_WEBSITE && echo "golang") \
+      $(test "$USE_GO_VERSION_FROM_WEBSITE" != 1 && echo "golang") \
       make \
       procps-ng \
       tar \
@@ -18,13 +19,13 @@ RUN yum --enablerepo=centosplus install -y --quiet \
       postgresql \
     && yum clean all
 
-RUN test -n $USE_GO_VERSION_FROM_WEBSITE \
-    && cd /tmp \
-    && wget --no-verbose https://dl.google.com/go/go1.10.linux-amd64.tar.gz \
-    && echo "b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33  go1.10.linux-amd64.tar.gz" > checksum \
+RUN if [[ "$USE_GO_VERSION_FROM_WEBSITE" = 1 ]]; then cd /tmp \
+    && wget --no-verbose https://dl.google.com/go/go1.9.4.linux-amd64.tar.gz \
+    && echo "15b0937615809f87321a457bb1265f946f9f6e736c563d6c5e0bd2c22e44f779  go1.9.4.linux-amd64.tar.gz" > checksum \
     && sha256sum -c checksum \
-    && tar -C /usr/local -xzf go1.10.linux-amd64.tar.gz \
-    && rm -f go1.10.linux-amd64.tar.gz
+    && tar -C /usr/local -xzf go1.9.4.linux-amd64.tar.gz \
+    && rm -f go1.9.4.linux-amd64.tar.gz; \
+    fi
 ENV PATH=$PATH:/usr/local/go/bin
 
 # Get dep for Go package management and make sure the directory has full rwz permissions for non-root users

diff --git a/auth/authz.go b/auth/authz.go
@@ -43,7 +43,7 @@ func GetEntitlement(ctx context.Context, entitlementEndpoint string, entitlement
 		if err != nil {
 			log.Error(ctx, map[string]interface{}{
 				"entitlement_resource": entitlementResource,
-				"err": err.Error(),
+				"err":                  err.Error(),
 			}, "unable to marshal keycloak entitlement resource struct")
 			return nil, errors.NewInternalError(ctx, errs.Wrap(err, "unable to marshal keycloak entitlement resource struct"))
 		}
@@ -65,7 +65,7 @@ func GetEntitlement(ctx context.Context, entitlementEndpoint string, entitlement
 	if err != nil {
 		log.Error(ctx, map[string]interface{}{
 			"entitlement_resource": entitlementResource,
-			"err": err.Error(),
+			"err":                  err.Error(),
 		}, "unable to obtain entitlement resource")
 		return nil, errors.NewInternalError(ctx, errs.Wrap(err, "unable to obtain entitlement resource"))
 	}

diff --git a/cico_run_coverage.sh b/cico_run_coverage.sh
@@ -2,7 +2,8 @@
 
 . cico_setup.sh
 
-export USE_GO_VERSION_FROM_WEBSITE=1
+# Use go1.11 (or newer from epel)
+export USE_GO_VERSION_FROM_WEBSITE=0
 
 cico_setup;
 

diff --git a/cico_run_tests.sh b/cico_run_tests.sh
@@ -4,6 +4,9 @@
 
 cico_setup;
 
+# Use go1.9.4 from website
+export USE_GO_VERSION_FROM_WEBSITE=1
+
 run_tests_without_coverage;
 
 deploy SNAPSHOT-PR-${ghprbPullId} false;
diff --git a/controller/deployments.go b/controller/deployments.go
@@ -83,7 +83,7 @@ func (g *defaultClientGetter) GetAndCheckOSIOClient(ctx context.Context) (Opensh
 		if err != nil {
 			log.Error(ctx, map[string]interface{}{
 				"FABRIC8_WIT_API_URL": witURLStr,
-				"err": err,
+				"err":                 err,
 			}, "cannot parse FABRIC8_WIT_API_URL: %s", witURLStr)
 			return nil, errs.Wrapf(err, "cannot parse FABRIC8_WIT_API_URL: %s", witURLStr)
 		}

diff --git a/controller/work_item_link.go b/controller/work_item_link.go
@@ -68,8 +68,8 @@ func newWorkItemLinkContext(ctx context.Context, service *goa.Service, appl appl
 		Context:               ctx,
 		Service:               service,
 		CurrentUserIdentityID: currentUserIdentityID,
-		DB:       db,
-		LinkFunc: linkFunc,
+		DB:                    db,
+		LinkFunc:              linkFunc,
 	}
 }
 

diff --git a/login/service.go b/login/service.go
@@ -71,7 +71,7 @@ func (keycloak *KeycloakOAuthProvider) CreateOrUpdateKeycloakUser(accessToken st
 	if err != nil {
 		log.Error(ctx, map[string]interface{}{
 			"keycloak_identity_id": keycloakIdentityID,
-			"err": err,
+			"err":                  err,
 		}, "unable to  query for an identity by ID")
 		return nil, nil, errors.New("Error during querying for an identity by ID " + err.Error())
 	}
@@ -84,7 +84,7 @@ func (keycloak *KeycloakOAuthProvider) CreateOrUpdateKeycloakUser(accessToken st
 		if err != nil {
 			log.Error(ctx, map[string]interface{}{
 				"keycloak_identity_id": keycloakIdentityID,
-				"err": err,
+				"err":                  err,
 			}, "unable to create user/identity")
 			return nil, nil, errors.New("failed to update user/identity from claims" + err.Error())
 		}
@@ -126,7 +126,7 @@ func (keycloak *KeycloakOAuthProvider) CreateOrUpdateKeycloakUser(accessToken st
 		if err != nil {
 			log.Error(ctx, map[string]interface{}{
 				"keycloak_identity_id": keycloakIdentityID,
-				"err": err,
+				"err":                  err,
 			}, "unable to create user/identity")
 			return nil, nil, errs.Wrapf(err, "failed to update user/identity from claims")
 		} else if isChanged {

diff --git a/search/search_repository_whitebox_test.go b/search/search_repository_whitebox_test.go
@@ -215,18 +215,18 @@ func TestGetSearchQueryFromURLString(t *testing.T) {
 
 func TestIsOperator(t *testing.T) {
 	testData := map[string]bool{
-		AND:   true,
-		OR:    true,
-		OPTS:  false,
-		"":    false,
-		"   ": false,
-		"foo": false,
+		AND:                   true,
+		OR:                    true,
+		OPTS:                  false,
+		"":                    false,
+		"   ":                 false,
+		"foo":                 false,
 		uuid.NewV4().String(): false,
-		EQ:     false,
-		NE:     false,
-		NOT:    false,
-		IN:     false,
-		SUBSTR: false,
+		EQ:                    false,
+		NE:                    false,
+		NOT:                   false,
+		IN:                    false,
+		SUBSTR:                false,
 	}
 	for k, v := range testData {
 		t.Run(k, func(t *testing.T) {

diff --git a/test/recorder/recorder.go b/test/recorder/recorder.go
@@ -86,8 +86,8 @@ func newJWTMatcher(publicKey string) cassette.Matcher {
 			return true
 		}
 		log.Debug(nil, map[string]interface{}{
-			"method": cassetteRequest.Method,
-			"url":    cassetteRequest.URL,
+			"method":              cassetteRequest.Method,
+			"url":                 cassetteRequest.URL,
 			"cassetteRequest_sub": sub,
 			"http_request_sub":    claims["sub"],
 		}, "Authorization header's 'sub' claim doesn't match with the current request")