@devramps/cli 0.1.12 → 0.1.14

package/dist/index.js

@@ -1510,7 +1510,8 @@ function createBaseTemplate(description) {
 function sanitizeResourceId(name) {
   return name.replace(/[^a-zA-Z0-9]/g, "").substring(0, 64);
 }
-function addOidcProviderResource(template, conditional = true) {
+function addOidcProviderResource(template, conditional = true, oidcProviderUrl) {
+  const providerUrl = oidcProviderUrl || OIDC_PROVIDER_URL;
   if (conditional) {
     template.Parameters.OIDCProviderExists = {
       Type: "String",
@@ -1526,27 +1527,28 @@ function addOidcProviderResource(template, conditional = true) {
     Type: "AWS::IAM::OIDCProvider",
     ...conditional ? { Condition: "CreateOIDCProvider" } : {},
     Properties: {
-      Url: `https://${OIDC_PROVIDER_URL}`,
-      ClientIdList: [OIDC_PROVIDER_URL],
+      Url: `https://${providerUrl}`,
+      ClientIdList: [providerUrl],
       ThumbprintList: [getOidcThumbprint()],
       Tags: STANDARD_TAGS
     }
   };
 }
-function buildOidcTrustPolicy(accountId, subject) {
+function buildOidcTrustPolicy(accountId, subject, oidcProviderUrl) {
+  const providerUrl = oidcProviderUrl || OIDC_PROVIDER_URL;
   return {
     Version: "2012-10-17",
     Statement: [
       {
         Effect: "Allow",
         Principal: {
-          Federated: `arn:aws:iam::${accountId}:oidc-provider/${OIDC_PROVIDER_URL}`
+          Federated: `arn:aws:iam::${accountId}:oidc-provider/${providerUrl}`
         },
         Action: "sts:AssumeRoleWithWebIdentity",
         Condition: {
           StringEquals: {
-            [`${OIDC_PROVIDER_URL}:sub`]: subject,
-            [`${OIDC_PROVIDER_URL}:aud`]: OIDC_PROVIDER_URL
+            [`${providerUrl}:sub`]: subject,
+            [`${providerUrl}:aud`]: providerUrl
           }
         }
       }
@@ -1908,7 +1910,7 @@ function createTerraformStateBucketPolicy(bucketName, cicdAccountId, allowedAcco
 
 // src/templates/org-stack.ts
 function generateOrgStackTemplate(options) {
-  const { orgSlug, cicdAccountId, targetAccountIds } = options;
+  const { orgSlug, cicdAccountId, targetAccountIds, oidcProviderUrl } = options;
   const template = createBaseTemplate(`DevRamps Org Stack for ${orgSlug}`);
   const kmsKeyPolicy = buildKmsKeyPolicy(cicdAccountId, targetAccountIds);
   template.Resources.DevRampsKMSKey = createKmsKeyResource(
@@ -1938,7 +1940,7 @@ function generateOrgStackTemplate(options) {
       PolicyDocument: bucketPolicy
     }
   };
-  const trustPolicy = buildOidcTrustPolicy(cicdAccountId, `org:${orgSlug}`);
+  const trustPolicy = buildOidcTrustPolicy(cicdAccountId, `org:${orgSlug}/cicd`, oidcProviderUrl);
   const orgRolePolicies = buildOrgRolePolicies(orgSlug);
   template.Resources.DevRampsCICDDeploymentRole = createIamRoleResource(
     getOrgRoleName(),
@@ -2146,11 +2148,11 @@ function generatePipelineStackTemplate(options) {
 }
 
 // src/templates/account-stack.ts
-function generateAccountStackTemplate() {
+function generateAccountStackTemplate(options) {
   const template = createBaseTemplate(
     "DevRamps Account Bootstrap Stack - Creates OIDC provider for the account"
   );
-  addOidcProviderResource(template, false);
+  addOidcProviderResource(template, false, options?.oidcProviderUrl);
   template.Outputs = {
     OIDCProviderArn: {
       Description: "ARN of the OIDC provider",
@@ -2342,13 +2344,14 @@ function generateStageStackTemplate(options) {
     steps,
     additionalPolicies,
     dockerArtifacts,
-    bundleArtifacts
+    bundleArtifacts,
+    oidcProviderUrl
   } = options;
   const template = createBaseTemplate(
     `DevRamps Stage Stack for ${pipelineSlug}/${stageName}`
   );
   const roleName = generateStageRoleName(pipelineSlug, stageName);
-  const trustPolicy = buildStageTrustPolicy(accountId, orgSlug, pipelineSlug, stageName);
+  const trustPolicy = buildStageTrustPolicy(accountId, orgSlug, pipelineSlug, oidcProviderUrl);
   const policies = buildStagePolicies(steps, additionalPolicies);
   template.Resources.StageDeploymentRole = createIamRoleResource(
     roleName,
@@ -2392,7 +2395,8 @@ function generateStageStackTemplate(options) {
     );
     s3Outputs[artifact.name] = { resourceId };
   }
-  const oidcProviderArn = `arn:aws:iam::${accountId}:oidc-provider/${OIDC_PROVIDER_URL}`;
+  const providerUrl = oidcProviderUrl || OIDC_PROVIDER_URL;
+  const oidcProviderArn = `arn:aws:iam::${accountId}:oidc-provider/${providerUrl}`;
   template.Outputs = {
     StageRoleArn: {
       Description: "ARN of the stage deployment role",
@@ -2432,9 +2436,9 @@ function generateStageStackTemplate(options) {
   }
   return template;
 }
-function buildStageTrustPolicy(accountId, orgSlug, pipelineSlug, stageName) {
-  const subject = `org:${orgSlug}/pipeline:${pipelineSlug}/stage:${stageName}`;
-  return buildOidcTrustPolicy(accountId, subject);
+function buildStageTrustPolicy(accountId, orgSlug, pipelineSlug, oidcProviderUrl) {
+  const subject = `org:${orgSlug}/pipeline:${pipelineSlug}`;
+  return buildOidcTrustPolicy(accountId, subject, oidcProviderUrl);
 }
 function buildStagePolicies(steps, additionalPolicies) {
   const policies = [];
@@ -2540,6 +2544,15 @@ async function confirmDeployment(plan) {
 }
 
 // src/commands/bootstrap.ts
+function getOidcProviderUrlFromEndpoint(endpointOverride) {
+  if (!endpointOverride) return void 0;
+  try {
+    const url = new URL(endpointOverride);
+    return url.hostname;
+  } catch {
+    return void 0;
+  }
+}
 async function bootstrapCommand(options) {
   try {
     if (options.verbose) {
@@ -2582,14 +2595,15 @@ async function bootstrapCommand(options) {
     spinner.succeed("Deployment plan ready");
     if (options.dryRun) {
       await showDryRunPlan(plan);
-      return;
+      process.exit(0);
     }
     const confirmed = await confirmDeploymentPlan(plan);
     if (!confirmed) {
       info("Deployment cancelled by user.");
-      return;
+      process.exit(0);
     }
-    await executeDeployment(plan, pipelines, pipelineArtifacts, authData, identity.accountId, options);
+    const oidcProviderUrl = getOidcProviderUrlFromEndpoint(options.endpointOverride);
+    await executeDeployment(plan, pipelines, pipelineArtifacts, authData, identity.accountId, options, oidcProviderUrl);
   } catch (error2) {
     if (error2 instanceof DevRampsError) {
       error(error2.message);
@@ -2802,7 +2816,7 @@ async function confirmDeploymentPlan(plan) {
     ]
   });
 }
-async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, currentAccountId, options) {
+async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, currentAccountId, options, oidcProviderUrl) {
   const results = { success: 0, failed: 0 };
   const totalStacks = 1 + plan.pipelineStacks.length + plan.accountStacks.length + plan.stageStacks.length;
   const remainingStacks = 1 + plan.pipelineStacks.length + plan.stageStacks.length;
@@ -2818,7 +2832,7 @@ async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, c
   const accountResults = await Promise.all(
     plan.accountStacks.map(async (stack) => {
       try {
-        await deployAccountStack(stack, currentAccountId, options);
+        await deployAccountStack(stack, currentAccountId, options, oidcProviderUrl);
         return { stack: `${stack.stackName} (${stack.accountId})`, success: true };
       } catch (error2) {
         return {
@@ -2863,7 +2877,7 @@ async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, c
   mainProgress.start();
   const orgPromise = (async () => {
     try {
-      await deployOrgStack(plan, pipelines, authData, currentAccountId, options);
+      await deployOrgStack(plan, pipelines, authData, currentAccountId, options, oidcProviderUrl);
       return { stack: plan.orgStack.stackName, success: true };
     } catch (error2) {
       return {
@@ -2887,7 +2901,7 @@ async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, c
   });
   const stagePromises = plan.stageStacks.map(async (stack) => {
     try {
-      await deployStageStack(stack, authData, currentAccountId, options);
+      await deployStageStack(stack, authData, currentAccountId, options, oidcProviderUrl);
       return { stack: stack.stackName, success: true };
     } catch (error2) {
       return {
@@ -2923,7 +2937,7 @@ async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, c
     process.exit(1);
   }
 }
-async function deployOrgStack(plan, pipelines, authData, currentAccountId, options) {
+async function deployOrgStack(plan, pipelines, authData, currentAccountId, options, oidcProviderUrl) {
   const { orgSlug, cicdAccountId, cicdRegion } = authData;
   const credentials = cicdAccountId !== currentAccountId ? (await assumeRoleForAccount({
     targetAccountId: cicdAccountId,
@@ -2953,7 +2967,8 @@ async function deployOrgStack(plan, pipelines, authData, currentAccountId, optio
   const template = generateOrgStackTemplate({
     orgSlug,
     cicdAccountId,
-    targetAccountIds
+    targetAccountIds,
+    oidcProviderUrl
   });
   const deployOptions = {
     stackName: plan.orgStack.stackName,
@@ -2988,13 +3003,13 @@ async function deployPipelineStack(stack, authData, currentAccountId, options) {
   await previewStackChanges(deployOptions);
   await deployStack(deployOptions);
 }
-async function deployAccountStack(stack, currentAccountId, options) {
+async function deployAccountStack(stack, currentAccountId, options, oidcProviderUrl) {
   const credentials = stack.accountId !== currentAccountId ? (await assumeRoleForAccount({
     targetAccountId: stack.accountId,
     currentAccountId,
     targetRoleName: options.targetAccountRoleName
   }))?.credentials : void 0;
-  const template = generateAccountStackTemplate();
+  const template = generateAccountStackTemplate({ oidcProviderUrl });
   const deployOptions = {
     stackName: stack.stackName,
     template,
@@ -3005,7 +3020,7 @@ async function deployAccountStack(stack, currentAccountId, options) {
   await previewStackChanges(deployOptions);
   await deployStack(deployOptions);
 }
-async function deployStageStack(stack, authData, currentAccountId, options) {
+async function deployStageStack(stack, authData, currentAccountId, options, oidcProviderUrl) {
   const credentials = stack.accountId !== currentAccountId ? (await assumeRoleForAccount({
     targetAccountId: stack.accountId,
     currentAccountId,
@@ -3019,7 +3034,8 @@ async function deployStageStack(stack, authData, currentAccountId, options) {
     steps: stack.steps,
     additionalPolicies: stack.additionalPolicies,
     dockerArtifacts: stack.dockerArtifacts,
-    bundleArtifacts: stack.bundleArtifacts
+    bundleArtifacts: stack.bundleArtifacts,
+    oidcProviderUrl
   });
   const deployOptions = {
     stackName: stack.stackName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devramps/cli",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "DevRamps CLI - Bootstrap AWS infrastructure for CI/CD pipelines",
   "main": "dist/index.js",
   "bin": {