Skip to content

Commit

Permalink
Upgrade terraform-provider-aws to v5.20.1 (#2870)
Browse files Browse the repository at this point in the history 
This PR was generated via `$ upgrade-provider pulumi/pulumi-aws
--upstream-provider-name=terraform-provider-aws --kind=provider`.

---

- Rebased patches to solve go.sum merge conflicts.
- Upgrading terraform-provider-aws from 5.19.0  to 5.20.1.
	Fixes #2869
	Fixes #2860
  • Loading branch information
@rquitales
rquitales authored Oct 10, 2023
1 parent d1c7172 commit 7796ae7
Show file tree
Hide file tree
Showing 238 changed files with 19,891 additions and 646 deletions.
11 changes: 6 additions & 5 deletions examples/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/pulumi/pulumi-aws/examples/v6
go 1.21

require (
github.com/aws/aws-sdk-go v1.45.18
github.com/aws/aws-sdk-go v1.45.19
github.com/pulumi/pulumi-aws/provider/v6 v6.0.0-00010101000000-000000000000
github.com/pulumi/pulumi-terraform-bridge/pf v0.16.2-0.20230927165309-e3fd9503f2d3
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.2-0.20230927165309-e3fd9503f2d3
Expand Down Expand Up @@ -88,15 +88,15 @@ require (
github.com/aws/aws-sdk-go-v2/service/directoryservice v1.18.5 // indirect
github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.3.0 // indirect
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.21.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ec2 v1.121.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect
github.com/aws/aws-sdk-go-v2/service/emrserverless v1.11.0 // indirect
github.com/aws/aws-sdk-go-v2/service/finspace v1.12.0 // indirect
github.com/aws/aws-sdk-go-v2/service/fis v1.16.0 // indirect
github.com/aws/aws-sdk-go-v2/service/glacier v1.16.0 // indirect
github.com/aws/aws-sdk-go-v2/service/healthlake v1.17.5 // indirect
github.com/aws/aws-sdk-go-v2/service/iam v1.22.5 // indirect
github.com/aws/aws-sdk-go-v2/service/identitystore v1.18.2 // indirect
github.com/aws/aws-sdk-go-v2/service/inspector2 v1.16.6 // indirect
github.com/aws/aws-sdk-go-v2/service/inspector2 v1.16.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.36 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 // indirect
Expand All @@ -117,7 +117,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/oam v1.3.0 // indirect
github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.5.0 // indirect
github.com/aws/aws-sdk-go-v2/service/pipes v1.4.1 // indirect
github.com/aws/aws-sdk-go-v2/service/pricing v1.21.6 // indirect
github.com/aws/aws-sdk-go-v2/service/pricing v1.21.7 // indirect
github.com/aws/aws-sdk-go-v2/service/qldb v1.16.5 // indirect
github.com/aws/aws-sdk-go-v2/service/rbin v1.10.0 // indirect
github.com/aws/aws-sdk-go-v2/service/rds v1.54.0 // indirect
Expand All @@ -129,6 +129,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/s3control v1.33.0 // indirect
github.com/aws/aws-sdk-go-v2/service/scheduler v1.3.0 // indirect
github.com/aws/aws-sdk-go-v2/service/securitylake v1.7.0 // indirect
github.com/aws/aws-sdk-go-v2/service/servicequotas v1.16.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sesv2 v1.20.1 // indirect
github.com/aws/aws-sdk-go-v2/service/signer v1.16.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sqs v1.24.5 // indirect
Expand Down Expand Up @@ -214,7 +215,7 @@ require (
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-exec v0.19.0 // indirect
github.com/hashicorp/terraform-json v0.17.1 // indirect
github.com/hashicorp/terraform-plugin-framework v1.4.0 // indirect
github.com/hashicorp/terraform-plugin-framework v1.4.1 // indirect
github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1 // indirect
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.19.0 // indirect
Expand Down
22 changes: 12 additions & 10 deletions examples/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -828,8 +828,8 @@ github.com/aws/aws-sdk-go v1.43.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4
github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go v1.44.45/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go v1.44.68/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go v1.45.18 h1:uSOGg4LFtpQH/bq9FsumMKfZHNl7BdH7WURHOqKXHNU=
github.com/aws/aws-sdk-go v1.45.18/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/aws/aws-sdk-go v1.45.19 h1:+4yXWhldhCVXWFOQRF99ZTJ92t4DtoHROZIbN7Ujk/U=
github.com/aws/aws-sdk-go v1.45.19/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
github.com/aws/aws-sdk-go-v2 v1.16.8/go.mod h1:6CpKuLXg2w7If3ABZCl/qZ6rEgwtjZTn4eAf4RcEyuw=
github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc=
Expand Down Expand Up @@ -893,8 +893,8 @@ github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.3.0 h1:c9Ifajg9VU0b86Xd7B6K
github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.3.0/go.mod h1:XLn8/EbqX+qGri306t4IPUBi+VmphNcsR+OJRxPlGqg=
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.21.5 h1:EeNQ3bDA6hlx3vifHf7LT/l9dh9w7D2XgCdaD11TRU4=
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.21.5/go.mod h1:X3ThW5RPV19hi7bnQ0RMAiBjZbzxj4rZlj+qdctbMWY=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.121.0 h1:o2W9Pwiun0hr2EL63sTK2ozw8/gkoAXRgFmSwy3DE7I=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.121.0/go.mod h1:0FhI2Rzcv5BNM3dNnbcCx2qa2naFZoAidJi11cQgzL0=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 h1:i+YnwvmUy51p+8nwH9eDMzn5GWVLK+Pvva6To8O4AaI=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0/go.mod h1:0FhI2Rzcv5BNM3dNnbcCx2qa2naFZoAidJi11cQgzL0=
github.com/aws/aws-sdk-go-v2/service/emrserverless v1.11.0 h1:bBoGKYUIf6sIFZh8SMuc8yMyYmgs5ofwgzqO02upSUY=
github.com/aws/aws-sdk-go-v2/service/emrserverless v1.11.0/go.mod h1:uRIY0k05TXMGGlHeRxDDhWT9oBqcGbbEBN3gqk9Njos=
github.com/aws/aws-sdk-go-v2/service/finspace v1.12.0 h1:qFaAEplUoebyUb2m0I3IgPK9hEZYL2zSDIW9lGMdfe4=
Expand All @@ -909,8 +909,8 @@ github.com/aws/aws-sdk-go-v2/service/iam v1.22.5 h1:qGv+oW4uV1T3kbE9uSYEfdZbo38O
github.com/aws/aws-sdk-go-v2/service/iam v1.22.5/go.mod h1:8lyPrjQczmx72ac9s82zTjf9xLqs7uuFMG9TVEZ07XU=
github.com/aws/aws-sdk-go-v2/service/identitystore v1.18.2 h1:O7WJ9/aC2kKzZ5hF41ZILnO17v6+7mgBpTzeVjPqk+U=
github.com/aws/aws-sdk-go-v2/service/identitystore v1.18.2/go.mod h1:uP4598oNnSTY5AClqIoK6QHQnwz7cuRS8CBkVMXuxOU=
github.com/aws/aws-sdk-go-v2/service/inspector2 v1.16.6 h1:HhLDyWzcq1QAQM9/D6r49CA1NX7mSuE77XruZ/GM0tI=
github.com/aws/aws-sdk-go-v2/service/inspector2 v1.16.6/go.mod h1:ZThso1NAB0Pt7ZHiE8QjGxZsdSq3yE3IHTO8DSsIj0Y=
github.com/aws/aws-sdk-go-v2/service/inspector2 v1.16.7 h1:2YczmYtY8+kUguk/UfEXvnFBR1eu46PPB5a6OdGnwLM=
github.com/aws/aws-sdk-go-v2/service/inspector2 v1.16.7/go.mod h1:ZThso1NAB0Pt7ZHiE8QjGxZsdSq3yE3IHTO8DSsIj0Y=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.3/go.mod h1:gkb2qADY+OHaGLKNTYxMaQNacfeyQpZ4csDTQMeFmcw=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 h1:m0QTSI6pZYJTk5WSKx3fm5cNW/DCicVzULBgU/6IyD0=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14/go.mod h1:dDilntgHy9WnHXsh7dDtUPgHKEfTJIBUTHM8OWm0f/0=
Expand Down Expand Up @@ -955,8 +955,8 @@ github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.5.0 h1:iuVPMMbv8SGr
github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.5.0/go.mod h1:q4vucelgv/GslFK1qpKfH+40n9K73M2a0OHyjgcGDB8=
github.com/aws/aws-sdk-go-v2/service/pipes v1.4.1 h1:1MvAMuJjRPOKLIq8HUy/hg6NxoH7mtuvek07ovJlIBc=
github.com/aws/aws-sdk-go-v2/service/pipes v1.4.1/go.mod h1:bElGVvs4CdPbb7iYex87vwut+9WQ75L0jhlV6JiZMjo=
github.com/aws/aws-sdk-go-v2/service/pricing v1.21.6 h1:k/f3T13s7wx/By6aKovlVsjdNkRVT0QRR2RlZEvaTGg=
github.com/aws/aws-sdk-go-v2/service/pricing v1.21.6/go.mod h1:9n3tkRCngy3+Iw/8vK3C69iXh22SCGsy3yn16nTxH+s=
github.com/aws/aws-sdk-go-v2/service/pricing v1.21.7 h1:KZ0OI+HSaR5GlYyCQuZwZhTGa0zbXSXOIySQ4A5IdBg=
github.com/aws/aws-sdk-go-v2/service/pricing v1.21.7/go.mod h1:9n3tkRCngy3+Iw/8vK3C69iXh22SCGsy3yn16nTxH+s=
github.com/aws/aws-sdk-go-v2/service/qldb v1.16.5 h1:mmCoa7WmiISEuCOwNU63Mq9NnfuSlNx7UKmiG4Co3Dk=
github.com/aws/aws-sdk-go-v2/service/qldb v1.16.5/go.mod h1:/IZjlXFU0ksm6rph+YFQJHzLySx6kNNOvRNNHf/2Adg=
github.com/aws/aws-sdk-go-v2/service/rbin v1.10.0 h1:4Ilz+HTU3NtunCsfX1J//aoORPS1UFs6sQlH+5D3H94=
Expand All @@ -981,6 +981,8 @@ github.com/aws/aws-sdk-go-v2/service/scheduler v1.3.0/go.mod h1:cdpHC7Nd4Yvtf/rh
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.15.14/go.mod h1:xakbH8KMsQQKqzX87uyyzTHshc/0/Df8bsTneTS5pFU=
github.com/aws/aws-sdk-go-v2/service/securitylake v1.7.0 h1:Ou2rjk3siybv09bzpi5fs+9zOYZACxT1LT0KkcDAtIs=
github.com/aws/aws-sdk-go-v2/service/securitylake v1.7.0/go.mod h1:/MCawoN8Xib5q04k2HsIQ+K2cNtC3CHamrfLZXd6KmA=
github.com/aws/aws-sdk-go-v2/service/servicequotas v1.16.0 h1:dhp7Do5oaybdDdYGcdUNyzYFPsM4sNCvuPqph7MG5X0=
github.com/aws/aws-sdk-go-v2/service/servicequotas v1.16.0/go.mod h1:7+H2efEiOCrUl5EEsDFhe5BeI4gHGLUlisCyAJAcSvs=
github.com/aws/aws-sdk-go-v2/service/sesv2 v1.20.1 h1:QxzS/Hr5kixvMyPIXTfspnRUiKgFJSTPrhnglAi2YLI=
github.com/aws/aws-sdk-go-v2/service/sesv2 v1.20.1/go.mod h1:qpAr/ear7teIUoBd1gaPbvavdICoo1XyAIHPVlyawQc=
github.com/aws/aws-sdk-go-v2/service/signer v1.16.5 h1:nqZqDR44/ao9zQXyuCJI8L/C3QQIo4wtZyLtgwJfpEY=
Expand Down Expand Up @@ -1812,8 +1814,8 @@ github.com/hashicorp/terraform-exec v0.19.0/go.mod h1:tbxUpe3JKruE9Cuf65mycSIT8K
github.com/hashicorp/terraform-json v0.4.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU=
github.com/hashicorp/terraform-json v0.17.1 h1:eMfvh/uWggKmY7Pmb3T85u86E2EQg6EQHgyRwf3RkyA=
github.com/hashicorp/terraform-json v0.17.1/go.mod h1:Huy6zt6euxaY9knPAFKjUITn8QxUFIe9VuSzb4zn/0o=
github.com/hashicorp/terraform-plugin-framework v1.4.0 h1:WKbtCRtNrjsh10eA7NZvC/Qyr7zp77j+D21aDO5th9c=
github.com/hashicorp/terraform-plugin-framework v1.4.0/go.mod h1:XC0hPcQbBvlbxwmjxuV/8sn8SbZRg4XwGMs22f+kqV0=
github.com/hashicorp/terraform-plugin-framework v1.4.1 h1:ZC29MoB3Nbov6axHdgPbMz7799pT5H8kIrM8YAsaVrs=
github.com/hashicorp/terraform-plugin-framework v1.4.1/go.mod h1:XC0hPcQbBvlbxwmjxuV/8sn8SbZRg4XwGMs22f+kqV0=
github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1 h1:gm5b1kHgFFhaKFhm4h2TgvMUlNzFAtUqlcOWnWPm+9E=
github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1/go.mod h1:MsjL1sQ9L7wGwzJ5RjcI6FzEMdyoBnw+XK8ZnOvQOLY=
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0 h1:HOjBuMbOEzl7snOdOoUfE2Jgeto6JOjLVQ39Ls2nksc=
Expand Down
4 changes: 2 additions & 2 deletions patches/0001-Add-TagsSchemaTrulyComputed-definition.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 22002597c79561a6a19c41c4a84dc4d7b9ea3aa5 Mon Sep 17 00:00:00 2001
From 60c6c7eaafd81af3849ffd74be901f37e871d628 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 16:49:08 +0000
Subject: [PATCH 01/30] Add TagsSchemaTrulyComputed definition
Expand All @@ -24,5 +24,5 @@ index 12d3b9013e..bc9e14fc19 100644
+ }
+}
--
2.40.0
2.42.0

4 changes: 2 additions & 2 deletions patches/0002-Conns-user-agent.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5d1f7322d4c2d5850220ee1bdcaa721427a1a177 Mon Sep 17 00:00:00 2001
From df6ebc6c3f95e8fbe20ecf45eba760dd0a6e18ba Mon Sep 17 00:00:00 2001
From: Daniel Bradley <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:03:31 +0000
Subject: [PATCH 02/30] Conns user agent
Expand Down Expand Up @@ -36,5 +36,5 @@ index 954266ba7a..404a654792 100644
}
}
--
2.40.0
2.42.0

