From c496a4257a0111478d7c0619f4e41ca43b6974ca Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Thu, 19 Oct 2023 21:13:17 -0700 Subject: [PATCH 01/10] Update to GO 1.21.3 Signed-off-by: Faisal Memon --- .go-version | 2 +- go.mod | 2 +- go.sum | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.go-version b/.go-version index 7bf9455f..bae5c7f6 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.20.5 +1.21.3 diff --git a/go.mod b/go.mod index 480b34b3..d73d2bd2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/spiffe/spiffe-helper -go 1.20 +go 1.21 require ( github.com/hashicorp/hcl v1.0.0 diff --git a/go.sum b/go.sum index dd2af49b..228729c6 100644 --- a/go.sum +++ b/go.sum @@ -11,9 +11,11 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -40,6 +42,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -61,6 +64,7 @@ google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cn google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From e1c66c4e1253059e7d2b73fc75929d5ec020bb99 Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Thu, 19 Oct 2023 21:22:05 -0700 Subject: [PATCH 02/10] update version in workflows Signed-off-by: Faisal Memon --- .github/workflows/pr_build.yaml | 4 ++-- .github/workflows/release_build.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr_build.yaml b/.github/workflows/pr_build.yaml index aaacd166..55c34b4a 100644 --- a/.github/workflows/pr_build.yaml +++ b/.github/workflows/pr_build.yaml @@ -3,7 +3,7 @@ on: pull_request: {} workflow_dispatch: {} env: - GO_VERSION: 1.20.5 + GO_VERSION: 1.21.3 permissions: contents: read @@ -163,4 +163,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: spiffe-helper - path: spiffe-helper \ No newline at end of file + path: spiffe-helper diff --git a/.github/workflows/release_build.yaml b/.github/workflows/release_build.yaml index e697b072..c4fc33af 100644 --- a/.github/workflows/release_build.yaml +++ b/.github/workflows/release_build.yaml @@ -5,7 +5,7 @@ on: - 'v[0-9].[0-9]+.[0-9]+' env: - GO_VERSION: 1.20.5 + GO_VERSION: 1.21.3 jobs: build-matrix: From bfe1559b694beabe4c5d4b3c59e4954562142b67 Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Tue, 14 Nov 2023 23:53:44 -0800 Subject: [PATCH 03/10] Update to go 1.21.4 Signed-off-by: Faisal Memon --- .go-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.go-version b/.go-version index bae5c7f6..20a1265c 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.3 +1.21.4 From 25e34509be8695b5e82b5d6b0fce650150646328 Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Sat, 18 Nov 2023 20:10:38 -0800 Subject: [PATCH 04/10] Update to Go 1.21.4 Signed-off-by: Faisal Memon --- .github/workflows/pr_build.yaml | 2 +- .github/workflows/release_build.yaml | 2 +- test.conf | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 test.conf diff --git a/.github/workflows/pr_build.yaml b/.github/workflows/pr_build.yaml index 55c34b4a..262335ea 100644 --- a/.github/workflows/pr_build.yaml +++ b/.github/workflows/pr_build.yaml @@ -3,7 +3,7 @@ on: pull_request: {} workflow_dispatch: {} env: - GO_VERSION: 1.21.3 + GO_VERSION: 1.21.4 permissions: contents: read diff --git a/.github/workflows/release_build.yaml b/.github/workflows/release_build.yaml index c4fc33af..7b2f5cab 100644 --- a/.github/workflows/release_build.yaml +++ b/.github/workflows/release_build.yaml @@ -5,7 +5,7 @@ on: - 'v[0-9].[0-9]+.[0-9]+' env: - GO_VERSION: 1.21.3 + GO_VERSION: 1.21.4 jobs: build-matrix: diff --git a/test.conf b/test.conf new file mode 100644 index 00000000..2df05033 --- /dev/null +++ b/test.conf @@ -0,0 +1,12 @@ +agent_address = "/tmp/agent.sock" +cmd = "" +cmd_args = "" +cert_dir = "certs" +renew_signal = "SIGUSR1" +#svid_file_name = "svid.pem" +#svid_key_file_name = "svid_key.pem" +svid_bundle_file_name = "svid_bundle.pem" +# Add CA with intermediates into Bundle file instead of SVID file, +# it is the expected behavior in some scenarios like MySQL. +# Default: false +# add_intermediates_to_bundle = false From 0b8813e94b67bb5f063389b91c48363d6c1ccad6 Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Sat, 18 Nov 2023 20:12:25 -0800 Subject: [PATCH 05/10] Accidental checked in file Signed-off-by: Faisal Memon --- test.conf | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 test.conf diff --git a/test.conf b/test.conf deleted file mode 100644 index 2df05033..00000000 --- a/test.conf +++ /dev/null @@ -1,12 +0,0 @@ -agent_address = "/tmp/agent.sock" -cmd = "" -cmd_args = "" -cert_dir = "certs" -renew_signal = "SIGUSR1" -#svid_file_name = "svid.pem" -#svid_key_file_name = "svid_key.pem" -svid_bundle_file_name = "svid_bundle.pem" -# Add CA with intermediates into Bundle file instead of SVID file, -# it is the expected behavior in some scenarios like MySQL. -# Default: false -# add_intermediates_to_bundle = false From e8adbf78af8eac72e14f551759b03edb2ee50eae Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Sat, 18 Nov 2023 20:13:01 -0800 Subject: [PATCH 06/10] Update go sum --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index 7e94a375..0dd89b0d 100644 --- a/go.sum +++ b/go.sum @@ -42,6 +42,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From ae51dabecfe3bde07f37edcd9beec5b9395f20a1 Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Tue, 12 Dec 2023 17:09:09 -0800 Subject: [PATCH 07/10] Update .go-version to 1.21.5 Signed-off-by: Faisal Memon --- .go-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.go-version b/.go-version index 20a1265c..ce2dd535 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.4 +1.21.5 From 80940e6a9f33b1ee66e4a195e0b9da457f2771cb Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Tue, 12 Dec 2023 17:09:45 -0800 Subject: [PATCH 08/10] Update pr_build.yaml to 1.21.5 Signed-off-by: Faisal Memon --- .github/workflows/pr_build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_build.yaml b/.github/workflows/pr_build.yaml index 262335ea..f6310f4d 100644 --- a/.github/workflows/pr_build.yaml +++ b/.github/workflows/pr_build.yaml @@ -3,7 +3,7 @@ on: pull_request: {} workflow_dispatch: {} env: - GO_VERSION: 1.21.4 + GO_VERSION: 1.21.5 permissions: contents: read From 3bf48337a6888a49a05a2e6831189acd85361036 Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Tue, 12 Dec 2023 17:10:10 -0800 Subject: [PATCH 09/10] Update release_build.yaml to 1.21.5 Signed-off-by: Faisal Memon --- .github/workflows/release_build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_build.yaml b/.github/workflows/release_build.yaml index 7b2f5cab..577d4058 100644 --- a/.github/workflows/release_build.yaml +++ b/.github/workflows/release_build.yaml @@ -5,7 +5,7 @@ on: - 'v[0-9].[0-9]+.[0-9]+' env: - GO_VERSION: 1.21.4 + GO_VERSION: 1.21.5 jobs: build-matrix: From 61528235b083c2078687370bc81710008b153520 Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Tue, 12 Dec 2023 17:18:31 -0800 Subject: [PATCH 10/10] Fix go.sum --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index bedf62e2..6eba6607 100644 --- a/go.sum +++ b/go.sum @@ -42,6 +42,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos= golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=