@smithy/credential-provider-imds 4.2.14 → 4.3.0

package/dist-cjs/index.js

@@ -1,31 +1,47 @@
 'use strict';
 
-var propertyProvider = require('@smithy/property-provider');
-var url = require('url');
-var buffer = require('buffer');
-var http = require('http');
-var nodeConfigProvider = require('@smithy/node-config-provider');
-var urlParser = require('@smithy/url-parser');
+var node_url = require('node:url');
+var config = require('@smithy/core/config');
+var node_http = require('node:http');
+var protocols = require('@smithy/core/protocols');
+
+const isImdsCredentials = (arg) => Boolean(arg) &&
+    typeof arg === "object" &&
+    typeof arg.AccessKeyId === "string" &&
+    typeof arg.SecretAccessKey === "string" &&
+    typeof arg.Token === "string" &&
+    typeof arg.Expiration === "string";
+const fromImdsCredentials = (creds) => ({
+    accessKeyId: creds.AccessKeyId,
+    secretAccessKey: creds.SecretAccessKey,
+    sessionToken: creds.Token,
+    expiration: new Date(creds.Expiration),
+    ...(creds.AccountId && { accountId: creds.AccountId }),
+});
+
+const DEFAULT_TIMEOUT = 1000;
+const DEFAULT_MAX_RETRIES = 0;
+const providerConfigFromInit = ({ maxRetries = DEFAULT_MAX_RETRIES, timeout = DEFAULT_TIMEOUT, }) => ({ maxRetries, timeout });
 
 function httpRequest(options) {
     return new Promise((resolve, reject) => {
-        const req = http.request({
+        const req = node_http.request({
             method: "GET",
             ...options,
             hostname: options.hostname?.replace(/^\[(.+)\]$/, "$1"),
         });
         req.on("error", (err) => {
-            reject(Object.assign(new propertyProvider.ProviderError("Unable to connect to instance metadata service"), err));
+            reject(Object.assign(new config.ProviderError("Unable to connect to instance metadata service"), err));
             req.destroy();
         });
         req.on("timeout", () => {
-            reject(new propertyProvider.ProviderError("TimeoutError from instance metadata service"));
+            reject(new config.ProviderError("TimeoutError from instance metadata service"));
             req.destroy();
         });
         req.on("response", (res) => {
             const { statusCode = 400 } = res;
             if (statusCode < 200 || 300 <= statusCode) {
-                reject(Object.assign(new propertyProvider.ProviderError("Error response received from instance metadata service"), { statusCode }));
+                reject(Object.assign(new config.ProviderError("Error response received from instance metadata service"), { statusCode }));
                 req.destroy();
             }
             const chunks = [];
@@ -33,7 +49,7 @@ function httpRequest(options) {
                 chunks.push(chunk);
             });
             res.on("end", () => {
-                resolve(buffer.Buffer.concat(chunks));
+                resolve(Buffer.concat(chunks));
                 req.destroy();
             });
         });
@@ -41,24 +57,6 @@ function httpRequest(options) {
     });
 }
 
-const isImdsCredentials = (arg) => Boolean(arg) &&
-    typeof arg === "object" &&
-    typeof arg.AccessKeyId === "string" &&
-    typeof arg.SecretAccessKey === "string" &&
-    typeof arg.Token === "string" &&
-    typeof arg.Expiration === "string";
-const fromImdsCredentials = (creds) => ({
-    accessKeyId: creds.AccessKeyId,
-    secretAccessKey: creds.SecretAccessKey,
-    sessionToken: creds.Token,
-    expiration: new Date(creds.Expiration),
-    ...(creds.AccountId && { accountId: creds.AccountId }),
-});
-
-const DEFAULT_TIMEOUT = 1000;
-const DEFAULT_MAX_RETRIES = 0;
-const providerConfigFromInit = ({ maxRetries = DEFAULT_MAX_RETRIES, timeout = DEFAULT_TIMEOUT, }) => ({ maxRetries, timeout });
-
 const retry = (toRetry, maxRetries) => {
     let promise = toRetry();
     for (let i = 0; i < maxRetries; i++) {
@@ -76,7 +74,7 @@ const fromContainerMetadata = (init = {}) => {
         const requestOptions = await getCmdsUri({ logger: init.logger });
         const credsResponse = JSON.parse(await requestFromEcsImds(timeout, requestOptions));
         if (!isImdsCredentials(credsResponse)) {
-            throw new propertyProvider.CredentialsProviderError("Invalid response received from instance metadata service.", {
+            throw new config.CredentialsProviderError("Invalid response received from instance metadata service.", {
                 logger: init.logger,
             });
         }
@@ -113,15 +111,15 @@ const getCmdsUri = async ({ logger }) => {
         };
     }
     if (process.env[ENV_CMDS_FULL_URI]) {
-        const parsed = url.parse(process.env[ENV_CMDS_FULL_URI]);
+        const parsed = node_url.parse(process.env[ENV_CMDS_FULL_URI]);
         if (!parsed.hostname || !(parsed.hostname in GREENGRASS_HOSTS)) {
-            throw new propertyProvider.CredentialsProviderError(`${parsed.hostname} is not a valid container metadata service hostname`, {
+            throw new config.CredentialsProviderError(`${parsed.hostname} is not a valid container metadata service hostname`, {
                 tryNextLink: false,
                 logger,
             });
         }
         if (!parsed.protocol || !(parsed.protocol in GREENGRASS_PROTOCOLS)) {
-            throw new propertyProvider.CredentialsProviderError(`${parsed.protocol} is not a valid container metadata service protocol`, {
+            throw new config.CredentialsProviderError(`${parsed.protocol} is not a valid container metadata service protocol`, {
                 tryNextLink: false,
                 logger,
             });
@@ -131,7 +129,7 @@ const getCmdsUri = async ({ logger }) => {
             port: parsed.port ? parseInt(parsed.port, 10) : undefined,
         };
     }
-    throw new propertyProvider.CredentialsProviderError("The container metadata credential provider cannot be used unless" +
+    throw new config.CredentialsProviderError("The container metadata credential provider cannot be used unless" +
         ` the ${ENV_CMDS_RELATIVE_URI} or ${ENV_CMDS_FULL_URI} environment` +
         " variable is set", {
         tryNextLink: false,
@@ -139,7 +137,7 @@ const getCmdsUri = async ({ logger }) => {
     });
 };
 
-class InstanceMetadataV1FallbackError extends propertyProvider.CredentialsProviderError {
+class InstanceMetadataV1FallbackError extends config.CredentialsProviderError {
     tryNextLink;
     name = "InstanceMetadataV1FallbackError";
     constructor(message, tryNextLink = true) {
@@ -177,10 +175,10 @@ const ENDPOINT_MODE_CONFIG_OPTIONS = {
     default: EndpointMode.IPv4,
 };
 
-const getInstanceMetadataEndpoint = async () => urlParser.parseUrl((await getFromEndpointConfig()) || (await getFromEndpointModeConfig()));
-const getFromEndpointConfig = async () => nodeConfigProvider.loadConfig(ENDPOINT_CONFIG_OPTIONS)();
+const getInstanceMetadataEndpoint = async () => protocols.parseUrl((await getFromEndpointConfig()) || (await getFromEndpointModeConfig()));
+const getFromEndpointConfig = async () => config.loadConfig(ENDPOINT_CONFIG_OPTIONS)();
 const getFromEndpointModeConfig = async () => {
-    const endpointMode = await nodeConfigProvider.loadConfig(ENDPOINT_MODE_CONFIG_OPTIONS)();
+    const endpointMode = await config.loadConfig(ENDPOINT_MODE_CONFIG_OPTIONS)();
     switch (endpointMode) {
         case EndpointMode.IPv4:
             return exports.Endpoint.IPv4;
@@ -249,12 +247,12 @@ const getInstanceMetadataProvider = (init = {}) => {
         if (isImdsV1Fallback) {
             let fallbackBlockedFromProfile = false;
             let fallbackBlockedFromProcessEnv = false;
-            const configValue = await nodeConfigProvider.loadConfig({
+            const configValue = await config.loadConfig({
                 environmentVariableSelector: (env) => {
                     const envValue = env[AWS_EC2_METADATA_V1_DISABLED];
                     fallbackBlockedFromProcessEnv = !!envValue && envValue !== "false";
                     if (envValue === undefined) {
-                        throw new propertyProvider.CredentialsProviderError(`${AWS_EC2_METADATA_V1_DISABLED} not set in env, checking config file next.`, { logger: init.logger });
+                        throw new config.CredentialsProviderError(`${AWS_EC2_METADATA_V1_DISABLED} not set in env, checking config file next.`, { logger: init.logger });
                     }
                     return fallbackBlockedFromProcessEnv;
                 },
@@ -353,7 +351,7 @@ const getCredentialsFromProfile = async (profile, options, init) => {
         path: IMDS_PATH + profile,
     })).toString());
     if (!isImdsCredentials(credentialsResponse)) {
-        throw new propertyProvider.CredentialsProviderError("Invalid response received from instance metadata service.", {
+        throw new config.CredentialsProviderError("Invalid response received from instance metadata service.", {
             logger: init.logger,
         });
     }

package/dist-es/error/InstanceMetadataV1FallbackError.js

@@ -1,4 +1,4 @@
-import { CredentialsProviderError } from "@smithy/property-provider";
+import { CredentialsProviderError } from "@smithy/core/config";
 export class InstanceMetadataV1FallbackError extends CredentialsProviderError {
     tryNextLink;
     name = "InstanceMetadataV1FallbackError";

package/dist-es/fromContainerMetadata.js

@@ -1,8 +1,8 @@
-import { CredentialsProviderError } from "@smithy/property-provider";
-import { parse } from "url";
-import { httpRequest } from "./remoteProvider/httpRequest";
+import { parse } from "node:url";
+import { CredentialsProviderError } from "@smithy/core/config";
 import { fromImdsCredentials, isImdsCredentials } from "./remoteProvider/ImdsCredentials";
 import { providerConfigFromInit } from "./remoteProvider/RemoteProviderInit";
+import { httpRequest } from "./remoteProvider/httpRequest";
 import { retry } from "./remoteProvider/retry";
 export const ENV_CMDS_FULL_URI = "AWS_CONTAINER_CREDENTIALS_FULL_URI";
 export const ENV_CMDS_RELATIVE_URI = "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI";

package/dist-es/fromInstanceMetadata.js

@@ -1,9 +1,8 @@
-import { loadConfig } from "@smithy/node-config-provider";
-import { CredentialsProviderError } from "@smithy/property-provider";
+import { CredentialsProviderError, loadConfig } from "@smithy/core/config";
 import { InstanceMetadataV1FallbackError } from "./error/InstanceMetadataV1FallbackError";
-import { httpRequest } from "./remoteProvider/httpRequest";
 import { fromImdsCredentials, isImdsCredentials } from "./remoteProvider/ImdsCredentials";
 import { providerConfigFromInit } from "./remoteProvider/RemoteProviderInit";
+import { httpRequest } from "./remoteProvider/httpRequest";
 import { retry } from "./remoteProvider/retry";
 import { getInstanceMetadataEndpoint } from "./utils/getInstanceMetadataEndpoint";
 import { staticStabilityProvider } from "./utils/staticStabilityProvider";

package/dist-es/remoteProvider/httpRequest.js

@@ -1,6 +1,5 @@
-import { ProviderError } from "@smithy/property-provider";
-import { Buffer } from "buffer";
-import { request } from "http";
+import { request } from "node:http";
+import { ProviderError } from "@smithy/core/config";
 export function httpRequest(options) {
     return new Promise((resolve, reject) => {
         const req = request({

package/dist-es/utils/getInstanceMetadataEndpoint.js

@@ -1,5 +1,5 @@
-import { loadConfig } from "@smithy/node-config-provider";
-import { parseUrl } from "@smithy/url-parser";
+import { loadConfig } from "@smithy/core/config";
+import { parseUrl } from "@smithy/core/protocols";
 import { Endpoint as InstanceMetadataEndpoint } from "../config/Endpoint";
 import { ENDPOINT_CONFIG_OPTIONS } from "../config/EndpointConfigOptions";
 import { EndpointMode } from "../config/EndpointMode";

package/dist-types/config/EndpointConfigOptions.d.ts

@@ -1,4 +1,4 @@
-import type { LoadedConfigSelectors } from "@smithy/node-config-provider";
+import type { LoadedConfigSelectors } from "@smithy/core/config";
 /**
  * @internal
  */

package/dist-types/config/EndpointModeConfigOptions.d.ts

@@ -1,4 +1,4 @@
-import type { LoadedConfigSelectors } from "@smithy/node-config-provider";
+import type { LoadedConfigSelectors } from "@smithy/core/config";
 /**
  * @internal
  */

package/dist-types/error/InstanceMetadataV1FallbackError.d.ts

@@ -1,4 +1,4 @@
-import { CredentialsProviderError } from "@smithy/property-provider";
+import { CredentialsProviderError } from "@smithy/core/config";
 /**
  * @public
  *

package/dist-types/fromContainerMetadata.d.ts

@@ -1,5 +1,5 @@
 import type { AwsCredentialIdentityProvider } from "@smithy/types";
-import type { RemoteProviderInit } from "./remoteProvider/RemoteProviderInit";
+import { type RemoteProviderInit } from "./remoteProvider/RemoteProviderInit";
 /**
  * @internal
  */

package/dist-types/fromInstanceMetadata.d.ts

@@ -1,5 +1,5 @@
 import type { Provider } from "@smithy/types";
-import type { RemoteProviderInit } from "./remoteProvider/RemoteProviderInit";
+import { type RemoteProviderInit } from "./remoteProvider/RemoteProviderInit";
 import type { InstanceMetadataCredentials } from "./types";
 /**
  * @internal

package/dist-types/remoteProvider/httpRequest.d.ts

@@ -1,5 +1,4 @@
-import { Buffer } from "buffer";
-import type { RequestOptions } from "http";
+import { type RequestOptions } from "node:http";
 /**
  * @internal
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithy/credential-provider-imds",
-  "version": "4.2.14",
+  "version": "4.3.0",
   "description": "AWS credential provider that sources credentials from the EC2 instance metadata service and ECS container metadata service",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -27,10 +27,8 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "@smithy/node-config-provider": "^4.3.14",
-    "@smithy/property-provider": "^4.2.14",
+    "@smithy/core": "^3.24.0",
     "@smithy/types": "^4.14.1",
-    "@smithy/url-parser": "^4.2.14",
     "tslib": "^2.6.2"
   },
   "devDependencies": {