@aws-sdk/credential-provider-http 3.582.0 → 3.596.0

package/dist-cjs/fromHttp/checkUrl.js

@@ -7,7 +7,7 @@ const LOOPBACK_CIDR_IPv6 = "::1/128";
 const ECS_CONTAINER_HOST = "169.254.170.2";
 const EKS_CONTAINER_HOST_IPv4 = "169.254.170.23";
 const EKS_CONTAINER_HOST_IPv6 = "[fd00:ec2::23]";
-const checkUrl = (url) => {
+const checkUrl = (url, logger) => {
     if (url.protocol === "https:") {
         return;
     }
@@ -41,6 +41,6 @@ const checkUrl = (url) => {
     throw new property_provider_1.CredentialsProviderError(`URL not accepted. It must either be HTTPS or match one of the following:
   - loopback CIDR 127.0.0.0/8 or [::1/128]
   - ECS container host 169.254.170.2
-  - EKS container host 169.254.170.23 or [fd00:ec2::23]`);
+  - EKS container host 169.254.170.23 or [fd00:ec2::23]`, { logger });
 };
 exports.checkUrl = checkUrl;

package/dist-cjs/fromHttp/fromHttp.browser.js

@@ -6,18 +6,18 @@ const property_provider_1 = require("@smithy/property-provider");
 const checkUrl_1 = require("./checkUrl");
 const requestHelpers_1 = require("./requestHelpers");
 const retry_wrapper_1 = require("./retry-wrapper");
-const fromHttp = (options) => {
-    options.logger?.debug("@aws-sdk/credential-provider-http", "fromHttp");
+const fromHttp = (options = {}) => {
+    options.logger?.debug("@aws-sdk/credential-provider-http - fromHttp");
     let host;
     const full = options.credentialsFullUri;
     if (full) {
         host = full;
     }
     else {
-        throw new property_provider_1.CredentialsProviderError("No HTTP credential provider host provided.");
+        throw new property_provider_1.CredentialsProviderError("No HTTP credential provider host provided.", { logger: options.logger });
     }
     const url = new URL(host);
-    (0, checkUrl_1.checkUrl)(url);
+    (0, checkUrl_1.checkUrl)(url, options.logger);
     const requestHandler = new fetch_http_handler_1.FetchHttpHandler();
     return (0, retry_wrapper_1.retryWrapper)(async () => {
         const request = (0, requestHelpers_1.createGetRequest)(url);

package/dist-cjs/fromHttp/fromHttp.js

@@ -13,20 +13,23 @@ const DEFAULT_LINK_LOCAL_HOST = "http://169.254.170.2";
 const AWS_CONTAINER_CREDENTIALS_FULL_URI = "AWS_CONTAINER_CREDENTIALS_FULL_URI";
 const AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE = "AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE";
 const AWS_CONTAINER_AUTHORIZATION_TOKEN = "AWS_CONTAINER_AUTHORIZATION_TOKEN";
-const fromHttp = (options) => {
-    options.logger?.debug("@aws-sdk/credential-provider-http", "fromHttp");
+const fromHttp = (options = {}) => {
+    options.logger?.debug("@aws-sdk/credential-provider-http - fromHttp");
     let host;
     const relative = options.awsContainerCredentialsRelativeUri ?? process.env[AWS_CONTAINER_CREDENTIALS_RELATIVE_URI];
     const full = options.awsContainerCredentialsFullUri ?? process.env[AWS_CONTAINER_CREDENTIALS_FULL_URI];
     const token = options.awsContainerAuthorizationToken ?? process.env[AWS_CONTAINER_AUTHORIZATION_TOKEN];
     const tokenFile = options.awsContainerAuthorizationTokenFile ?? process.env[AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE];
+    const warn = options.logger?.constructor?.name === "NoOpLogger" || !options.logger ? console.warn : options.logger.warn;
     if (relative && full) {
-        console.warn("AWS SDK HTTP credentials provider:", "you have set both awsContainerCredentialsRelativeUri and awsContainerCredentialsFullUri.");
-        console.warn("awsContainerCredentialsFullUri will take precedence.");
+        warn("@aws-sdk/credential-provider-http: " +
+            "you have set both awsContainerCredentialsRelativeUri and awsContainerCredentialsFullUri.");
+        warn("awsContainerCredentialsFullUri will take precedence.");
     }
     if (token && tokenFile) {
-        console.warn("AWS SDK HTTP credentials provider:", "you have set both awsContainerAuthorizationToken and awsContainerAuthorizationTokenFile.");
-        console.warn("awsContainerAuthorizationToken will take precedence.");
+        warn("@aws-sdk/credential-provider-http: " +
+            "you have set both awsContainerAuthorizationToken and awsContainerAuthorizationTokenFile.");
+        warn("awsContainerAuthorizationToken will take precedence.");
     }
     if (full) {
         host = full;
@@ -36,10 +39,10 @@ const fromHttp = (options) => {
     }
     else {
         throw new property_provider_1.CredentialsProviderError(`No HTTP credential provider host provided.
-Set AWS_CONTAINER_CREDENTIALS_FULL_URI or AWS_CONTAINER_CREDENTIALS_RELATIVE_URI.`);
+Set AWS_CONTAINER_CREDENTIALS_FULL_URI or AWS_CONTAINER_CREDENTIALS_RELATIVE_URI.`, { logger: options.logger });
     }
     const url = new URL(host);
-    (0, checkUrl_1.checkUrl)(url);
+    (0, checkUrl_1.checkUrl)(url, options.logger);
     const requestHandler = new node_http_handler_1.NodeHttpHandler({
         requestTimeout: options.timeout ?? 1000,
         connectionTimeout: options.timeout ?? 1000,
@@ -57,7 +60,7 @@ Set AWS_CONTAINER_CREDENTIALS_FULL_URI or AWS_CONTAINER_CREDENTIALS_RELATIVE_URI
             return (0, requestHelpers_1.getCredentials)(result.response);
         }
         catch (e) {
-            throw new property_provider_1.CredentialsProviderError(String(e));
+            throw new property_provider_1.CredentialsProviderError(String(e), { logger: options.logger });
         }
     }, options.maxRetries ?? 3, options.timeout ?? 1000);
 };

