Merge pull request #2461 from pulumi/iwahbe/upgrade-v4.62.0

Upgrade to v4.62.0

Makefile

@@ -143,10 +143,9 @@ init_upstream:
 export_upstream_patches: init_upstream
 ifeq ($(shell cd upstream && git rev-parse --is-shallow-repository), false)
 	find upstream-patches -type f -delete
-	cd upstream && \
-		# Find the most recent tag before the current checkout - don't abbreviate the tag name
-		LAST_TAG=$$(git describe --abbrev=0 --tags) && \
-		# Create patch files for each commit since the last tag
+	# Find the most recent tag before the current checkout - don't abbreviate the tag name
+	# Create patch files for each commit since the last tag
+	cd upstream && LAST_TAG=$$(git describe --abbrev=0 --tags) && \
 		git format-patch  -o ../upstream-patches --minimal --no-signature HEAD...$${LAST_TAG}
 endif
 

provider/go.mod

@@ -13,7 +13,7 @@ require (
 )
 
 replace (
-	github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220824175045-450992f2f5b9
+	github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230327102345-3fa930f86570
 	github.com/hashicorp/terraform-provider-aws => ../upstream
 	github.com/hashicorp/terraform-provider-aws/shim => ./shim
 	github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0
@@ -57,7 +57,7 @@ require (
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/armon/go-metrics v0.4.0 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
-	github.com/aws/aws-sdk-go v1.44.232 // indirect
+	github.com/aws/aws-sdk-go v1.44.237 // indirect
 	github.com/aws/aws-sdk-go-v2 v1.17.7 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.3 // indirect
 	github.com/aws/aws-sdk-go-v2/config v1.18.12 // indirect
@@ -71,19 +71,19 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.11.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.20.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/comprehend v1.23.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.21.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.91.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.22.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.93.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/fis v1.14.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/healthlake v1.15.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/healthlake v1.15.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/iam v1.19.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/inspector2 v1.11.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.3 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.10 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ivschat v1.4.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/kendra v1.38.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/kendra v1.39.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/kms v1.18.1 // indirect
 	github.com/aws/aws-sdk-go-v2/service/lambda v1.30.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/medialive v1.31.0 // indirect
@@ -97,7 +97,8 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.6 // indirect
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.27.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/s3control v1.31.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/securitylake v1.3.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sesv2 v1.17.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssm v1.36.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.15.0 // indirect
@@ -106,6 +107,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/transcribe v1.26.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/vpclattice v1.0.1 // indirect
 	github.com/aws/smithy-go v1.13.5 // indirect
 	github.com/beevik/etree v1.1.0 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect

provider/resources.go

@@ -215,6 +215,7 @@ const (
 	timestreamWriteMod          = "TimestreamWrite"          // Timestream Write
 	transcribeMod               = "Transcribe"               // Transcribe
 	transferMod                 = "Transfer"                 // Transfer Service
+	vpclatticeMod               = "VpcLattice"               // VPC Lattice
 	wafMod                      = "Waf"                      // Web Application Firewall (WAF)
 	wafV2Mod                    = "WafV2"                    // Web Application Firewall V2 (WAFV2)
 	wafregionalMod              = "WafRegional"              // Web Application Firewall (WAF) Regional
@@ -2223,6 +2224,7 @@ func Provider() tfbridge.ProviderInfo {
 			// Inspector V2
 			"aws_inspector2_delegated_admin_account":    {Tok: awsResource(inspector2Mod, "DelegatedAdminAccount")},
 			"aws_inspector2_enabler":                    {Tok: awsResource(inspector2Mod, "Enabler")},
+			"aws_inspector2_member_association":         {Tok: awsResource(inspector2Mod, "MemberAssociation")},
 			"aws_inspector2_organization_configuration": {Tok: awsResource(inspector2Mod, "OrganizationConfiguration")},
 
 			// IOT
@@ -2435,6 +2437,7 @@ func Provider() tfbridge.ProviderInfo {
 			"aws_lightsail_container_service_deployment_version": {Tok: awsResource(lightsailMod, "ContainerServiceDeploymentVersion")},
 			"aws_lightsail_container_service":                    {Tok: awsResource(lightsailMod, "ContainerService")},
 			"aws_lightsail_database":                             {Tok: awsResource(lightsailMod, "Database")},
+			"aws_lightsail_distribution":                         {Tok: awsResource(lightsailMod, "Distribution")},
 			"aws_lightsail_disk_attachment":                      {Tok: awsResource(lightsailMod, "Disk_attachment")},
 			"aws_lightsail_disk":                                 {Tok: awsResource(lightsailMod, "Disk")},
 			"aws_lightsail_domain_entry":                         {Tok: awsResource(lightsailMod, "DomainEntry")},
@@ -3526,10 +3529,13 @@ func Provider() tfbridge.ProviderInfo {
 			// Datapipeline
 			"aws_datapipeline_pipeline": {Tok: awsResource(datapipelineMod, "Pipeline")},
 			// Quicksight
-			"aws_quicksight_group":            {Tok: awsResource(quicksightMod, "Group")},
-			"aws_quicksight_user":             {Tok: awsResource(quicksightMod, "User")},
-			"aws_quicksight_group_membership": {Tok: awsResource(quicksightMod, "GroupMembership")},
-			"aws_quicksight_data_source":      {Tok: awsResource(quicksightMod, "DataSource")},
+			"aws_quicksight_account_subscription": {Tok: awsResource(quicksightMod, "AccountSubscription")},
+			"aws_quicksight_data_set":             {Tok: awsResource(quicksightMod, "DataSet")},
+			"aws_quicksight_group":                {Tok: awsResource(quicksightMod, "Group")},
+			"aws_quicksight_user":                 {Tok: awsResource(quicksightMod, "User")},
+			"aws_quicksight_group_membership":     {Tok: awsResource(quicksightMod, "GroupMembership")},
+			"aws_quicksight_data_source":          {Tok: awsResource(quicksightMod, "DataSource")},
+			"aws_quicksight_folder":               {Tok: awsResource(quicksightMod, "Folder")},
 			// Service Quotas
 			"aws_servicequotas_service_quota": {Tok: awsResource(servicequotasMod, "ServiceQuota")},
 			// Fis
@@ -3777,6 +3783,10 @@ func Provider() tfbridge.ProviderInfo {
 
 			// rbin
 			"aws_rbin_rule": {Tok: awsResource(rbinMod, "Rule")},
+
+			// vpclattice
+			"aws_vpclattice_service":         {Tok: awsResource(vpclatticeMod, "Service")},
+			"aws_vpclattice_service_network": {Tok: awsResource(vpclatticeMod, "ServiceNetwork")},
 		},
 		ExtraTypes: map[string]schema.ComplexTypeSpec{
 			"aws:index/Region:Region": {
@@ -5906,7 +5916,10 @@ func Provider() tfbridge.ProviderInfo {
 			"aws_ec2_client_vpn_endpoint": {Tok: awsDataSource(ec2ClientVpnMod, "getEndpoint")},
 
 			// EC2 Transit Gateway
-			"aws_ec2_transit_gateway": {Tok: awsDataSource(ec2TransitGatewayMod, "getTransitGateway")},
+			"aws_ec2_transit_gateway":                          {Tok: awsDataSource(ec2TransitGatewayMod, "getTransitGateway")},
+			"aws_ec2_transit_gateway_attachments":              {Tok: awsDataSource(ec2TransitGatewayMod, "getAttachments")},
+			"aws_ec2_transit_gateway_route_table_associations": {Tok: awsDataSource(ec2TransitGatewayMod, "getRouteTableAssociations")},
+			"aws_ec2_transit_gateway_route_table_propagations": {Tok: awsDataSource(ec2TransitGatewayMod, "getRouteTablePropagations")},
 			"aws_ec2_transit_gateway_dx_gateway_attachment": {
 				Tok: awsDataSource(ec2TransitGatewayMod, "getDirectConnectGatewayAttachment"),
 			},
@@ -6147,6 +6160,8 @@ func Provider() tfbridge.ProviderInfo {
 			// OAM
 			"aws_oam_sink":  {Tok: awsDataSource(oamMod, "getSink")},
 			"aws_oam_sinks": {Tok: awsDataSource(oamMod, "getSinks")},
+			"aws_oam_link":  {Tok: awsDataSource(oamMod, "getLink")},
+			"aws_oam_links": {Tok: awsDataSource(oamMod, "getLinks")},
 			// RedShift
 			"aws_redshift_cluster":             {Tok: awsDataSource(redshiftMod, "getCluster")},
 			"aws_redshift_service_account":     {Tok: awsDataSource(redshiftMod, "getServiceAccount")},
@@ -6388,6 +6403,12 @@ func Provider() tfbridge.ProviderInfo {
 
 			// Interactive Video Service
 			"aws_ivs_stream_key": {Tok: awsDataSource(ivsMod, "getStreamKey")},
+
+			// Quicksight
+			"aws_quicksight_data_set": {Tok: awsDataSource(quicksightMod, "getDataSet")},
+
+			// VpcLattice
+			"aws_vpclattice_service": {Tok: awsDataSource(vpclatticeMod, "getService")},
 		},
 		JavaScript: &tfbridge.JavaScriptInfo{
 			Dependencies: map[string]string{

provider/shim/go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/ProtonMail/go-crypto v0.0.0-20230201104953-d1d05f4e2bfb // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
-	github.com/aws/aws-sdk-go v1.44.232 // indirect
+	github.com/aws/aws-sdk-go v1.44.237 // indirect
 	github.com/aws/aws-sdk-go-v2 v1.17.7 // indirect
 	github.com/aws/aws-sdk-go-v2/config v1.18.12 // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.13.12 // indirect
@@ -25,17 +25,17 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.11.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.20.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/comprehend v1.23.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.21.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.91.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.22.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.93.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/fis v1.14.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/healthlake v1.15.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/healthlake v1.15.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/iam v1.19.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/inspector2 v1.11.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ivschat v1.4.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/kendra v1.38.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/kendra v1.39.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/lambda v1.30.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/medialive v1.31.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/oam v1.1.7 // indirect
@@ -47,7 +47,8 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.1.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.6 // indirect
 	github.com/aws/aws-sdk-go-v2/service/s3control v1.31.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/securitylake v1.3.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sesv2 v1.17.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssm v1.36.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.15.0 // indirect
@@ -56,6 +57,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/transcribe v1.26.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/vpclattice v1.0.1 // indirect
 	github.com/aws/smithy-go v1.13.5 // indirect
 	github.com/beevik/etree v1.1.0 // indirect
 	github.com/cloudflare/circl v1.3.2 // indirect