Merge branch 'main' into fix/set-unmarshaling

aws/middleware/user_agent.go

@@ -34,6 +34,9 @@ const (
 	FeatureMetadata2
 )
 
+// Hardcoded value to specify which version of the user agent we're using
+const uaMetadata = "ua/2.1"
+
 func (k SDKAgentKeyType) string() string {
 	switch k {
 	case APIMetadata:
@@ -107,6 +110,7 @@ type RequestUserAgent struct {
 func NewRequestUserAgent() *RequestUserAgent {
 	userAgent, sdkAgent := smithyhttp.NewUserAgentBuilder(), smithyhttp.NewUserAgentBuilder()
 	addProductName(userAgent)
+	addUserAgentMetadata(userAgent)
 	addProductName(sdkAgent)
 
 	r := &RequestUserAgent{
@@ -134,6 +138,10 @@ func addProductName(builder *smithyhttp.UserAgentBuilder) {
 	builder.AddKeyValue(aws.SDKName, aws.SDKVersion)
 }
 
+func addUserAgentMetadata(builder *smithyhttp.UserAgentBuilder) {
+	builder.AddKey(uaMetadata)
+}
+
 // AddUserAgentKey retrieves a requestUserAgent from the provided stack, or initializes one.
 func AddUserAgentKey(key string) func(*middleware.Stack) error {
 	return func(stack *middleware.Stack) error {
@@ -258,10 +266,10 @@ func (u *RequestUserAgent) HandleBuild(ctx context.Context, in middleware.BuildI
 
 func (u *RequestUserAgent) addHTTPUserAgent(request *smithyhttp.Request) {
 	const userAgent = "User-Agent"
-	updateHTTPHeader(request, userAgent, u.userAgent.Build())
 	if len(u.features) > 0 {
 		updateHTTPHeader(request, userAgent, buildFeatureMetrics(u.features))
 	}
+	updateHTTPHeader(request, userAgent, u.userAgent.Build())
 }
 
 func (u *RequestUserAgent) addHTTPSDKAgent(request *smithyhttp.Request) {

aws/middleware/user_agent_test.go

@@ -16,6 +16,7 @@ import (
 )
 
 var expectedAgent = aws.SDKName + "/" + aws.SDKVersion +
+	" ua/2.1" +
 	" os/" + getNormalizedOSName() +
 	" lang/go#" + strings.Map(rules, languageVersion) + // normalize as the user-agent builder will
 	" md/GOOS#" + runtime.GOOS +
@@ -251,15 +252,15 @@ func TestAddUserAgentFeature(t *testing.T) {
 			Features: []UserAgentFeature{
 				UserAgentFeatureWaiter,
 			},
-			Expect: "m/B " + expectedAgent,
+			Expect: expectedAgent + " " + "m/B",
 		},
 		"two": {
 			Features: []UserAgentFeature{
 				UserAgentFeatureRetryModeAdaptive, // ensure stable order, and idempotent
 				UserAgentFeatureRetryModeAdaptive,
 				UserAgentFeatureWaiter,
 			},
-			Expect: "m/B,F " + expectedAgent,
+			Expect: expectedAgent + " " + "m/B,F",
 		},
 	}
 
@@ -403,7 +404,7 @@ func TestAddSDKAgentKeyValue(t *testing.T) {
 				t.Fatalf("expect User-Agent to be present")
 			}
 			if ua[0] != c.Expect {
-				t.Errorf("User-Agent: %q != %q", c.Expect, ua[0])
+				t.Errorf("User-Agent: expected %q != actual %q", c.Expect, ua[0])
 			}
 		})
 	}

codegen/sdk-codegen/aws-models/appsync.json

@@ -3881,6 +3881,12 @@
                     "traits": {
                         "smithy.api#enumValue": "AMAZON_EVENTBRIDGE"
                     }
+                },
+                "AMAZON_BEDROCK_RUNTIME": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "AMAZON_BEDROCK_RUNTIME"
+                    }
                 }
             }
         },

codegen/sdk-codegen/aws-models/auto-scaling.json

@@ -3571,6 +3571,12 @@
                         "smithy.api#documentation": "<p>The unit of the metric. For a complete list of the units that CloudWatch supports, see the\n                <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html\">MetricDatum</a>\n            data type in the <i>Amazon CloudWatch API Reference</i>.</p>"
                     }
                 },
+                "Period": {
+                    "target": "com.amazonaws.autoscaling#MetricGranularityInSeconds",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n            The period of the metric in seconds. The default value is 60. Accepted values are 10, 30, and 60. For high resolution metric, set the value to less than 60. For more information, see\n            <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/policy-creating-high-resolution-metrics.html\">Create a target tracking policy using high-resolution metrics for faster response</a>.\n        </p>"
+                    }
+                },
                 "Metrics": {
                     "target": "com.amazonaws.autoscaling#TargetTrackingMetricDataQueries",
                     "traits": {
@@ -8151,6 +8157,14 @@
                 "target": "com.amazonaws.autoscaling#MetricDimension"
             }
         },
+        "com.amazonaws.autoscaling#MetricGranularityInSeconds": {
+            "type": "integer",
+            "traits": {
+                "smithy.api#range": {
+                    "min": 1
+                }
+            }
+        },
         "com.amazonaws.autoscaling#MetricGranularityType": {
             "type": "structure",
             "members": {
@@ -10859,6 +10873,12 @@
                         "smithy.api#documentation": "<p>A human-readable label for this metric or expression. This is especially useful if\n            this is a math expression, so that you know what the value represents.</p>"
                     }
                 },
+                "Period": {
+                    "target": "com.amazonaws.autoscaling#MetricGranularityInSeconds",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n        The period of the metric in seconds. The default value is 60. Accepted values are 10, 30, and 60. For high resolution metric, set the value to less than 60. For more information, see\n        <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/policy-creating-high-resolution-metrics.html\">Create a target tracking policy using high-resolution metrics for faster response</a>.\n    </p>"
+                    }
+                },
                 "ReturnData": {
                     "target": "com.amazonaws.autoscaling#ReturnData",
                     "traits": {
@@ -10894,6 +10914,12 @@
                     "traits": {
                         "smithy.api#documentation": "<p>The unit to use for the returned data points. For a complete list of the units that\n            CloudWatch supports, see the <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html\">MetricDatum</a>\n            data type in the <i>Amazon CloudWatch API Reference</i>.</p>"
                     }
+                },
+                "Period": {
+                    "target": "com.amazonaws.autoscaling#MetricGranularityInSeconds",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n            The period of the metric in seconds. The default value is 60. Accepted values are 10, 30, and 60. For high resolution metric, set the value to less than 60. For more information, see\n            <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/policy-creating-high-resolution-metrics.html\">Create a target tracking policy using high-resolution metrics for faster response</a>.\n        </p>"
+                    }
                 }
             },
             "traits": {