feat: Skip Provider Locking on request

packages/@cdktf/cli-core/src/lib/cdktf-project.ts

@@ -74,24 +74,31 @@ export type SkipSynthOptions = {
   skipSynth?: boolean;
 };
 
-export type FetchOutputOptions = SkipSynthOptions & MultipleStackOptions;
+export type SkipProviderLockOptions = {
+  skipProviderLock?: boolean;
+};
+
+export type FetchOutputOptions = SkipSynthOptions &
+  SkipProviderLockOptions &
+  MultipleStackOptions;
 
 export type AutoApproveOptions = {
   autoApprove?: boolean;
 };
 
 export type DiffOptions = SingleStackOptions &
+  SkipProviderLockOptions &
   SkipSynthOptions & {
     refreshOnly?: boolean;
     terraformParallelism?: number;
     vars?: string[];
     varFiles?: string[];
     noColor?: boolean;
     migrateState?: boolean;
-    skipSynth?: boolean;
   };
 
 export type MutationOptions = MultipleStackOptions &
+  SkipProviderLockOptions &
   SkipSynthOptions &
   AutoApproveOptions & {
     refreshOnly?: boolean;
@@ -400,7 +407,7 @@ export class CdktfProject {
     const stack = this.getStackExecutor(
       getSingleStack(stacks, opts?.stackName, "diff"),
     );
-    await stack.initalizeTerraform(opts.noColor);
+    await stack.initalizeTerraform(opts.noColor, opts.skipProviderLock);
 
     try {
       await stack.diff(opts);
@@ -449,7 +456,10 @@ export class CdktfProject {
       !opts.parallelism || opts.parallelism < 0 ? Infinity : opts.parallelism;
     const allExecutions = [];
 
-    await this.initializeStacksToRunInSerial(opts.noColor);
+    await this.initializeStacksToRunInSerial(
+      opts.noColor,
+      opts.skipProviderLock,
+    );
     while (this.stacksToRun.filter((stack) => stack.isPending).length > 0) {
       const runningStacks = this.stacksToRun.filter((stack) => stack.isRunning);
       if (runningStacks.length >= maxParallelRuns) {
@@ -657,7 +667,7 @@ export class CdktfProject {
       this.getStackExecutor(stack, {}),
     );
 
-    await this.initializeStacksToRunInSerial();
+    await this.initializeStacksToRunInSerial(undefined, opts.skipProviderLock);
     const outputs = await Promise.all(
       this.stacksToRun.map(async (s) => {
         const output = await s.fetchOutputs();
@@ -676,9 +686,10 @@ export class CdktfProject {
   // Serially run terraform init to prohibit text file busy errors for the cache files
   private async initializeStacksToRunInSerial(
     noColor?: boolean,
+    skipProviderLock?: boolean,
   ): Promise<void> {
     for (const stack of this.stacksToRun) {
-      await stack.initalizeTerraform(noColor);
+      await stack.initalizeTerraform(noColor, skipProviderLock);
     }
   }
 }

packages/@cdktf/cli-core/src/lib/cdktf-stack.ts

@@ -250,9 +250,14 @@ export class CdktfStack {
     );
   }
 
-  public async initalizeTerraform(noColor?: boolean) {
+  public async initalizeTerraform(
+    noColor?: boolean,
+    skipProviderLock?: boolean,
+  ) {
     const terraform = await this.terraformClient();
-    const needsLockfileUpdate = await this.checkNeedsLockfileUpdate();
+    const needsLockfileUpdate = skipProviderLock
+      ? false
+      : await this.checkNeedsLockfileUpdate();
     const needsUpgrade = await this.checkNeedsUpgrade();
     await terraform.init({
       needsUpgrade,

packages/cdktf-cli/src/bin/cmds/deploy.ts

@@ -108,6 +108,12 @@ class Command extends BaseCommand {
         required: false,
         desc: "Skip synthesis of the application, assume the synthesized Terraform code is already present and up to date",
       })
+      .option("skip-provider-lock", {
+        type: "boolean",
+        default: false,
+        required: false,
+        desc: "Block `terraform provider lock` from being run for any reason. Warning: This may cause issues when used with HCP Terraform",
+      })
       .showHelpOnFail(true);
 
   public async handleCommand(argv: any) {

packages/cdktf-cli/src/bin/cmds/destroy.ts

@@ -85,6 +85,12 @@ class Command extends BaseCommand {
         required: false,
         desc: "Skip synthesis of the application, assume the synthesized Terraform code is already present and up to date",
       })
+      .option("skip-provider-lock", {
+        type: "boolean",
+        default: false,
+        required: false,
+        desc: "Block `terraform provider lock` from being run for any reason. Warning: This may cause issues when used with HCP Terraform",
+      })
       .showHelpOnFail(true);
 
   public async handleCommand(argv: any) {

packages/cdktf-cli/src/bin/cmds/diff.ts

@@ -77,6 +77,12 @@ class Command extends BaseCommand {
         required: false,
         desc: "Skip synthesis of the application, assume the synthesized Terraform code is already present and up to date",
       })
+      .option("skip-provider-lock", {
+        type: "boolean",
+        default: false,
+        required: false,
+        desc: "Block `terraform provider lock` from being run for any reason. Warning: This may cause issues when used with HCP Terraform",
+      })
       .showHelpOnFail(true);
 
   public async handleCommand(argv: any) {

packages/cdktf-cli/src/bin/cmds/handlers.ts

@@ -198,6 +198,7 @@ export async function deploy(argv: any) {
   const noColor = argv.noColor;
   const migrateState = argv.migrateState;
   const skipSynth = argv.skipSynth;
+  const skipProviderLock = argv.skipProviderLock;
 
   let outputsPath: string | undefined = undefined;
   // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -225,6 +226,7 @@ export async function deploy(argv: any) {
       noColor,
       migrateState,
       skipSynth,
+      skipProviderLock,
     }),
   );
 }
@@ -247,6 +249,7 @@ export async function destroy(argv: any) {
   const noColor = argv.noColor;
   const migrateState = argv.migrateState;
   const skipSynth = argv.skipSynth;
+  const skipProviderLock = argv.skipProviderLock;
 
   await renderInk(
     React.createElement(Destroy, {
@@ -262,6 +265,7 @@ export async function destroy(argv: any) {
       noColor,
       migrateState,
       skipSynth,
+      skipProviderLock,
     }),
   );
 }
@@ -281,6 +285,7 @@ export async function diff(argv: any) {
   const noColor = argv.noColor;
   const migrateState = argv.migrateState;
   const skipSynth = argv.skipSynth;
+  const skipProviderLock = argv.skipProviderLock;
 
   await renderInk(
     React.createElement(Diff, {
@@ -294,6 +299,7 @@ export async function diff(argv: any) {
       noColor,
       migrateState,
       skipSynth,
+      skipProviderLock,
     }),
   );
 }
@@ -519,6 +525,7 @@ export async function output(argv: any) {
   const stacks = argv.stacks;
   const includeSensitiveOutputs = argv.outputsFileIncludeSensitiveOutputs;
   const skipSynth = argv.skipSynth;
+  const skipProviderLock = argv.skipProviderLock;
   let outputsPath: string | undefined = undefined;
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   let onOutputsRetrieved: (outputs: NestedTerraformOutputs) => void = () => {};
@@ -537,6 +544,7 @@ export async function output(argv: any) {
       onOutputsRetrieved,
       outputsPath,
       skipSynth,
+      skipProviderLock,
     }),
   );
 }

packages/cdktf-cli/src/bin/cmds/output.ts

@@ -48,6 +48,12 @@ class Command extends BaseCommand {
         required: false,
         desc: "Skip synthesis of the application, assume the synthesized Terraform code is already present and up to date",
       })
+      .option("skip-provider-lock", {
+        type: "boolean",
+        default: false,
+        required: false,
+        desc: "Block `terraform provider lock` from being run for any reason. Warning: This may cause issues when used with HCP Terraform",
+      })
       .showHelpOnFail(true);
 
   public async handleCommand(argv: any) {

packages/cdktf-cli/src/bin/cmds/ui/deploy.tsx

@@ -67,6 +67,7 @@ interface DeployConfig {
   noColor?: boolean;
   migrateState?: boolean;
   skipSynth?: boolean;
+  skipProviderLock?: boolean;
 }
 
 export const Deploy = ({
@@ -85,6 +86,7 @@ export const Deploy = ({
   noColor,
   migrateState,
   skipSynth,
+  skipProviderLock,
 }: DeployConfig): React.ReactElement => {
   const [outputs, setOutputs] = useState<NestedTerraformOutputs>();
   const { status, logEntries } = useCdktfProject(
@@ -102,6 +104,7 @@ export const Deploy = ({
         noColor,
         migrateState,
         skipSynth,
+        skipProviderLock,
       });
 
       if (onOutputsRetrieved) {

packages/cdktf-cli/src/bin/cmds/ui/destroy.tsx

@@ -27,6 +27,7 @@ interface DestroyConfig {
   vars?: string[];
   varFiles?: string[];
   skipSynth?: boolean;
+  skipProviderLock?: boolean;
 }
 
 export const Destroy = ({
@@ -42,6 +43,7 @@ export const Destroy = ({
   vars,
   varFiles,
   skipSynth,
+  skipProviderLock,
 }: DestroyConfig): React.ReactElement => {
   const { status, logEntries } = useCdktfProject(
     { outDir, synthCommand },
@@ -57,6 +59,7 @@ export const Destroy = ({
         vars,
         varFiles,
         skipSynth,
+        skipProviderLock,
       }),
   );
 

packages/cdktf-cli/src/bin/cmds/ui/diff.tsx

@@ -19,6 +19,7 @@ interface DiffConfig {
   noColor?: boolean;
   migrateState?: boolean;
   skipSynth?: boolean;
+  skipProviderLock?: boolean;
 }
 
 export const Diff = ({
@@ -32,6 +33,7 @@ export const Diff = ({
   noColor,
   migrateState,
   skipSynth,
+  skipProviderLock,
 }: DiffConfig): React.ReactElement => {
   const { status, logEntries } = useCdktfProject(
     { outDir, synthCommand },
@@ -45,6 +47,7 @@ export const Diff = ({
         noColor,
         migrateState,
         skipSynth,
+        skipProviderLock,
       }),
   );
 

packages/cdktf-cli/src/bin/cmds/ui/output.tsx

@@ -16,6 +16,7 @@ type OutputConfig = {
   onOutputsRetrieved: (outputs: NestedTerraformOutputs) => void;
   outputsPath?: string;
   skipSynth?: boolean;
+  skipProviderLock?: boolean;
 };
 
 export const Output = ({
@@ -25,13 +26,15 @@ export const Output = ({
   onOutputsRetrieved,
   outputsPath,
   skipSynth,
+  skipProviderLock,
 }: OutputConfig): React.ReactElement => {
   const { status, logEntries, returnValue } = useCdktfProject(
     { outDir, synthCommand },
     async (project) => {
       const outputs = await project.fetchOutputs({
         stackNames: targetStacks,
         skipSynth,
+        skipProviderLock,
       });
       onOutputsRetrieved(outputs);
       return outputs;