From 6c199787a7474efd085e82ae6eb15d703d5a17de Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Nov 2023 14:29:41 -0500 Subject: [PATCH 1/3] Update dependabot.yml. Remove `aws_sdk-go-v2` exclusions. --- .github/dependabot.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 48f4c91031e..f190d2385e9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -35,16 +35,8 @@ updates: # go-hclog should only be updated via terraform-plugin-log - dependency-name: "github.com/hashicorp/go-hclog" - dependency-name: "golang.org/x/tools" + # grpc should only be updated via terraform-plugin-go/terraform-plugin-framework - dependency-name: "google.golang.org/grpc" - # TEMPORARY - Remove below once upstream is fixed - # Ref: https://github.com/aws/aws-sdk-go-v2/issues/2349 - # - # config and ini have upstream regressions causing valid configurations to break. - # feature/s3/manager is also ignored as the latest versions have a dependency - # on broken config versions. - - dependency-name: "github.com/aws/aws-sdk-go-v2/config" - - dependency-name: "github.com/aws/aws-sdk-go-v2/internal/ini" - - dependency-name: "github.com/aws/aws-sdk-go-v2/feature/s3/manager" schedule: interval: "daily" open-pull-requests-limit: 30 From 7e2f7fd71fbd77626ef547966bc81a50bf7c1b83 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Nov 2023 15:15:47 -0500 Subject: [PATCH 2/3] Remove top-level 'go.mod' aws-sdk-go-v2 exclusions. --- go.mod | 8 -------- 1 file changed, 8 deletions(-) diff --git a/go.mod b/go.mod index 12ab6e58897..001fb04c788 100644 --- a/go.mod +++ b/go.mod @@ -203,11 +203,3 @@ require ( ) replace github.com/hashicorp/terraform-plugin-log => github.com/gdavison/terraform-plugin-log v0.0.0-20230928191232-6c653d8ef8fb - -exclude ( // Contains INI parsing regression - github.com/aws/aws-sdk-go-v2/config v1.21.0 - github.com/aws/aws-sdk-go-v2/config v1.22.0 - github.com/aws/aws-sdk-go-v2/config v1.22.1 - github.com/aws/aws-sdk-go-v2/internal/ini v1.5.0 - github.com/aws/aws-sdk-go-v2/internal/ini v1.5.1 -) From ee5725b6c26a23611f34de208c71c31662d322ac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Nov 2023 15:23:17 -0500 Subject: [PATCH 3/3] Run 'go get github.com/aws/aws-sdk-go-v2/internal/ini@v1.7.0 && go get github.com/aws/aws-sdk-go-v2/config@v1.25.0 && go get github.com/aws/aws-sdk-go-v2/feature/s3/manager@v1.13.7 && go mod tidy'. --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 001fb04c788..6924fc32bc1 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,9 @@ require ( github.com/YakDriver/regexache v0.23.0 github.com/aws/aws-sdk-go v1.47.11 github.com/aws/aws-sdk-go-v2 v1.22.2 - github.com/aws/aws-sdk-go-v2/config v1.20.0 + github.com/aws/aws-sdk-go-v2/config v1.25.0 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.13.2 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.13.7 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.23.1 github.com/aws/aws-sdk-go-v2/service/account v1.13.1 github.com/aws/aws-sdk-go-v2/service/acm v1.21.1 @@ -131,10 +131,10 @@ require ( github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/armon/go-radix v1.0.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.0 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.16.0 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.2 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.2 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.4.0 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.7.0 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.2 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.25.0 // indirect github.com/aws/aws-sdk-go-v2/service/iam v1.27.0 // indirect diff --git a/go.sum b/go.sum index 0766c358261..d11a77a7dcc 100644 --- a/go.sum +++ b/go.sum @@ -28,20 +28,20 @@ github.com/aws/aws-sdk-go-v2 v1.22.2 h1:lV0U8fnhAnPz8YcdmZVV60+tr6CakHzqA6P8T46E github.com/aws/aws-sdk-go-v2 v1.22.2/go.mod h1:Kd0OJtkW3Q0M0lUWGszapWjEvrXDzRW+D21JNsroB+c= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.0 h1:hHgLiIrTRtddC0AKcJr5s7i/hLgcpTt+q/FKxf1Zayk= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.0/go.mod h1:w4I/v3NOWgD+qvs1NPEwhd++1h3XPHFaVxasfY6HlYQ= -github.com/aws/aws-sdk-go-v2/config v1.20.0 h1:q2+/mqFhY0J9m3Tb5RGFE3R4sdaUkIe4k2EuDfE3c08= -github.com/aws/aws-sdk-go-v2/config v1.20.0/go.mod h1:7+1riCZXyT+sAGvneR5j+Zl1GyfbBUNQurpQTE6FP6k= -github.com/aws/aws-sdk-go-v2/credentials v1.15.2 h1:rKH7khRMxPdD0u3dHecd0Q7NOVw3EUe7AqdkUOkiOGI= -github.com/aws/aws-sdk-go-v2/credentials v1.15.2/go.mod h1:tXM8wmaeAhfC7nZoCxb0FzM/aRaB1m1WQ7x0qlBLq80= +github.com/aws/aws-sdk-go-v2/config v1.25.0 h1:WCwAqyrM/kqYi6pHjVpq/w2pLydeGKv8Af9vdtO3ciM= +github.com/aws/aws-sdk-go-v2/config v1.25.0/go.mod h1:1QMnmhoWcR6957nC1MUUhhOLx9NOGFSVNG3Mag9vLU4= +github.com/aws/aws-sdk-go-v2/credentials v1.16.0 h1:sSEHkXonpZBSPcyUBDRlZjxOi14qM/UK7/vfKhGwmTo= +github.com/aws/aws-sdk-go-v2/credentials v1.16.0/go.mod h1:tXM8wmaeAhfC7nZoCxb0FzM/aRaB1m1WQ7x0qlBLq80= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3 h1:G5KawTAkyHH6WyKQCdHiW4h3PmAXNJpOgwKg3H7sDRE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3/go.mod h1:hugKmSFnZB+HgNI1sYGT14BUPZkO6alC/e0AWu+0IAQ= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.13.2 h1:XmPqt2VLMB7dfZ/cGNXBJOFq+Q+VsnEcPW3MqyKAsvY= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.13.2/go.mod h1:Y9RO68QWibKfkJpic8lh2G36x1eUJsAznj+1jiyYmsU= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.13.7 h1:HDsYN1Qm6fFDKzaGfYVGGBNkifZAHWVBrzrILGhpdIU= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.13.7/go.mod h1:998wVfFSQY1hGhRXfv6QYGY08qi/L7Apr1XmJSWS5YI= github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.2 h1:AaQsr5vvGR7rmeSWBtTCcw16tT9r51mWijuCQhzLnq8= github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.2/go.mod h1:o1IiRn7CWocIFTXJjGKJDOwxv1ibL53NpcvcqGWyRBA= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.2 h1:UZx8SXZ0YtzRiALzYAWcjb9Y9hZUR7MBKaBQ5ouOjPs= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.2/go.mod h1:ipuRpcSaklmxR6C39G187TpBAO132gUfleTGccUPs8c= -github.com/aws/aws-sdk-go-v2/internal/ini v1.4.0 h1:21tlTXq3ev10yLMAjXZzpkZbrl49h3ElSjmxD57tD/E= -github.com/aws/aws-sdk-go-v2/internal/ini v1.4.0/go.mod h1:d9YrBHJhyzDCv5UsEVRizHlFV6Q0sLemFq6uxuqWfUw= +github.com/aws/aws-sdk-go-v2/internal/ini v1.7.0 h1:usgqiJtamuGIBj+OvYmMq89+Z1hIKkMJToz1WpoeNUY= +github.com/aws/aws-sdk-go-v2/internal/ini v1.7.0/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.2 h1:pyVrNAf7Hwz0u39dLKN5t+n0+K/3rMYKuiOoIum3AsU= github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.2/go.mod h1:mydrfOb9uiOYCxuCPR8YHQNQyGQwUQ7gPMZGBKbH8NY= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.23.1 h1:hV5+9XCx8RCjOwOStmqc4iuKSpa2boOYW8U8gxnvLVk=