Merge pull request #78 from arkahna/fix/force-unlock

Fix force unlock
arkahna · Nov 16, 2022 · bc80413 · bc80413
2 parents 210ba0a + 9aad13f
commit bc80413
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.changeset/dirty-pants-breathe.md b/.changeset/dirty-pants-breathe.md
@@ -0,0 +1,5 @@
+---
+'@arkahna/nx-terraform': patch
+---
+
+Fix force-unlock passing too many args
diff --git a/libs/nx-terraform/src/executors/force-unlock/executor.ts b/libs/nx-terraform/src/executors/force-unlock/executor.ts
@@ -27,17 +27,20 @@ export default async function runExecutor(options: StateExecutorSchema, context:
             success: false,
         }
     }
+
     const config = await readConfigFromEnvFile(
         repoConfig.terraformStateType,
         options.environment,
         context.projectName,
     )
+
     if (!config) {
         console.warn('Skipped state command, no terragrunt file for environment')
         return {
             success: true,
         }
     }
+
     const { resourceGroupName, terraformStorageAccount, terragruntConfigFile, subscriptionId } =
         config
 
@@ -73,13 +76,11 @@ export default async function runExecutor(options: StateExecutorSchema, context:
         const terragruntCliArgs = createTerragruntCliArgs([
             ...getTfEnvVars(context.projectName, config, repoConfig),
         ])
-
-        const terragruntStateArgs = [
+        const terragruntForceUnlockArgs = [
             'force-unlock',
             options.lockId,
             '--terragrunt-config',
             terragruntConfigFile,
-            ...terragruntCliArgs,
         ]
 
         await initEnvironmentWorkspaceWithFirewallRuleRetry({
@@ -90,8 +91,8 @@ export default async function runExecutor(options: StateExecutorSchema, context:
             retryDelay: options.firewallRetryDelay,
         })
 
-        console.log(`${projectRoot}> ${getEscapedCommand(`terragrunt`, terragruntStateArgs)}`)
-        await execa('terragrunt', terragruntStateArgs, {
+        console.log(`${projectRoot}> ${getEscapedCommand(`terragrunt`, terragruntForceUnlockArgs)}`)
+        await execa('terragrunt', terragruntForceUnlockArgs, {
             stdio: 'inherit',
             cwd: projectRoot,
         })