@hot-updater/aws 0.30.9 → 0.30.10

package/dist/iac/index.cjs

@@ -7325,7 +7325,7 @@ var SSMKeyPairManager = class {
 };
 //#endregion
 //#region iac/templates.ts
-const getConfigScaffold = (build, { profile }) => {
+const getConfigScaffold = (build, authMode) => {
 	const storageConfig = {
 		imports: [{
 			pkg: "@hot-updater/aws",
@@ -7343,21 +7343,42 @@ const getConfigScaffold = (build, { profile }) => {
     cloudfrontDistributionId: process.env.HOT_UPDATER_CLOUDFRONT_DISTRIBUTION_ID!,
   })`
 	};
-	let helperStatements = [];
-	if (profile) helperStatements = [{
-		name: "commonOptions",
-		strategy: "merge-object",
-		code: `
+	let helperStatements;
+	switch (authMode.mode) {
+		case "sso":
+			helperStatements = [{
+				name: "commonOptions",
+				strategy: "merge-object",
+				code: `
 const commonOptions = {
   bucketName: process.env.HOT_UPDATER_S3_BUCKET_NAME!,
   region: process.env.HOT_UPDATER_S3_REGION!,
   credentials: fromSSO({ profile: process.env.HOT_UPDATER_AWS_PROFILE! }),
 };`.trim()
-	}];
-	else helperStatements = [{
-		name: "commonOptions",
-		strategy: "merge-object",
-		code: `
+			}];
+			break;
+		case "local":
+			helperStatements = [{
+				name: "commonOptions",
+				strategy: "merge-object",
+				code: authMode.profile ? `
+const commonOptions = {
+  bucketName: process.env.HOT_UPDATER_S3_BUCKET_NAME!,
+  region: process.env.HOT_UPDATER_S3_REGION!,
+  credentials: fromIni({ profile: process.env.HOT_UPDATER_AWS_PROFILE! }),
+};`.trim() : `
+const commonOptions = {
+  bucketName: process.env.HOT_UPDATER_S3_BUCKET_NAME!,
+  region: process.env.HOT_UPDATER_S3_REGION!,
+  credentials: fromNodeProviderChain(),
+};`.trim()
+			}];
+			break;
+		case "account":
+			helperStatements = [{
+				name: "commonOptions",
+				strategy: "merge-object",
+				code: `
 const commonOptions = {
   bucketName: process.env.HOT_UPDATER_S3_BUCKET_NAME!,
   region: process.env.HOT_UPDATER_S3_REGION!,
@@ -7366,12 +7387,25 @@ const commonOptions = {
     secretAccessKey: process.env.HOT_UPDATER_S3_SECRET_ACCESS_KEY!,
   },
 };`.trim()
-	}];
+			}];
+			break;
+	}
 	const builder = new _hot_updater_cli_tools.ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).setIntermediateCode(helperStatements.map((statement) => statement.code.trim()).join("\n\n"));
-	if (profile) builder.addImport({
-		pkg: "@aws-sdk/credential-provider-sso",
-		named: ["fromSSO"]
-	});
+	switch (authMode.mode) {
+		case "sso":
+			builder.addImport({
+				pkg: "@aws-sdk/credential-provider-sso",
+				named: ["fromSSO"]
+			});
+			break;
+		case "local":
+			builder.addImport({
+				pkg: "@aws-sdk/credential-providers",
+				named: [authMode.profile ? "fromIni" : "fromNodeProviderChain"]
+			});
+			break;
+		case "account": break;
+	}
 	return (0, _hot_updater_cli_tools.createHotUpdaterConfigScaffoldFromBuilder)(builder, { helperStatements });
 };
 const SOURCE_TEMPLATE = `// Add this to your App.tsx
@@ -7402,15 +7436,28 @@ const runInit = async ({ build }) => {
 		process.exit(1);
 	}
 	let credentials;
+	let configAuthMode = { mode: "account" };
+	let awsProfile = null;
 	const mode = await _hot_updater_cli_tools.p.select({
 		message: "Select the mode to login to AWS",
-		options: [{
-			label: "AWS SSO Login",
-			value: "sso"
-		}, {
-			label: "AWS Access Key ID & Secret Access Key",
-			value: "account"
-		}]
+		options: [
+			{
+				label: "Current AWS CLI Session / Default Credential Chain",
+				value: "local-session"
+			},
+			{
+				label: "Shared AWS Profile",
+				value: "shared-profile"
+			},
+			{
+				label: "AWS SSO Login",
+				value: "sso"
+			},
+			{
+				label: "AWS Access Key ID & Secret Access Key",
+				value: "account"
+			}
+		]
 	});
 	if (_hot_updater_cli_tools.p.isCancel(mode)) process.exit(1);
 	_hot_updater_cli_tools.p.log.message(_hot_updater_cli_tools.colors.blue("The following permissions are required:"));
@@ -7419,7 +7466,6 @@ const runInit = async ({ build }) => {
 	_hot_updater_cli_tools.p.log.message(`${_hot_updater_cli_tools.colors.blue("CloudFrontFullAccess")}: Create and update CloudFront distributions`);
 	_hot_updater_cli_tools.p.log.message(`${_hot_updater_cli_tools.colors.blue("IAMFullAccess")}: Get or create IAM roles for Lambda@Edge`);
 	_hot_updater_cli_tools.p.log.message(`${_hot_updater_cli_tools.colors.blue("AmazonSSMFullAccess")}: Access to SSM Parameters for storing CloudFront key pairs`);
-	let ssoProfile = null;
 	if (mode === "sso") try {
 		const profile = await _hot_updater_cli_tools.p.text({
 			message: "Enter the SSO profile name",
@@ -7427,7 +7473,11 @@ const runInit = async ({ build }) => {
 			placeholder: "default"
 		});
 		if (_hot_updater_cli_tools.p.isCancel(profile)) process.exit(1);
-		ssoProfile = profile;
+		awsProfile = profile;
+		configAuthMode = {
+			mode: "sso",
+			profile
+		};
 		await execa("aws", [
 			"sso",
 			"login",
@@ -7442,6 +7492,34 @@ const runInit = async ({ build }) => {
 		if (error instanceof ExecaError) _hot_updater_cli_tools.p.log.error(error.stdout || error.stderr || error.message);
 		process.exit(1);
 	}
+	else if (mode === "local-session") try {
+		configAuthMode = {
+			mode: "local",
+			profile: null
+		};
+		credentials = await (0, _aws_sdk_credential_providers.fromNodeProviderChain)()();
+	} catch (error) {
+		if (error instanceof Error) _hot_updater_cli_tools.p.log.error(error.message);
+		process.exit(1);
+	}
+	else if (mode === "shared-profile") try {
+		const profile = await _hot_updater_cli_tools.p.text({
+			message: "Enter the AWS profile name",
+			defaultValue: process.env.AWS_PROFILE ?? "default",
+			placeholder: process.env.AWS_PROFILE ?? "default",
+			validate: (value) => (value ?? "").trim() ? void 0 : "AWS profile name is required"
+		});
+		if (_hot_updater_cli_tools.p.isCancel(profile)) process.exit(1);
+		awsProfile = profile.trim();
+		configAuthMode = {
+			mode: "local",
+			profile: awsProfile
+		};
+		credentials = await (0, _aws_sdk_credential_providers.fromIni)({ profile: awsProfile })();
+	} catch (error) {
+		if (error instanceof Error) _hot_updater_cli_tools.p.log.error(error.message);
+		process.exit(1);
+	}
 	else {
 		const creds = await _hot_updater_cli_tools.p.group({
 			accessKeyId: () => _hot_updater_cli_tools.p.text({
@@ -7458,6 +7536,7 @@ const runInit = async ({ build }) => {
 			accessKeyId: creds.accessKeyId,
 			secretAccessKey: creds.secretAccessKey
 		};
+		configAuthMode = { mode: "account" };
 	}
 	if (!credentials) {
 		_hot_updater_cli_tools.p.log.error("Couldn't fetch the credentials.");
@@ -7542,7 +7621,7 @@ const runInit = async ({ build }) => {
 		distributionId,
 		accountId
 	});
-	const configWriteResult = await (0, _hot_updater_cli_tools.writeHotUpdaterConfig)(getConfigScaffold(build, { profile: ssoProfile }));
+	const configWriteResult = await (0, _hot_updater_cli_tools.writeHotUpdaterConfig)(getConfigScaffold(build, configAuthMode));
 	await (0, _hot_updater_cli_tools.makeEnv)({
 		HOT_UPDATER_S3_BUCKET_NAME: bucketName,
 		HOT_UPDATER_S3_REGION: bucketRegion,
@@ -7556,10 +7635,11 @@ const runInit = async ({ build }) => {
 				value: credentials.secretAccessKey
 			}
 		} : {},
-		...ssoProfile !== null ? { HOT_UPDATER_AWS_PROFILE: ssoProfile } : {},
+		...awsProfile !== null ? { HOT_UPDATER_AWS_PROFILE: awsProfile } : {},
 		HOT_UPDATER_CLOUDFRONT_DISTRIBUTION_ID: distributionId
 	});
 	if (mode === "sso") await (0, _hot_updater_cli_tools.ensureInstallPackages)({ devDependencies: ["@aws-sdk/credential-provider-sso"] });
+	else if (mode === "local-session" || mode === "shared-profile") await (0, _hot_updater_cli_tools.ensureInstallPackages)({ devDependencies: ["@aws-sdk/credential-providers"] });
 	_hot_updater_cli_tools.p.log.success("Generated '.env.hotupdater' file with AWS settings.");
 	if (configWriteResult.status === "created") _hot_updater_cli_tools.p.log.success("Generated 'hot-updater.config.ts' file with AWS settings.");
 	else if (configWriteResult.status === "merged") _hot_updater_cli_tools.p.log.success("Updated 'hot-updater.config.ts' file with AWS settings.");

package/dist/iac/index.mjs

@@ -1,5 +1,5 @@
 import { createRequire } from "node:module";
-import { fromSSO } from "@aws-sdk/credential-providers";
+import { fromIni, fromNodeProviderChain, fromSSO } from "@aws-sdk/credential-providers";
 import { ConfigBuilder, colors, copyDirToTmp, createHotUpdaterConfigScaffoldFromBuilder, createZip, ensureInstallPackages, getCwd, link, makeEnv, p, transformEnv, transformTemplate, writeHotUpdaterConfig } from "@hot-updater/cli-tools";
 import { fileURLToPath } from "node:url";
 import { ChildProcess, execFile, spawn, spawnSync } from "node:child_process";
@@ -7320,7 +7320,7 @@ var SSMKeyPairManager = class {
 };
 //#endregion
 //#region iac/templates.ts
-const getConfigScaffold = (build, { profile }) => {
+const getConfigScaffold = (build, authMode) => {
 	const storageConfig = {
 		imports: [{
 			pkg: "@hot-updater/aws",
@@ -7338,21 +7338,42 @@ const getConfigScaffold = (build, { profile }) => {
     cloudfrontDistributionId: process.env.HOT_UPDATER_CLOUDFRONT_DISTRIBUTION_ID!,
   })`
 	};
-	let helperStatements = [];
-	if (profile) helperStatements = [{
-		name: "commonOptions",
-		strategy: "merge-object",
-		code: `
+	let helperStatements;
+	switch (authMode.mode) {
+		case "sso":
+			helperStatements = [{
+				name: "commonOptions",
+				strategy: "merge-object",
+				code: `
 const commonOptions = {
   bucketName: process.env.HOT_UPDATER_S3_BUCKET_NAME!,
   region: process.env.HOT_UPDATER_S3_REGION!,
   credentials: fromSSO({ profile: process.env.HOT_UPDATER_AWS_PROFILE! }),
 };`.trim()
-	}];
-	else helperStatements = [{
-		name: "commonOptions",
-		strategy: "merge-object",
-		code: `
+			}];
+			break;
+		case "local":
+			helperStatements = [{
+				name: "commonOptions",
+				strategy: "merge-object",
+				code: authMode.profile ? `
+const commonOptions = {
+  bucketName: process.env.HOT_UPDATER_S3_BUCKET_NAME!,
+  region: process.env.HOT_UPDATER_S3_REGION!,
+  credentials: fromIni({ profile: process.env.HOT_UPDATER_AWS_PROFILE! }),
+};`.trim() : `
+const commonOptions = {
+  bucketName: process.env.HOT_UPDATER_S3_BUCKET_NAME!,
+  region: process.env.HOT_UPDATER_S3_REGION!,
+  credentials: fromNodeProviderChain(),
+};`.trim()
+			}];
+			break;
+		case "account":
+			helperStatements = [{
+				name: "commonOptions",
+				strategy: "merge-object",
+				code: `
 const commonOptions = {
   bucketName: process.env.HOT_UPDATER_S3_BUCKET_NAME!,
   region: process.env.HOT_UPDATER_S3_REGION!,
@@ -7361,12 +7382,25 @@ const commonOptions = {
     secretAccessKey: process.env.HOT_UPDATER_S3_SECRET_ACCESS_KEY!,
   },
 };`.trim()
-	}];
+			}];
+			break;
+	}
 	const builder = new ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).setIntermediateCode(helperStatements.map((statement) => statement.code.trim()).join("\n\n"));
-	if (profile) builder.addImport({
-		pkg: "@aws-sdk/credential-provider-sso",
-		named: ["fromSSO"]
-	});
+	switch (authMode.mode) {
+		case "sso":
+			builder.addImport({
+				pkg: "@aws-sdk/credential-provider-sso",
+				named: ["fromSSO"]
+			});
+			break;
+		case "local":
+			builder.addImport({
+				pkg: "@aws-sdk/credential-providers",
+				named: [authMode.profile ? "fromIni" : "fromNodeProviderChain"]
+			});
+			break;
+		case "account": break;
+	}
 	return createHotUpdaterConfigScaffoldFromBuilder(builder, { helperStatements });
 };
 const SOURCE_TEMPLATE = `// Add this to your App.tsx
@@ -7397,15 +7431,28 @@ const runInit = async ({ build }) => {
 		process.exit(1);
 	}
 	let credentials;
+	let configAuthMode = { mode: "account" };
+	let awsProfile = null;
 	const mode = await p.select({
 		message: "Select the mode to login to AWS",
-		options: [{
-			label: "AWS SSO Login",
-			value: "sso"
-		}, {
-			label: "AWS Access Key ID & Secret Access Key",
-			value: "account"
-		}]
+		options: [
+			{
+				label: "Current AWS CLI Session / Default Credential Chain",
+				value: "local-session"
+			},
+			{
+				label: "Shared AWS Profile",
+				value: "shared-profile"
+			},
+			{
+				label: "AWS SSO Login",
+				value: "sso"
+			},
+			{
+				label: "AWS Access Key ID & Secret Access Key",
+				value: "account"
+			}
+		]
 	});
 	if (p.isCancel(mode)) process.exit(1);
 	p.log.message(colors.blue("The following permissions are required:"));
@@ -7414,7 +7461,6 @@ const runInit = async ({ build }) => {
 	p.log.message(`${colors.blue("CloudFrontFullAccess")}: Create and update CloudFront distributions`);
 	p.log.message(`${colors.blue("IAMFullAccess")}: Get or create IAM roles for Lambda@Edge`);
 	p.log.message(`${colors.blue("AmazonSSMFullAccess")}: Access to SSM Parameters for storing CloudFront key pairs`);
-	let ssoProfile = null;
 	if (mode === "sso") try {
 		const profile = await p.text({
 			message: "Enter the SSO profile name",
@@ -7422,7 +7468,11 @@ const runInit = async ({ build }) => {
 			placeholder: "default"
 		});
 		if (p.isCancel(profile)) process.exit(1);
-		ssoProfile = profile;
+		awsProfile = profile;
+		configAuthMode = {
+			mode: "sso",
+			profile
+		};
 		await execa("aws", [
 			"sso",
 			"login",
@@ -7437,6 +7487,34 @@ const runInit = async ({ build }) => {
 		if (error instanceof ExecaError) p.log.error(error.stdout || error.stderr || error.message);
 		process.exit(1);
 	}
+	else if (mode === "local-session") try {
+		configAuthMode = {
+			mode: "local",
+			profile: null
+		};
+		credentials = await fromNodeProviderChain()();
+	} catch (error) {
+		if (error instanceof Error) p.log.error(error.message);
+		process.exit(1);
+	}
+	else if (mode === "shared-profile") try {
+		const profile = await p.text({
+			message: "Enter the AWS profile name",
+			defaultValue: process.env.AWS_PROFILE ?? "default",
+			placeholder: process.env.AWS_PROFILE ?? "default",
+			validate: (value) => (value ?? "").trim() ? void 0 : "AWS profile name is required"
+		});
+		if (p.isCancel(profile)) process.exit(1);
+		awsProfile = profile.trim();
+		configAuthMode = {
+			mode: "local",
+			profile: awsProfile
+		};
+		credentials = await fromIni({ profile: awsProfile })();
+	} catch (error) {
+		if (error instanceof Error) p.log.error(error.message);
+		process.exit(1);
+	}
 	else {
 		const creds = await p.group({
 			accessKeyId: () => p.text({
@@ -7453,6 +7531,7 @@ const runInit = async ({ build }) => {
 			accessKeyId: creds.accessKeyId,
 			secretAccessKey: creds.secretAccessKey
 		};
+		configAuthMode = { mode: "account" };
 	}
 	if (!credentials) {
 		p.log.error("Couldn't fetch the credentials.");
@@ -7537,7 +7616,7 @@ const runInit = async ({ build }) => {
 		distributionId,
 		accountId
 	});
-	const configWriteResult = await writeHotUpdaterConfig(getConfigScaffold(build, { profile: ssoProfile }));
+	const configWriteResult = await writeHotUpdaterConfig(getConfigScaffold(build, configAuthMode));
 	await makeEnv({
 		HOT_UPDATER_S3_BUCKET_NAME: bucketName,
 		HOT_UPDATER_S3_REGION: bucketRegion,
@@ -7551,10 +7630,11 @@ const runInit = async ({ build }) => {
 				value: credentials.secretAccessKey
 			}
 		} : {},
-		...ssoProfile !== null ? { HOT_UPDATER_AWS_PROFILE: ssoProfile } : {},
+		...awsProfile !== null ? { HOT_UPDATER_AWS_PROFILE: awsProfile } : {},
 		HOT_UPDATER_CLOUDFRONT_DISTRIBUTION_ID: distributionId
 	});
 	if (mode === "sso") await ensureInstallPackages({ devDependencies: ["@aws-sdk/credential-provider-sso"] });
+	else if (mode === "local-session" || mode === "shared-profile") await ensureInstallPackages({ devDependencies: ["@aws-sdk/credential-providers"] });
 	p.log.success("Generated '.env.hotupdater' file with AWS settings.");
 	if (configWriteResult.status === "created") p.log.success("Generated 'hot-updater.config.ts' file with AWS settings.");
 	else if (configWriteResult.status === "merged") p.log.success("Updated 'hot-updater.config.ts' file with AWS settings.");

package/dist/lambda/index.cjs

@@ -5686,7 +5686,7 @@ function findRoute(router, method, path) {
 }
 //#endregion
 //#region ../../packages/server/src/version.ts
-const HOT_UPDATER_SERVER_VERSION = "0.30.9";
+const HOT_UPDATER_SERVER_VERSION = "0.30.10";
 //#endregion
 //#region ../../packages/server/src/handler.ts
 var HandlerBadRequestError = class extends Error {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/aws",
   "type": "module",
-  "version": "0.30.9",
+  "version": "0.30.10",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -42,10 +42,10 @@
     "es-toolkit": "^1.32.0",
     "execa": "9.5.2",
     "mime": "^4.0.4",
-    "@hot-updater/core": "0.30.9",
-    "@hot-updater/js": "0.30.9",
-    "@hot-updater/mock": "0.30.9",
-    "@hot-updater/test-utils": "0.30.9"
+    "@hot-updater/js": "0.30.10",
+    "@hot-updater/core": "0.30.10",
+    "@hot-updater/mock": "0.30.10",
+    "@hot-updater/test-utils": "0.30.10"
   },
   "dependencies": {
     "@aws-sdk/client-cloudfront": "3.1008.0",
@@ -60,9 +60,9 @@
     "@aws-sdk/lib-storage": "3.1008.0",
     "hono": "4.12.9",
     "aws-lambda": "1.0.7",
-    "@hot-updater/plugin-core": "0.30.9",
-    "@hot-updater/server": "0.30.9",
-    "@hot-updater/cli-tools": "0.30.9"
+    "@hot-updater/cli-tools": "0.30.10",
+    "@hot-updater/plugin-core": "0.30.10",
+    "@hot-updater/server": "0.30.10"
   },
   "scripts": {
     "build": "tsdown",