package/dist-cjs/fromHttp/requestHelpers.js

@@ -19,11 +19,7 @@ function createGetRequest(url) {
     });
 }
 exports.createGetRequest = createGetRequest;
-async function getCredentials(response) {
-    const contentType = response?.headers["content-type"] ?? response?.headers["Content-Type"] ?? "";
-    if (!contentType.includes("json")) {
-        console.warn("HTTP credential provider response header content-type was not application/json. Observed: " + contentType + ".");
-    }
+async function getCredentials(response, logger) {
     const stream = (0, util_stream_1.sdkStreamMixin)(response.body);
     const str = await stream.transformToString();
     if (response.statusCode === 200) {
@@ -33,7 +29,7 @@ async function getCredentials(response) {
             typeof parsed.Token !== "string" ||
             typeof parsed.Expiration !== "string") {
             throw new property_provider_1.CredentialsProviderError("HTTP credential provider response not of the required format, an object matching: " +
-                "{ AccessKeyId: string, SecretAccessKey: string, Token: string, Expiration: string(rfc3339) }");
+                "{ AccessKeyId: string, SecretAccessKey: string, Token: string, Expiration: string(rfc3339) }", { logger });
         }
         return {
             accessKeyId: parsed.AccessKeyId,
@@ -48,11 +44,11 @@ async function getCredentials(response) {
             parsedBody = JSON.parse(str);
         }
         catch (e) { }
-        throw Object.assign(new property_provider_1.CredentialsProviderError(`Server responded with status: ${response.statusCode}`), {
+        throw Object.assign(new property_provider_1.CredentialsProviderError(`Server responded with status: ${response.statusCode}`, { logger }), {
             Code: parsedBody.Code,
             Message: parsedBody.Message,
         });
     }
-    throw new property_provider_1.CredentialsProviderError(`Server responded with status: ${response.statusCode}`);
+    throw new property_provider_1.CredentialsProviderError(`Server responded with status: ${response.statusCode}`, { logger });
 }
 exports.getCredentials = getCredentials;

package/dist-es/fromHttp/checkUrl.js

@@ -4,7 +4,7 @@ const LOOPBACK_CIDR_IPv6 = "::1/128";
 const ECS_CONTAINER_HOST = "169.254.170.2";
 const EKS_CONTAINER_HOST_IPv4 = "169.254.170.23";
 const EKS_CONTAINER_HOST_IPv6 = "[fd00:ec2::23]";
-export const checkUrl = (url) => {
+export const checkUrl = (url, logger) => {
     if (url.protocol === "https:") {
         return;
     }
@@ -38,5 +38,5 @@ export const checkUrl = (url) => {
     throw new CredentialsProviderError(`URL not accepted. It must either be HTTPS or match one of the following:
   - loopback CIDR 127.0.0.0/8 or [::1/128]
   - ECS container host 169.254.170.2
-  - EKS container host 169.254.170.23 or [fd00:ec2::23]`);
+  - EKS container host 169.254.170.23 or [fd00:ec2::23]`, { logger });
 };

package/dist-es/fromHttp/fromHttp.browser.js

@@ -3,18 +3,18 @@ import { CredentialsProviderError } from "@smithy/property-provider";
 import { checkUrl } from "./checkUrl";
 import { createGetRequest, getCredentials } from "./requestHelpers";
 import { retryWrapper } from "./retry-wrapper";
-export const fromHttp = (options) => {
-    options.logger?.debug("@aws-sdk/credential-provider-http", "fromHttp");
+export const fromHttp = (options = {}) => {
+    options.logger?.debug("@aws-sdk/credential-provider-http - fromHttp");
     let host;
     const full = options.credentialsFullUri;
     if (full) {
         host = full;
     }
     else {
-        throw new CredentialsProviderError("No HTTP credential provider host provided.");
+        throw new CredentialsProviderError("No HTTP credential provider host provided.", { logger: options.logger });
     }
     const url = new URL(host);
-    checkUrl(url);
+    checkUrl(url, options.logger);
     const requestHandler = new FetchHttpHandler();
     return retryWrapper(async () => {
         const request = createGetRequest(url);

package/dist-es/fromHttp/fromHttp.js

@@ -9,20 +9,23 @@ const DEFAULT_LINK_LOCAL_HOST = "http://169.254.170.2";
 const AWS_CONTAINER_CREDENTIALS_FULL_URI = "AWS_CONTAINER_CREDENTIALS_FULL_URI";
 const AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE = "AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE";
 const AWS_CONTAINER_AUTHORIZATION_TOKEN = "AWS_CONTAINER_AUTHORIZATION_TOKEN";
-export const fromHttp = (options) => {
-    options.logger?.debug("@aws-sdk/credential-provider-http", "fromHttp");
+export const fromHttp = (options = {}) => {
+    options.logger?.debug("@aws-sdk/credential-provider-http - fromHttp");
     let host;
     const relative = options.awsContainerCredentialsRelativeUri ?? process.env[AWS_CONTAINER_CREDENTIALS_RELATIVE_URI];
     const full = options.awsContainerCredentialsFullUri ?? process.env[AWS_CONTAINER_CREDENTIALS_FULL_URI];
     const token = options.awsContainerAuthorizationToken ?? process.env[AWS_CONTAINER_AUTHORIZATION_TOKEN];
     const tokenFile = options.awsContainerAuthorizationTokenFile ?? process.env[AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE];
+    const warn = options.logger?.constructor?.name === "NoOpLogger" || !options.logger ? console.warn : options.logger.warn;
     if (relative && full) {
-        console.warn("AWS SDK HTTP credentials provider:", "you have set both awsContainerCredentialsRelativeUri and awsContainerCredentialsFullUri.");
-        console.warn("awsContainerCredentialsFullUri will take precedence.");
+        warn("@aws-sdk/credential-provider-http: " +
+            "you have set both awsContainerCredentialsRelativeUri and awsContainerCredentialsFullUri.");
+        warn("awsContainerCredentialsFullUri will take precedence.");
     }
     if (token && tokenFile) {
-        console.warn("AWS SDK HTTP credentials provider:", "you have set both awsContainerAuthorizationToken and awsContainerAuthorizationTokenFile.");
-        console.warn("awsContainerAuthorizationToken will take precedence.");
+        warn("@aws-sdk/credential-provider-http: " +
+            "you have set both awsContainerAuthorizationToken and awsContainerAuthorizationTokenFile.");
+        warn("awsContainerAuthorizationToken will take precedence.");
     }
     if (full) {
         host = full;
@@ -32,10 +35,10 @@ export const fromHttp = (options) => {
     }
     else {
         throw new CredentialsProviderError(`No HTTP credential provider host provided.
-Set AWS_CONTAINER_CREDENTIALS_FULL_URI or AWS_CONTAINER_CREDENTIALS_RELATIVE_URI.`);
+Set AWS_CONTAINER_CREDENTIALS_FULL_URI or AWS_CONTAINER_CREDENTIALS_RELATIVE_URI.`, { logger: options.logger });
     }
     const url = new URL(host);
-    checkUrl(url);
+    checkUrl(url, options.logger);
     const requestHandler = new NodeHttpHandler({
         requestTimeout: options.timeout ?? 1000,
         connectionTimeout: options.timeout ?? 1000,
@@ -53,7 +56,7 @@ Set AWS_CONTAINER_CREDENTIALS_FULL_URI or AWS_CONTAINER_CREDENTIALS_RELATIVE_URI
             return getCredentials(result.response);
         }
         catch (e) {
-            throw new CredentialsProviderError(String(e));
+            throw new CredentialsProviderError(String(e), { logger: options.logger });
         }
     }, options.maxRetries ?? 3, options.timeout ?? 1000);
 };

package/dist-es/fromHttp/requestHelpers.js

@@ -15,11 +15,7 @@ export function createGetRequest(url) {
         fragment: url.hash,
     });
 }
