fix: populate x-amz-user-agent for browser and user-agent for node

Author: trivikr

packages/middleware-user-agent/src/user-agent-middleware.spec.ts

@@ -23,12 +23,12 @@ describe("userAgentMiddleware", () => {
     const handler = middleware(mockNextHandler, { userAgent: [["cfg/retry-mode", "standard"]] });
     await handler({ input: {}, request: new HttpRequest({ headers: {} }) });
     expect(mockNextHandler.mock.calls.length).toEqual(1);
-    const sdkUserAgent = mockNextHandler.mock.calls[0][0].request.headers[X_AMZ_USER_AGENT];
+    const sdkUserAgent = mockNextHandler.mock.calls[0][0].request.headers[USER_AGENT];
     expect(sdkUserAgent).toEqual(expect.stringContaining("aws-sdk-js/1.0.0"));
     expect(sdkUserAgent).toEqual(expect.stringContaining("default_agent/1.0.0"));
     expect(sdkUserAgent).toEqual(expect.stringContaining("custom_ua/abc"));
     expect(sdkUserAgent).toEqual(expect.stringContaining("cfg/retry-mode/standard"));
-    expect(mockNextHandler.mock.calls[0][0].request.headers[USER_AGENT]).toEqual(
+    expect(mockNextHandler.mock.calls[0][0].request.headers[X_AMZ_USER_AGENT]).toEqual(
       expect.stringContaining("aws-sdk-js/1.0.0")
     );
   });

packages/middleware-user-agent/src/user-agent-middleware.ts

@@ -36,15 +36,22 @@ export const userAgentMiddleware = (options: UserAgentResolvedConfig) => <Output
   const userAgent = context?.userAgent?.map(escapeUserAgent) || [];
   const defaultUserAgent = (await options.defaultUserAgentProvider()).map(escapeUserAgent);
   const customUserAgent = options?.customUserAgent?.map(escapeUserAgent) || [];
+
   // Set value to AWS-specific user agent header
-  headers[X_AMZ_USER_AGENT] = [...defaultUserAgent, ...userAgent, ...customUserAgent].join(SPACE);
+  const sdkUserAgentValue = [...defaultUserAgent, ...userAgent, ...customUserAgent].join(SPACE);
   // Get value to be sent with non-AWS-specific user agent header.
   const normalUAValue = [
     ...defaultUserAgent.filter((section) => section.startsWith("aws-sdk-")),
     ...customUserAgent,
   ].join(SPACE);
-  if (options.runtime !== "browser" && normalUAValue) {
-    headers[USER_AGENT] = headers[USER_AGENT] ? `${headers[USER_AGENT]} ${normalUAValue}` : normalUAValue;
+
+  if (options.runtime !== "browser") {
+    if (normalUAValue) {
+      headers[X_AMZ_USER_AGENT] = headers[X_AMZ_USER_AGENT] ? `${headers[USER_AGENT]} ${normalUAValue}` : normalUAValue;
+    }
+    headers[USER_AGENT] = sdkUserAgentValue;
+  } else {
+    headers[X_AMZ_USER_AGENT] = sdkUserAgentValue;
   }
 
   return next({