From 71cf525986dcb8d864834a6312e09cfcb715568f Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Mon, 28 Oct 2024 10:22:54 +0100 Subject: [PATCH 1/5] build: Update submodule to d315554 Signed-off-by: Rickard von Essen --- build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build b/build index b0dfb8fbe..d3155548b 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit b0dfb8fbe8c626e3e0f0b6efdfac926d750adf48 +Subproject commit d3155548bfab68fc8bea64c5526642b7b565ae33 From e02473db6d07c34e7f547634f6ee3e0e5be072f9 Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Sun, 27 Oct 2024 12:32:06 +0100 Subject: [PATCH 2/5] golangci-lint: Migrated deprecated configs Signed-off-by: Rickard von Essen --- .golangci.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index cc2469c5d..ee069ac4c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,14 +3,12 @@ # SPDX-License-Identifier: CC0-1.0 run: - deadline: 10m - - skip-files: - - "zz_\\..+\\.go$" + timeout: 10m output: # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number" - format: colored-line-number + formats: + - format: colored-line-number linters-settings: errcheck: @@ -25,7 +23,8 @@ linters-settings: # [deprecated] comma-separated list of pairs of the form pkg:regex # the regex is used to ignore names within pkg. (default "fmt:.*"). # see https://github.com/kisielk/errcheck#the-deprecated-method for details - ignore: fmt:.*,io/ioutil:^Read.* + exclude-files: + - fmt:.*,io/ioutil:^Read.* govet: # report about shadowed variables @@ -129,6 +128,8 @@ linters: issues: + exclude-files: + - "zz_\\..+\\.go$" # Excluding configuration per-path and per-linter exclude-rules: # Exclude some linters from running on tests files. @@ -140,7 +141,7 @@ issues: - gosec - scopelint - unparam - + # Ease some gocritic warnings on test files. - path: _test\.go text: "(unnamedResult|exitAfterDefer)" From 50d126ea9c49ad8fe987c4d3a48a21b542bf4abb Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Sun, 27 Oct 2024 12:34:04 +0100 Subject: [PATCH 3/5] golangci-lint: Remove archived/deprecated interfacer linter Signed-off-by: Rickard von Essen --- .golangci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index ee069ac4c..cf1db8c17 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -111,7 +111,6 @@ linters: - govet - gocyclo - gocritic - - interfacer - goconst - goimports - gofmt # We enable this as well as goimports for its simplify mode. From 97c083158ad3437aaa097fc5f1a5d215e8a439fa Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Sun, 27 Oct 2024 12:35:25 +0100 Subject: [PATCH 4/5] golangci-lint: megacheck has been replaced with gosimple, staticcheck, and unused Signed-off-by: Rickard von Essen --- .golangci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index cf1db8c17..c16541f76 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -107,16 +107,18 @@ linters-settings: linters: enable: - - megacheck - govet - gocyclo - gocritic - goconst - goimports - gofmt # We enable this as well as goimports for its simplify mode. + - gosimple - prealloc - revive + - staticcheck - unconvert + - unused - misspell - nakedret From dbc74fcb08601c12a59b0bd14e6fb6242b540ac4 Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Sun, 27 Oct 2024 12:37:45 +0100 Subject: [PATCH 5/5] Dockerfile: Updated deprecated syntax for ENV Signed-off-by: Rickard von Essen --- cluster/images/provider-gcp/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cluster/images/provider-gcp/Dockerfile b/cluster/images/provider-gcp/Dockerfile index a478cc86a..dcee5f83b 100644 --- a/cluster/images/provider-gcp/Dockerfile +++ b/cluster/images/provider-gcp/Dockerfile @@ -7,9 +7,10 @@ ARG CROSSPLANE_PROVIDER_VERSION ENV USER_ID=65532 # set user agent -ENV GOOGLE_TERRAFORM_USERAGENT_EXTENSION "upbound-provider-gcp/${CROSSPLANE_PROVIDER_VERSION}" +ENV GOOGLE_TERRAFORM_USERAGENT_EXTENSION="upbound-provider-gcp/${CROSSPLANE_PROVIDER_VERSION}" USER ${USER_ID} EXPOSE 8080 -ENTRYPOINT ["provider"] \ No newline at end of file +ENTRYPOINT ["provider"] +