Skip to content
This repository was archived by the owner on Jul 4, 2024. It is now read-only.

Build Compass components with Go 1.14 #1270

Merged
merged 6 commits into from
May 6, 2020
Merged

Build Compass components with Go 1.14 #1270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f66aa4
Add missing quotes in certain error test expectations
NickyMateev May 3, 2020
577fe21
Update Dockerfiles for each Compaass component to use Go 1.14
NickyMateev May 4, 2020
92a84f1
Update buildpack-golang-toolbox Docker image in Compass components
NickyMateev May 5, 2020
676bcc5
Update Compass chart to reference the latest PR
NickyMateev May 5, 2020
840bf33
Update Provisioner Makefile buildpack to PR image
NickyMateev May 6, 2020
7555fd1
Update Provisioner Makefile buildpack to newest buildpack-golang-kube…
NickyMateev May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions chart/compass/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,58 +15,58 @@ global:
path: eu.gcr.io/kyma-project/incubator
connector:
dir:
version: "PR-1162"
version: "PR-1270"
connectivity_adapter:
dir:
version: "PR-1208"
version: "PR-1270"
pairing_adapter:
dir:
version: "PR-1156"
version: "PR-1270"
director:
dir:
version: "PR-1222"
version: "PR-1270"
gateway:
dir:
version: "PR-1217"
version: "PR-1270"
healthchecker:
dir: pr/
version: "PR-357"
schema_migrator:
dir:
version: "PR-1222"
version: "PR-1270"
provisioner:
dir:
version: "PR-1222"
version: "PR-1270"
certs_setup_job:
containerRegistry:
path: eu.gcr.io/kyma-project
dir: pr/
version: "PR-5318"
kyma_environment_broker:
dir:
version: "PR-1196"
version: "PR-1270"
external_services_mock:
dir:
version: "PR-1250"
version: "PR-1270"
metris:
dir:
version: "PR-1241"
version: "PR-1270"
tests:
director:
dir:
version: "PR-1250"
version: "PR-1270"
connector:
dir:
version: "PR-1156"
version: "PR-1270"
provisioner:
dir:
version: "PR-1252"
version: "PR-1270"
e2e_provisioning:
dir:
version: "PR-1226"
version: "PR-1270"
connectivity_adapter:
dir:
version: "PR-1156"
version: "PR-1270"
isLocalEnv: false
oauth2:
host: oauth2
Expand Down
2 changes: 1 addition & 1 deletion components/connectivity-adapter/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder

ENV BASE_APP_DIR /go/src/github.com/kyma-incubator/compass/components/connectivity-adapter
WORKDIR ${BASE_APP_DIR}
Expand Down
2 changes: 1 addition & 1 deletion components/connectivity-adapter/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
APP_NAME = connectivity-adapter
APP_PATH = components/connectivity-adapter
ENTRYPOINT = cmd/main.go
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20190913-65b55d1
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts

include $(SCRIPTS_DIR)/generic_make_go.mk
Expand Down
2 changes: 1 addition & 1 deletion components/connector/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder

ENV BASE_APP_DIR /go/src/github.com/kyma-incubator/compass/components/connector
WORKDIR ${BASE_APP_DIR}
Expand Down
2 changes: 1 addition & 1 deletion components/connector/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
APP_NAME = compass-connector
APP_PATH = components/connector
ENTRYPOINT = cmd/main.go
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20190913-65b55d1
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts

include $(SCRIPTS_DIR)/generic_make_go.mk
Expand Down
2 changes: 1 addition & 1 deletion components/director/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder

ENV BASE_APP_DIR /go/src/github.com/kyma-incubator/compass/components/director
WORKDIR ${BASE_APP_DIR}
Expand Down
2 changes: 1 addition & 1 deletion components/director/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP_NAME = compass-director
APP_PATH = components/director
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20190913-65b55d1
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts
export GO111MODULE = on
export SKIP_STEP_MESSAGE = "Do nothing for Go modules project"
Expand Down
2 changes: 1 addition & 1 deletion components/director/internal/domain/onetimetoken/coverter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ func TestConverter_ToGraphQLForApplication_ErrorWithInvalidLegacyURL(t *testing.
// WHEN
_, err := conv.ToGraphQLForApplication(tokenModel)
//THEN
assert.EqualError(t, err, "while parsing string (:123:invalid-url) as the URL: parse :123:invalid-url: missing protocol scheme")
assert.EqualError(t, err, "while parsing string (:123:invalid-url) as the URL: parse \":123:invalid-url\": missing protocol scheme")
}
2 changes: 1 addition & 1 deletion components/director/internal/model/eventing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func TestNewRuntimeEventingConfiguration(t *testing.T) {
{
Name: "Invalid rawURL",
RawURL: "::",
ExpectedError: errors.New("parse ::: missing protocol scheme"),
ExpectedError: errors.New("parse \"::\": missing protocol scheme"),
},
}

