Appending Pulumi APN 1.1 marketplace id to User Agent request header. (#5910)

Part of pulumi/home#4348

We will be appending the APN 1.1 string to the user agent header and not replacing it completely as previously discussed. We believe this approach means a smaller surface area for potential future changes upstream.

Author: pose

patches/0001-De-deprecate-bucket_object.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] De-deprecate bucket_object
 
 
 diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go
-index 84953e82f4b..03538985788 100644
+index 84953e82f4..0353898578 100644
 --- a/internal/service/s3/bucket_object.go
 +++ b/internal/service/s3/bucket_object.go
 @@ -67,7 +67,7 @@ func resourceBucketObject() *schema.Resource {

patches/0002-Remove-lakeformation-catalog_resource-default.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Remove lakeformation catalog_resource default
 
 
 diff --git a/internal/service/lakeformation/permissions.go b/internal/service/lakeformation/permissions.go
-index bfcedb69920..582abe2e5b7 100644
+index bfcedb6992..582abe2e5b 100644
 --- a/internal/service/lakeformation/permissions.go
 +++ b/internal/service/lakeformation/permissions.go
 @@ -43,8 +43,8 @@ func ResourcePermissions() *schema.Resource {

patches/0003-Workaround-Autoscaling-launch_configuration-associat.patch

@@ -7,7 +7,7 @@ Subject: [PATCH] Workaround Autoscaling launch_configuration
 - Disable computation of property until fixed.
 
 diff --git a/internal/service/autoscaling/launch_configuration.go b/internal/service/autoscaling/launch_configuration.go
-index 370b7b8630f..7917761fad5 100644
+index 370b7b8630..7917761fad 100644
 --- a/internal/service/autoscaling/launch_configuration.go
 +++ b/internal/service/autoscaling/launch_configuration.go
 @@ -52,7 +52,8 @@ func resourceLaunchConfiguration() *schema.Resource {

patches/0004-Add-custom-appautoscaling-examples.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add custom appautoscaling examples
 
 
 diff --git a/website/docs/r/appautoscaling_policy.html.markdown b/website/docs/r/appautoscaling_policy.html.markdown
-index 512f14f19d6..a111e2a0317 100644
+index 512f14f19d..a111e2a031 100644
 --- a/website/docs/r/appautoscaling_policy.html.markdown
 +++ b/website/docs/r/appautoscaling_policy.html.markdown
 @@ -218,6 +218,34 @@ resource "aws_appautoscaling_policy" "example" {
@@ -44,7 +44,7 @@ index 512f14f19d6..a111e2a0317 100644
 
  This resource supports the following arguments:
 diff --git a/website/docs/r/appautoscaling_target.html.markdown b/website/docs/r/appautoscaling_target.html.markdown
-index 1195b01c6db..7ca6e52d3df 100644
+index 1195b01c6d..7ca6e52d3d 100644
 --- a/website/docs/r/appautoscaling_target.html.markdown
 +++ b/website/docs/r/appautoscaling_target.html.markdown
 @@ -82,6 +82,18 @@ resource "aws_appautoscaling_target" "ecs_target" {

patches/0005-Add-dedicated_host-docs.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add dedicated_host docs
 
 diff --git a/website/docs/d/dedicated_host.html.markdown b/website/docs/d/dedicated_host.html.markdown
 new file mode 100644
-index 00000000000..9473a00c591
+index 0000000000..9473a00c59
 --- /dev/null
 +++ b/website/docs/d/dedicated_host.html.markdown
 @@ -0,0 +1,75 @@
@@ -87,7 +87,7 @@ index 00000000000..9473a00c591
 +```
 diff --git a/website/docs/r/dedicated_host.html.markdown b/website/docs/r/dedicated_host.html.markdown
 new file mode 100644
-index 00000000000..01845aa221c
+index 0000000000..01845aa221
 --- /dev/null
 +++ b/website/docs/r/dedicated_host.html.markdown
 @@ -0,0 +1,71 @@

patches/0006-Revert-WAF-schema-changes.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Revert WAF schema changes
 - This causes far too many types to be generated downstream.
 
 diff --git a/internal/service/wafv2/schemas.go b/internal/service/wafv2/schemas.go
-index c7b7bcf7380..02b638e9fa3 100644
+index c7b7bcf738..02b638e9fa 100644
 --- a/internal/service/wafv2/schemas.go
 +++ b/internal/service/wafv2/schemas.go
 @@ -56,15 +56,15 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema {

patches/0007-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch

@@ -7,7 +7,7 @@ Subject: [PATCH] Catch cty panic in new
 The root cause is not fully understood yet but this might unblock us.
 
 diff --git a/internal/service/sns/topic_subscription.go b/internal/service/sns/topic_subscription.go
-index 0414158410a..2e5c37efc56 100644
+index 0414158410..2e5c37efc5 100644
 --- a/internal/service/sns/topic_subscription.go
 +++ b/internal/service/sns/topic_subscription.go
 @@ -610,9 +610,11 @@ func normalizeTopicSubscriptionDeliveryPolicy(policy string) ([]byte, error) {

patches/0008-Revert-Update-endpointHashIPAddress.patch

@@ -9,7 +9,7 @@ This commit causes never-converging diffs due to incorrect use of
 a computed property in hashing.
 
 diff --git a/internal/service/route53resolver/endpoint.go b/internal/service/route53resolver/endpoint.go
-index c1da4050065..64fe64cdd00 100644
+index c1da405006..64fe64cdd0 100644
 --- a/internal/service/route53resolver/endpoint.go
 +++ b/internal/service/route53resolver/endpoint.go
 @@ -436,7 +436,7 @@ func waitEndpointDeleted(ctx context.Context, conn *route53resolver.Client, id s

patches/0009-Change-default-descriptions-to-Managed-by-Pulumi.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Change default descriptions to "Managed by Pulumi"
 
 
 diff --git a/internal/service/apigateway/api_key.go b/internal/service/apigateway/api_key.go
-index c77a1a31d91..f4d8cb4c016 100644
+index c77a1a31d9..f4d8cb4c01 100644
 --- a/internal/service/apigateway/api_key.go
 +++ b/internal/service/apigateway/api_key.go
 @@ -54,7 +54,7 @@ func resourceAPIKey() *schema.Resource {
@@ -18,7 +18,7 @@ index c77a1a31d91..f4d8cb4c016 100644
  			names.AttrEnabled: {
  				Type:     schema.TypeBool,
 diff --git a/internal/service/appsync/api_key.go b/internal/service/appsync/api_key.go
-index 9bbca4265c2..8880372445f 100644
+index 9bbca4265c..8880372445 100644
 --- a/internal/service/appsync/api_key.go
 +++ b/internal/service/appsync/api_key.go
 @@ -49,7 +49,7 @@ func resourceAPIKey() *schema.Resource {
@@ -31,7 +31,7 @@ index 9bbca4265c2..8880372445f 100644
  			"expires": {
  				Type:     schema.TypeString,
 diff --git a/internal/service/cloudfront/origin_access_control.go b/internal/service/cloudfront/origin_access_control.go
-index 08ea92079f6..ad0004ee9e9 100644
+index 08ea92079f..ad0004ee9e 100644
 --- a/internal/service/cloudfront/origin_access_control.go
 +++ b/internal/service/cloudfront/origin_access_control.go
 @@ -42,7 +42,7 @@ func resourceOriginAccessControl() *schema.Resource {
@@ -44,7 +44,7 @@ index 08ea92079f6..ad0004ee9e9 100644
  			},
  			"etag": {
 diff --git a/internal/service/docdb/cluster_parameter_group.go b/internal/service/docdb/cluster_parameter_group.go
-index d76992a040b..245a84586a2 100644
+index d76992a040..245a84586a 100644
 --- a/internal/service/docdb/cluster_parameter_group.go
 +++ b/internal/service/docdb/cluster_parameter_group.go
 @@ -49,7 +49,7 @@ func resourceClusterParameterGroup() *schema.Resource {
@@ -57,7 +57,7 @@ index d76992a040b..245a84586a2 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/docdb/subnet_group.go b/internal/service/docdb/subnet_group.go
-index 96abcbecf98..bfec91c4990 100644
+index 96abcbecf9..bfec91c499 100644
 --- a/internal/service/docdb/subnet_group.go
 +++ b/internal/service/docdb/subnet_group.go
 @@ -45,7 +45,7 @@ func resourceSubnetGroup() *schema.Resource {
@@ -70,7 +70,7 @@ index 96abcbecf98..bfec91c4990 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/ec2/vpc_security_group.go b/internal/service/ec2/vpc_security_group.go
-index b335b96d447..dda4ce39c19 100644
+index b335b96d44..dda4ce39c1 100644
 --- a/internal/service/ec2/vpc_security_group.go
 +++ b/internal/service/ec2/vpc_security_group.go
 @@ -67,7 +67,7 @@ func resourceSecurityGroup() *schema.Resource {
@@ -83,7 +83,7 @@ index b335b96d447..dda4ce39c19 100644
  			},
  			"egress":  securityGroupRuleSetNestedBlock,
 diff --git a/internal/service/elasticache/parameter_group.go b/internal/service/elasticache/parameter_group.go
-index 4e6a87148dc..ac2e529f977 100644
+index 4e6a87148d..ac2e529f97 100644
 --- a/internal/service/elasticache/parameter_group.go
 +++ b/internal/service/elasticache/parameter_group.go
 @@ -49,7 +49,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -96,7 +96,7 @@ index 4e6a87148dc..ac2e529f977 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/elasticache/subnet_group.go b/internal/service/elasticache/subnet_group.go
-index e733ba52e0f..bea550d91de 100644
+index e733ba52e0..bea550d91d 100644
 --- a/internal/service/elasticache/subnet_group.go
 +++ b/internal/service/elasticache/subnet_group.go
 @@ -46,7 +46,7 @@ func resourceSubnetGroup() *schema.Resource {
@@ -109,7 +109,7 @@ index e733ba52e0f..bea550d91de 100644
  			names.AttrName: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/mediapackage/channel.go b/internal/service/mediapackage/channel.go
-index 5036619ae9f..c041473ad75 100644
+index 5036619ae9..c041473ad7 100644
 --- a/internal/service/mediapackage/channel.go
 +++ b/internal/service/mediapackage/channel.go
 @@ -50,7 +50,7 @@ func ResourceChannel() *schema.Resource {
@@ -122,7 +122,7 @@ index 5036619ae9f..c041473ad75 100644
  			"hls_ingest": {
  				Type:     schema.TypeList,
 diff --git a/internal/service/memorydb/cluster.go b/internal/service/memorydb/cluster.go
-index cbb54366b05..77c5ef1c309 100644
+index cbb54366b0..77c5ef1c30 100644
 --- a/internal/service/memorydb/cluster.go
 +++ b/internal/service/memorydb/cluster.go
 @@ -77,7 +77,7 @@ func resourceCluster() *schema.Resource {
@@ -135,7 +135,7 @@ index cbb54366b05..77c5ef1c309 100644
  				"engine_patch_version": {
  					Type:     schema.TypeString,
 diff --git a/internal/service/memorydb/parameter_group.go b/internal/service/memorydb/parameter_group.go
-index 9976f6de38e..3a993a39483 100644
+index 9976f6de38..3a993a3948 100644
 --- a/internal/service/memorydb/parameter_group.go
 +++ b/internal/service/memorydb/parameter_group.go
 @@ -51,7 +51,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -148,7 +148,7 @@ index 9976f6de38e..3a993a39483 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/memorydb/subnet_group.go b/internal/service/memorydb/subnet_group.go
-index 5bcc4b6868d..82246f48dcf 100644
+index 5bcc4b6868..82246f48dc 100644
 --- a/internal/service/memorydb/subnet_group.go
 +++ b/internal/service/memorydb/subnet_group.go
 @@ -46,7 +46,7 @@ func resourceSubnetGroup() *schema.Resource {
@@ -161,7 +161,7 @@ index 5bcc4b6868d..82246f48dcf 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/neptune/cluster_parameter_group.go b/internal/service/neptune/cluster_parameter_group.go
-index 5d4d3b06a10..10c61ec5916 100644
+index 5d4d3b06a1..10c61ec591 100644
 --- a/internal/service/neptune/cluster_parameter_group.go
 +++ b/internal/service/neptune/cluster_parameter_group.go
 @@ -48,7 +48,7 @@ func resourceClusterParameterGroup() *schema.Resource {
@@ -174,7 +174,7 @@ index 5d4d3b06a10..10c61ec5916 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/neptune/parameter_group.go b/internal/service/neptune/parameter_group.go
-index 7fa8c36e688..da48a333793 100644
+index 7fa8c36e68..da48a33379 100644
 --- a/internal/service/neptune/parameter_group.go
 +++ b/internal/service/neptune/parameter_group.go
 @@ -54,7 +54,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -187,7 +187,7 @@ index 7fa8c36e688..da48a333793 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/neptune/subnet_group.go b/internal/service/neptune/subnet_group.go
-index d756af75db9..d448de51344 100644
+index d756af75db..d448de5134 100644
 --- a/internal/service/neptune/subnet_group.go
 +++ b/internal/service/neptune/subnet_group.go
 @@ -44,7 +44,7 @@ func resourceSubnetGroup() *schema.Resource {
@@ -200,7 +200,7 @@ index d756af75db9..d448de51344 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/rds/cluster_parameter_group.go b/internal/service/rds/cluster_parameter_group.go
-index 4c55067d087..6dcade3a407 100644
+index 4c55067d08..6dcade3a40 100644
 --- a/internal/service/rds/cluster_parameter_group.go
 +++ b/internal/service/rds/cluster_parameter_group.go
 @@ -50,7 +50,7 @@ func resourceClusterParameterGroup() *schema.Resource {
@@ -213,7 +213,7 @@ index 4c55067d087..6dcade3a407 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/rds/option_group.go b/internal/service/rds/option_group.go
-index 821c3163eb9..ec05c242464 100644
+index 821c3163eb..ec05c24246 100644
 --- a/internal/service/rds/option_group.go
 +++ b/internal/service/rds/option_group.go
 @@ -126,7 +126,7 @@ func resourceOptionGroup() *schema.Resource {
@@ -226,7 +226,7 @@ index 821c3163eb9..ec05c242464 100644
  			names.AttrSkipDestroy: {
  				Type:     schema.TypeBool,
 diff --git a/internal/service/rds/parameter_group.go b/internal/service/rds/parameter_group.go
-index 100bd3bae4a..d9d02aea423 100644
+index 100bd3bae4..d9d02aea42 100644
 --- a/internal/service/rds/parameter_group.go
 +++ b/internal/service/rds/parameter_group.go
 @@ -53,7 +53,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -239,7 +239,7 @@ index 100bd3bae4a..d9d02aea423 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/rds/subnet_group.go b/internal/service/rds/subnet_group.go
-index 6d6585687fb..1a3ce3438c1 100644
+index 6d6585687f..1a3ce3438c 100644
 --- a/internal/service/rds/subnet_group.go
 +++ b/internal/service/rds/subnet_group.go
 @@ -47,7 +47,7 @@ func resourceSubnetGroup() *schema.Resource {
@@ -252,7 +252,7 @@ index 6d6585687fb..1a3ce3438c1 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/redshift/parameter_group.go b/internal/service/redshift/parameter_group.go
-index b712d3ec4b4..8c9f92ef8bf 100644
+index b712d3ec4b..8c9f92ef8b 100644
 --- a/internal/service/redshift/parameter_group.go
 +++ b/internal/service/redshift/parameter_group.go
 @@ -50,7 +50,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -265,7 +265,7 @@ index b712d3ec4b4..8c9f92ef8bf 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/redshift/subnet_group.go b/internal/service/redshift/subnet_group.go
-index 7117c8e0612..0fa362cf95a 100644
+index 7117c8e061..0fa362cf95 100644
 --- a/internal/service/redshift/subnet_group.go
 +++ b/internal/service/redshift/subnet_group.go
 @@ -45,7 +45,7 @@ func resourceSubnetGroup() *schema.Resource {
@@ -278,7 +278,7 @@ index 7117c8e0612..0fa362cf95a 100644
  			names.AttrName: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/route53/record.go b/internal/service/route53/record.go
-index 10b95ec0c7f..9dba7752731 100644
+index 10b95ec0c7..9dba775273 100644
 --- a/internal/service/route53/record.go
 +++ b/internal/service/route53/record.go
 @@ -360,7 +360,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, meta any)
@@ -309,7 +309,7 @@ index 10b95ec0c7f..9dba7752731 100644
  		HostedZoneId: aws.String(zoneID),
  	}
 diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go
-index a8126d1ffa3..8ac90091bd4 100644
+index a8126d1ffa..8ac90091bd 100644
 --- a/internal/service/route53/zone.go
 +++ b/internal/service/route53/zone.go
 @@ -51,7 +51,7 @@ func resourceZone() *schema.Resource {
@@ -322,7 +322,7 @@ index a8126d1ffa3..8ac90091bd4 100644
  			},
  			"delegation_set_id": {
 diff --git a/internal/service/route53/zone_association.go b/internal/service/route53/zone_association.go
-index e08f54104a8..7d31bed1e25 100644
+index e08f54104a..7d31bed1e2 100644
 --- a/internal/service/route53/zone_association.go
 +++ b/internal/service/route53/zone_association.go
 @@ -80,7 +80,7 @@ func resourceZoneAssociationCreate(ctx context.Context, d *schema.ResourceData,

patches/0010-Temp-remove-cognito_identity_pool_roles_attachment-e.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Temp remove cognito_identity_pool_roles_attachment example
 
 
 diff --git a/website/docs/r/cognito_identity_pool_roles_attachment.html.markdown b/website/docs/r/cognito_identity_pool_roles_attachment.html.markdown
-index eb058040162..6118ea72236 100644
+index eb05804016..6118ea7223 100644
 --- a/website/docs/r/cognito_identity_pool_roles_attachment.html.markdown
 +++ b/website/docs/r/cognito_identity_pool_roles_attachment.html.markdown
 @@ -12,87 +12,6 @@ Provides an AWS Cognito Identity Pool Roles Attachment.