From e84b94044696363ae0befbb6842673bd8cb09958 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 15:16:36 +0000 Subject: [PATCH 1/2] chore(deps): bump golang.org/x/sys Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.0.0-20201026173827-119d4633e4d1 to 0.1.0. - [Release notes](https://github.com/golang/sys/releases) - [Commits](https://github.com/golang/sys/commits/v0.1.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: indirect ... Signed-off-by: dependabot[bot] --- addons/addon-raas-s3-copy/packages/s3-synchronizer/go.mod | 2 +- addons/addon-raas-s3-copy/packages/s3-synchronizer/go.sum | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/addons/addon-raas-s3-copy/packages/s3-synchronizer/go.mod b/addons/addon-raas-s3-copy/packages/s3-synchronizer/go.mod index 8e4651695b..08d69af661 100644 --- a/addons/addon-raas-s3-copy/packages/s3-synchronizer/go.mod +++ b/addons/addon-raas-s3-copy/packages/s3-synchronizer/go.mod @@ -9,6 +9,6 @@ require ( github.com/mitchellh/go-homedir v1.1.0 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 github.com/shabbyrobe/gocovmerge v0.0.0-20190829150210-3e036491d500 // indirect - golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1 // indirect + golang.org/x/sys v0.1.0 // indirect golang.org/x/tools v0.0.0-20201103190053-ac612affd56b // indirect ) diff --git a/addons/addon-raas-s3-copy/packages/s3-synchronizer/go.sum b/addons/addon-raas-s3-copy/packages/s3-synchronizer/go.sum index ff00404b56..d18b025c63 100644 --- a/addons/addon-raas-s3-copy/packages/s3-synchronizer/go.sum +++ b/addons/addon-raas-s3-copy/packages/s3-synchronizer/go.sum @@ -22,12 +22,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a8tTFrMLUcfWwyC0pnifVo2ClaLq+hP8= github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8= -github.com/shabbyrobe/gocovmerge v0.0.0-20180507124511-f6ea450bfb63 h1:J6qvD6rbmOil46orKqJaRPG+zTpoGlBTUdyv8ki63L0= github.com/shabbyrobe/gocovmerge v0.0.0-20180507124511-f6ea450bfb63/go.mod h1:n+VKSARF5y/tS9XFSP7vWDfS+GUC5vs/YT7M5XDTUEM= github.com/shabbyrobe/gocovmerge v0.0.0-20190829150210-3e036491d500 h1:WnNuhiq+FOY3jNj6JXFT+eLN3CQ/oPIsDPRanvwsmbI= github.com/shabbyrobe/gocovmerge v0.0.0-20190829150210-3e036491d500/go.mod h1:+njLrG5wSeoG4Ds61rFgEzKvenR2UHbjMoDHsczxly0= github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -47,16 +45,14 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190310054646-10058d7d4faa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9 h1:L2auWcuQIvxz9xSEqzESnV/QN/gNRXNApHi3fYwl2w0= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1 h1:/DtoiOYKoQCcIFXQjz07RnWNPRCbqmSXSpgEzhC9ZHM= -golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190308174544-00c44ba9c14f h1:SUQ6L9W8e5xt2GFO9s+i18JGITAfem+a0AQuFU8Ls74= golang.org/x/tools v0.0.0-20190308174544-00c44ba9c14f/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= golang.org/x/tools v0.0.0-20190829051458-42f498d34c4d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= From 30ad5aa1ecc31409d250a1a5c76e0fcf6a740952 Mon Sep 17 00:00:00 2001 From: Marianna Ghirardelli Date: Thu, 23 Mar 2023 14:47:08 -0400 Subject: [PATCH 2/2] fix: upgrade to Go 1.18 --- .github/workflows/deploy-integ-appstream-egress.yml | 2 +- .github/workflows/deploy-integ.yml | 2 +- README.md | 2 +- addons/addon-base/packages/serverless-go-build-tools/README.md | 2 +- addons/addon-raas-s3-copy/packages/s3-synchronizer/README.md | 2 +- addons/addon-raas-s3-copy/packages/s3-synchronizer/go.mod | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-integ-appstream-egress.yml b/.github/workflows/deploy-integ-appstream-egress.yml index a22733c562..cc21b5ee77 100644 --- a/.github/workflows/deploy-integ-appstream-egress.yml +++ b/.github/workflows/deploy-integ-appstream-egress.yml @@ -33,7 +33,7 @@ jobs: node-version: 16 - uses: actions/setup-go@v2 with: - go-version: 1.13 + go-version: "addons/addon-raas-s3-copy/packages/s3-synchronizer/go.mod" - name: Install pnpm run: npm install -g pnpm@5.18.9 - name: Install dependencies diff --git a/.github/workflows/deploy-integ.yml b/.github/workflows/deploy-integ.yml index 992cefa279..36c6c774d2 100644 --- a/.github/workflows/deploy-integ.yml +++ b/.github/workflows/deploy-integ.yml @@ -33,7 +33,7 @@ jobs: node-version: 16 - uses: actions/setup-go@v2 with: - go-version: 1.13 + go-version: "addons/addon-raas-s3-copy/packages/s3-synchronizer/go.mod" - name: Install pnpm run: npm install -g pnpm@5.18.9 - name: Install dependencies diff --git a/README.md b/README.md index 1eea85a741..6d4c7737dd 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ You can view the online documentation if you do not have Service Workbench local npm install -g pnpm ``` -- **Go:** You also need to install [Go 1.13.7](https://golang.org/doc/install) or later. `Go` is used for creating a multipart S3 downloader tool that is used in AWS Service Catalog EC2 Windows based research environments. +- **Go:** You also need to install [Go 1.18](https://golang.org/doc/install) or later. `Go` is used for creating a multipart S3 downloader tool that is used in AWS Service Catalog EC2 Windows based research environments. For more information, refer to the **Prerequisites** section of the Service Workbench Deployment Guide. diff --git a/addons/addon-base/packages/serverless-go-build-tools/README.md b/addons/addon-base/packages/serverless-go-build-tools/README.md index b1fe99796f..eff7f5cd2b 100644 --- a/addons/addon-base/packages/serverless-go-build-tools/README.md +++ b/addons/addon-base/packages/serverless-go-build-tools/README.md @@ -7,7 +7,7 @@ This package is a Serverless plugin that will build golang code and upload it to #### Tools - Node 14.x or later -- Go 1.13.7 or later +- Go 1.18 or later ## Configuration diff --git a/addons/addon-raas-s3-copy/packages/s3-synchronizer/README.md b/addons/addon-raas-s3-copy/packages/s3-synchronizer/README.md index c59386965d..cb390bb709 100644 --- a/addons/addon-raas-s3-copy/packages/s3-synchronizer/README.md +++ b/addons/addon-raas-s3-copy/packages/s3-synchronizer/README.md @@ -15,7 +15,7 @@ If the `recurringDownloads` flag is set to `true`, the program will periodically #### Tools -- Go 1.13.7+ +- Go 1.18+ ## Usage diff --git a/addons/addon-raas-s3-copy/packages/s3-synchronizer/go.mod b/addons/addon-raas-s3-copy/packages/s3-synchronizer/go.mod index 08d69af661..88130299b0 100644 --- a/addons/addon-raas-s3-copy/packages/s3-synchronizer/go.mod +++ b/addons/addon-raas-s3-copy/packages/s3-synchronizer/go.mod @@ -1,6 +1,6 @@ module swb/s3-synchronizer -go 1.13 +go 1.18 require ( github.com/aws/aws-sdk-go v1.35.15