Expand Down
4 changes: 2 additions & 2 deletions components/director/internal/runtimemapping/token_verifier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func TestJWKsFetch_GetKey(t *testing.T) {
_, err := jwksFetch.GetKey(token)

// THEN
require.EqualError(t, err, "while getting the JWKs URI: while getting the discovery URL: while parsing the issuer URL [issuer=:///cdef://]: parse :///cdef://: missing protocol scheme")
require.EqualError(t, err, "while getting the JWKs URI: while getting the discovery URL: while parsing the issuer URL [issuer=:///cdef://]: parse \":///cdef://\": missing protocol scheme")
})

t.Run("should return error when discovery URL does not return proper response", func(t *testing.T) {
Expand All @@ -109,7 +109,7 @@ func TestJWKsFetch_GetKey(t *testing.T) {

// THEN
require.Error(t, err)
assert.Contains(t, err.Error(), "while getting the JWKs URI: while getting the configuration discovery: Get http://domain.local/.well-known/openid-configuration: dial tcp: lookup domain.local")
assert.Contains(t, err.Error(), "while getting the JWKs URI: while getting the configuration discovery: Get \"http://domain.local/.well-known/openid-configuration\": dial tcp: lookup domain.local")
})

t.Run("should return error when discovery URL does not return proper response", func(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions components/director/internal/tenantfetcher/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ func TestClient_FetchTenantEventsPage(t *testing.T) {
// WHEN
res, err := client.FetchTenantEventsPage(tenantfetcher.CreatedEventsType, 1)
// THEN
require.EqualError(t, err, "parse ___ :// ___ : first path segment in URL cannot contain colon")
require.EqualError(t, err, "parse \"___ :// ___ \": first path segment in URL cannot contain colon")
assert.Empty(t, res)
})

t.Run("Error when bad path", func(t *testing.T) {
// WHEN
res, err := client.FetchTenantEventsPage(tenantfetcher.DeletedEventsType, 1)
// THEN
require.EqualError(t, err, "while sending get request: Get http://127.0.0.1:8111/badpath?page=1&resultsPerPage=1000&ts=1: dial tcp 127.0.0.1:8111: connect: connection refused")
require.EqualError(t, err, "while sending get request: Get \"http://127.0.0.1:8111/badpath?page=1&resultsPerPage=1000&ts=1\": dial tcp 127.0.0.1:8111: connect: connection refused")
assert.Empty(t, res)
})
}
Expand Down
2 changes: 1 addition & 1 deletion components/external-services-mock/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder

ENV BASE_APP_DIR /go/src/github.com/kyma-incubator/compass/components/external-services-mock
WORKDIR ${BASE_APP_DIR}
Expand Down
2 changes: 1 addition & 1 deletion components/external-services-mock/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP_NAME = compass-external-services-mock
APP_PATH = components/external-services-mock
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20190913-65b55d1
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts
export GO111MODULE = on
export SKIP_STEP_MESSAGE = "Do nothing for Go modules project"
Expand Down
2 changes: 1 addition & 1 deletion components/gateway/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder

ENV BASE_APP_DIR /go/src/github.com/kyma-incubator/compass/components/gateway
WORKDIR ${BASE_APP_DIR}
Expand Down
2 changes: 1 addition & 1 deletion components/gateway/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
APP_NAME = compass-gateway
APP_PATH = components/gateway
ENTRYPOINT = cmd/main.go
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20190913-65b55d1
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts
export GO111MODULE = on
export SKIP_STEP_MESSAGE = "Do nothing for Go modules project"
Expand Down
2 changes: 1 addition & 1 deletion components/healthchecker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder

ENV BASE_APP_DIR /go/src/github.com/kyma-incubator/compass/components/healthchecker
WORKDIR ${BASE_APP_DIR}
Expand Down
2 changes: 1 addition & 1 deletion components/healthchecker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
APP_NAME = compass-healthchecker
APP_PATH = components/healthchecker
ENTRYPOINT = cmd/main.go
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20190913-65b55d1
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts

include $(SCRIPTS_DIR)/generic_make_go.mk
2 changes: 1 addition & 1 deletion components/kyma-environment-broker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build image
FROM golang:1.13.8-alpine3.11 AS build
FROM golang:1.14.2-alpine3.11 AS build

WORKDIR /go/src/github.com/kyma-incubator/compass/components/kyma-environment-broker

Expand Down
2 changes: 1 addition & 1 deletion components/kyma-environment-broker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
APP_NAME = kyma-environment-broker
APP_PATH = components/kyma-environment-broker
ENTRYPOINT = cmd/broker/main.go
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200117-d3885041
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts
DOCKER_SOCKET = /var/run/docker.sock
TESTING_DB_NETWORK = test_network
Expand Down
2 changes: 1 addition & 1 deletion components/pairing-adapter/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
APP_NAME = pairing-adapter
APP_PATH = components/pairing-adapter
ENTRYPOINT = cmd/main.go
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20190913-65b55d1
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts

include $(SCRIPTS_DIR)/generic_make_go.mk
Expand Down
2 changes: 1 addition & 1 deletion components/provisioner/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder

ENV BASE_APP_DIR /go/src/github.com/kyma-incubator/compass/components/provisioner
WORKDIR ${BASE_APP_DIR}
Expand Down
2 changes: 1 addition & 1 deletion components/provisioner/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
APP_NAME = compass-provisioner
APP_PATH = components/provisioner
ENTRYPOINT = cmd/main.go
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-kubebuilder2:v20200124-69faeef6
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-kubebuilder2:v20200506-76a53983
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts
DOCKER_SOCKET = /var/run/docker.sock
TESTING_DB_NETWORK = test_network
Expand Down
2 changes: 1 addition & 1 deletion components/schema-migrator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP_NAME = compass-schema-migrator
APP_PATH = components/schema-migrator
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20190913-65b55d1
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts

include $(SCRIPTS_DIR)/generic_make_go.mk
Expand Down
2 changes: 1 addition & 1 deletion tests/connectivity-adapter/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder


ENV BASE_TEST_DIR /go/src/github.com/kyma-incubator/compass/tests/connectivity-adapter
Expand Down
2 changes: 1 addition & 1 deletion tests/connectivity-adapter/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP_NAME = connectivity-adapter-tests
APP_PATH = tests/connectivity-adapter
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200117-d3885041
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts

include $(SCRIPTS_DIR)/generic_make_go.mk
Expand Down
2 changes: 1 addition & 1 deletion tests/connector-tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder

ENV SRC_DIR=/go/src/github.com/kyma-incubator/compass/tests/connector-tests

Expand Down
2 changes: 1 addition & 1 deletion tests/connector-tests/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP_NAME = connector-tests
APP_PATH = tests/connector-tests
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20190913-65b55d1
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts

include $(SCRIPTS_DIR)/generic_make_go.mk
Expand Down
2 changes: 1 addition & 1 deletion tests/director/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder


ENV BASE_TEST_DIR /go/src/github.com/kyma-incubator/compass/tests/director
Expand Down
2 changes: 1 addition & 1 deletion tests/director/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP_NAME = compass-director-tests
APP_PATH = tests/director-tests
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20190913-65b55d1
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../..)/scripts
DIRECTOR_GRAPHQL_API = "http://compass-dev-director:3000"
export DIRECTOR_GRAPHQL_API
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/provisioning/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder

ENV SRC_DIR=/go/src/github.com/kyma-incubator/compass/tests/e2e/provisioning

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/provisioning/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP_NAME = e2e-provisioning-test
APP_PATH = tests/e2e/provisioning
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20190913-65b55d1
BUILDPACK = eu.gcr.io/kyma-project/test-infra/buildpack-golang-toolbox:v20200423-1d9d6590
SCRIPTS_DIR = $(realpath $(shell pwd)/../../..)/scripts

include $(SCRIPTS_DIR)/generic_make_go.mk
Expand Down
2 changes: 1 addition & 1 deletion tests/provisioner-tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8-alpine3.11 as builder
FROM golang:1.14.2-alpine3.11 as builder

ENV SRC_DIR=/go/src/github.com/kyma-incubator/compass/tests/provisioner-tests

Expand Down