-export async function getCredentials(response) {
-    const contentType = response?.headers["content-type"] ?? response?.headers["Content-Type"] ?? "";
-    if (!contentType.includes("json")) {
-        console.warn("HTTP credential provider response header content-type was not application/json. Observed: " + contentType + ".");
-    }
+export async function getCredentials(response, logger) {
     const stream = sdkStreamMixin(response.body);
     const str = await stream.transformToString();
     if (response.statusCode === 200) {
@@ -29,7 +25,7 @@ export async function getCredentials(response) {
             typeof parsed.Token !== "string" ||
             typeof parsed.Expiration !== "string") {
             throw new CredentialsProviderError("HTTP credential provider response not of the required format, an object matching: " +
-                "{ AccessKeyId: string, SecretAccessKey: string, Token: string, Expiration: string(rfc3339) }");
+                "{ AccessKeyId: string, SecretAccessKey: string, Token: string, Expiration: string(rfc3339) }", { logger });
         }
         return {
             accessKeyId: parsed.AccessKeyId,
@@ -44,10 +40,10 @@ export async function getCredentials(response) {
             parsedBody = JSON.parse(str);
         }
         catch (e) { }
-        throw Object.assign(new CredentialsProviderError(`Server responded with status: ${response.statusCode}`), {
+        throw Object.assign(new CredentialsProviderError(`Server responded with status: ${response.statusCode}`, { logger }), {
             Code: parsedBody.Code,
             Message: parsedBody.Message,
         });
     }
-    throw new CredentialsProviderError(`Server responded with status: ${response.statusCode}`);
+    throw new CredentialsProviderError(`Server responded with status: ${response.statusCode}`, { logger });
 }

package/dist-types/fromHttp/checkUrl.d.ts

@@ -1,7 +1,9 @@
+import { Logger } from "@smithy/types";
 /**
  * @internal
  *
  * @param url - to be validated.
+ * @param logger - passed to CredentialsProviderError.
  * @throws if not acceptable to this provider.
  */
-export declare const checkUrl: (url: URL) => void;
+export declare const checkUrl: (url: URL, logger?: Logger) => void;

package/dist-types/fromHttp/fromHttp.browser.d.ts

@@ -3,4 +3,4 @@ import type { FromHttpOptions } from "./fromHttpTypes";
 /**
  * Creates a provider that gets credentials via HTTP request.
  */
-export declare const fromHttp: (options: FromHttpOptions) => AwsCredentialIdentityProvider;
+export declare const fromHttp: (options?: FromHttpOptions) => AwsCredentialIdentityProvider;

package/dist-types/fromHttp/fromHttp.d.ts

@@ -3,4 +3,4 @@ import type { FromHttpOptions } from "./fromHttpTypes";
 /**
  * Creates a provider that gets credentials via HTTP request.
  */
-export declare const fromHttp: (options: FromHttpOptions) => AwsCredentialIdentityProvider;
+export declare const fromHttp: (options?: FromHttpOptions) => AwsCredentialIdentityProvider;

package/dist-types/fromHttp/requestHelpers.d.ts

@@ -1,6 +1,6 @@
 import { AwsCredentialIdentity } from "@aws-sdk/types";
 import { HttpRequest } from "@smithy/protocol-http";
-import { HttpResponse } from "@smithy/types";
+import { HttpResponse, Logger } from "@smithy/types";
 /**
  * @internal
  */
@@ -8,4 +8,4 @@ export declare function createGetRequest(url: URL): HttpRequest;
 /**
  * @internal
  */
-export declare function getCredentials(response: HttpResponse): Promise<AwsCredentialIdentity>;
+export declare function getCredentials(response: HttpResponse, logger?: Logger): Promise<AwsCredentialIdentity>;

package/dist-types/ts3.4/fromHttp/checkUrl.d.ts

@@ -1 +1,2 @@
-export declare const checkUrl: (url: URL) => void;
+import { Logger } from "@smithy/types";
+export declare const checkUrl: (url: URL, logger?: Logger) => void;

package/dist-types/ts3.4/fromHttp/fromHttp.browser.d.ts

@@ -1,5 +1,5 @@
 import { AwsCredentialIdentityProvider } from "@smithy/types";
 import { FromHttpOptions } from "./fromHttpTypes";
 export declare const fromHttp: (
-  options: FromHttpOptions
+  options?: FromHttpOptions
 ) => AwsCredentialIdentityProvider;

package/dist-types/ts3.4/fromHttp/fromHttp.d.ts

@@ -1,5 +1,5 @@
 import { AwsCredentialIdentityProvider } from "@smithy/types";
 import { FromHttpOptions } from "./fromHttpTypes";
 export declare const fromHttp: (
-  options: FromHttpOptions
+  options?: FromHttpOptions
 ) => AwsCredentialIdentityProvider;

package/dist-types/ts3.4/fromHttp/requestHelpers.d.ts

@@ -1,7 +1,8 @@
 import { AwsCredentialIdentity } from "@aws-sdk/types";
 import { HttpRequest } from "@smithy/protocol-http";
-import { HttpResponse } from "@smithy/types";
+import { HttpResponse, Logger } from "@smithy/types";
 export declare function createGetRequest(url: URL): HttpRequest;
 export declare function getCredentials(
-  response: HttpResponse
+  response: HttpResponse,
+  logger?: Logger
 ): Promise<AwsCredentialIdentity>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-http",
-  "version": "3.582.0",
+  "version": "3.596.0",
   "description": "AWS credential provider for containers and HTTP sources",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -29,9 +29,9 @@
     "@aws-sdk/types": "3.577.0",
     "@smithy/fetch-http-handler": "^3.0.1",
     "@smithy/node-http-handler": "^3.0.0",
-    "@smithy/property-provider": "^3.0.0",
+    "@smithy/property-provider": "^3.1.0",
     "@smithy/protocol-http": "^4.0.0",
-    "@smithy/smithy-client": "^3.0.1",
+    "@smithy/smithy-client": "^3.1.1",
     "@smithy/types": "^3.0.0",
     "@smithy/util-stream": "^3.0.1",
     "tslib": "^2.6.2"