46 changes: 23 additions & 23 deletions patches/0003-Add-S3-legacy-bucket-to-resources.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 92e45e410e02acba9c2f129b41a8869821d24eb5 Mon Sep 17 00:00:00 2001
From 672ac1a794ce0c8163b1a378f4fb6d68b8c0df3f Mon Sep 17 00:00:00 2001
From: Daniel Bradley <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:05:11 +0000
Subject: [PATCH 03/30] Add S3 legacy bucket to resources
Expand Down Expand Up @@ -41,55 +41,55 @@ https://github.com/hashicorp/terraform-provider-aws/pull/29717.
create mode 100644 website/docs/r/s3_bucket_legacy.html.markdown

diff --git a/go.mod b/go.mod
index c636a06795..dad473a1bb 100644
index 5ed4f945c2..d92a8a2d26 100644
--- a/go.mod
+++ b/go.mod
@@ -76,6 +76,7 @@ require (
@@ -75,6 +75,7 @@ require (
github.com/beevik/etree v1.2.0
github.com/google/go-cmp v0.5.9
github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.21.0
+ github.com/hashicorp/aws-sdk-go-base v1.1.0
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.36
github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.37
+ github.com/hashicorp/aws-sdk-go-base v1.1.0
github.com/hashicorp/awspolicyequivalence v1.6.0
github.com/hashicorp/go-cleanhttp v0.5.2
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
diff --git a/go.sum b/go.sum
index 530da419d2..8d7e72b41b 100644
index 9d4adefa7e..ddf43a39f3 100644
--- a/go.sum
+++ b/go.sum
@@ -24,6 +24,7 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
@@ -22,6 +22,7 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmms
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/aws/aws-sdk-go v1.45.18 h1:uSOGg4LFtpQH/bq9FsumMKfZHNl7BdH7WURHOqKXHNU=
github.com/aws/aws-sdk-go v1.45.18/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/aws/aws-sdk-go v1.45.19 h1:+4yXWhldhCVXWFOQRF99ZTJ92t4DtoHROZIbN7Ujk/U=
github.com/aws/aws-sdk-go v1.45.19/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc=
github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 h1:OPLEkmhXf6xFPiz0bLeDArZIDx1NNS4oJyG4nv3Gct0=
@@ -223,6 +224,7 @@ github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -225,6 +226,7 @@ github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
@@ -246,6 +248,8 @@ github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.36 h1:PeXF9Lm40Y54iEHlFoirPj
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.36/go.mod h1:CMRjoqBNDv6ic4UMXjyrUVss92suk8ANVnJxErubAQE=
github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.37 h1:KniXhpwH0GC5v1YCSMrD2n1qW/aeSCJV6hzIQ03Jv9I=
github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.37/go.mod h1:nmFy7OOHTVqTYyckN4oTzLRYRheTbar4+92MXonc5BA=
@@ -244,6 +246,8 @@ github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.21.0 h1:IUypt/TbXiJBkBbE3926CgnjD8IltAitdn7Yive61DY=
github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.21.0/go.mod h1:cdTE6F2pCKQobug+RqRaQp7Kz9hIEqiSvpPmb6E5G1w=
+github.com/hashicorp/aws-sdk-go-base v1.1.0 h1:27urM3JAp6v+Oj/Ea5ULZwuFPK9cO1RUdEpV+rNdSAc=
+github.com/hashicorp/aws-sdk-go-base v1.1.0/go.mod h1:2fRjWDv3jJBeN6mVWFHV6hFTNeFBx2gpDLQaZNxUVAY=
github.com/hashicorp/awspolicyequivalence v1.6.0 h1:7aadmkalbc5ewStC6g3rljx1iNvP4QyAhg2KsHx8bU8=
github.com/hashicorp/awspolicyequivalence v1.6.0/go.mod h1:9IOaIHx+a7C0NfUNk1A93M7kHd5rJ19aoUx37LZGC14=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -313,6 +317,7 @@ github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.36 h1:PeXF9Lm40Y54iEHlFoirPjwWGEJUocZgxFOAyeaeKg8=
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.36/go.mod h1:CMRjoqBNDv6ic4UMXjyrUVss92suk8ANVnJxErubAQE=
github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.37 h1:KniXhpwH0GC5v1YCSMrD2n1qW/aeSCJV6hzIQ03Jv9I=
@@ -315,6 +319,7 @@ github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
+github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
@@ -433,6 +438,7 @@ golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -435,6 +440,7 @@ golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
Expand Down Expand Up @@ -4318,5 +4318,5 @@ index 0000000000..529368067d
+
+The `policy` argument is not imported and will be deprecated in a future version of the provider. Use the `aws_s3_bucket_policy` resource to manage the S3 Bucket Policy instead.
--
2.40.0
2.42.0

4 changes: 2 additions & 2 deletions patches/0004-Marks-SSE-Configuration-as-Computed-for-Legacy-S3-Bu.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a0f2ba69e1fd38a89e79bd501d526059fd618112 Mon Sep 17 00:00:00 2001
From d2934bb9ed055adcb93642d856ad8afdb1a8c593 Mon Sep 17 00:00:00 2001
From: Kyle Pitzen <kpitzen@pulumi.com>
Date: Thu, 9 Mar 2023 09:47:49 -0600
Subject: [PATCH 04/30] Marks SSE Configuration as Computed for Legacy S3
Expand Down Expand Up @@ -26,5 +26,5 @@ index 27fe651a83..8879116578 100644
Schema: map[string]*schema.Schema{
"rule": {
--
2.40.0
2.42.0

4 changes: 2 additions & 2 deletions patches/0005-De-deprecate-bucket_object.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 71a8342cba8664c26f9baa77352d49429b13b0a0 Mon Sep 17 00:00:00 2001
From 89602096417c9a0505c72cd1ef90175abf6bf8cc Mon Sep 17 00:00:00 2001
From: Daniel Bradley <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:06:11 +0000
Subject: [PATCH 05/30] De-deprecate bucket_object
Expand Down Expand Up @@ -41,5 +41,5 @@ index 1a6fadf590..f596e3a8b4 100644
}

--
2.40.0
2.42.0

4 changes: 2 additions & 2 deletions patches/0006-Remove-lakeformation-catalog_resource-default.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b60aeba2c4cfdbf117f507abf7ad90c556540063 Mon Sep 17 00:00:00 2001
From 11621eb146897edb086633aa3d4f375b1f7aae15 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:08:23 +0000
Subject: [PATCH 06/30] Remove lakeformation catalog_resource default
Expand All @@ -23,5 +23,5 @@ index 594d25ee73..258163d0a5 100644
Optional: true,
ExactlyOneOf: []string{
--
2.40.0
2.42.0

4 changes: 2 additions & 2 deletions patches/0007-Workaround-SSM-Parameter-tier-bug.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c233bf1db11b78e011e31d1202924f4820e018c4 Mon Sep 17 00:00:00 2001
From ff0d8f4ab14057641c5194f12d9852f072d8b308 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:24:42 +0000
Subject: [PATCH 07/30] Workaround SSM Parameter tier bug
Expand Down Expand Up @@ -57,5 +57,5 @@ index 544385cfa6..6f72ffec7a 100644
if d.HasChange("data_type") {
paramInput.DataType = aws.String(d.Get("data_type").(string))
--
2.40.0
2.42.0

4 changes: 2 additions & 2 deletions patches/0008-Add-EKS-cluster-default_addons_to_remove.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fa9ec3bd90d868fb4e0fd09c7eaaca266dcb61dd Mon Sep 17 00:00:00 2001
From 8c56f8c7dec27f51b33e699168b78a543f636541 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:31:27 +0000
Subject: [PATCH 08/30] Add EKS cluster default_addons_to_remove
Expand Down Expand Up @@ -268,5 +268,5 @@ index 57a94e414f..6568e06549 100644
)

--
2.40.0
2.42.0

4 changes: 2 additions & 2 deletions patches/0009-Add-EKS-cluster-certificate_authorities-plural.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2e2c333d8a701596ab09df78b40e6b6370fffbfb Mon Sep 17 00:00:00 2001
From f67b1fcf3e582186972e7ffc0fbe04b304e7147c Mon Sep 17 00:00:00 2001
From: Daniel Bradley <daniel@pulumi.com>
Date: Fri, 4 Nov 2022 17:32:49 +0000
Subject: [PATCH 09/30] Add EKS cluster certificate_authorities (plural)
Expand Down Expand Up @@ -51,5 +51,5 @@ index d8544be700..01c6b3caa0 100644
return diag.Errorf("setting certificate_authority: %s", err)
}
--
2.40.0
2.42.0

Loading

0 comments on commit 7796ae7

Please sign in to comment.