Bug Fixed custom pipelines

devops/infra-deploy-stage.yml

@@ -19,7 +19,6 @@ parameters:
   skipTests: false
   aksAgentSshPublicKeyFilename: 'azure-aks-node-ssh-key.pub'
   aksGitOpsSshPrivateKeyFilename: 'azure-aks-gitops-ssh-key'
-  terraformVariablePath: ''
 
 jobs:
 
@@ -66,9 +65,6 @@ jobs:
   - name: TF_VAR_DATA_PARTITION_NAME
     value: ${{ parameters.configuration.dataPartitionName }}
 
-  - name: TF_VARFILE
-    value: '$(System.DefaultWorkingDirectory)/${{ parameters.configuration.terraformVariableFile }}'
-
   environment: ${{ parameters.environment }}
   strategy:
     runOnce:
@@ -94,7 +90,6 @@ jobs:
             aksAgentSshPublicKeyFilename: ${{ parameters.aksAgentSshPublicKeyFilename }}
             aksGitOpsSshPrivateKeyFilename: ${{ parameters.aksGitOpsSshPrivateKeyFilename }}
             terraformWorkspacePrefix: ${{ parameters.configuration.terraformWorkspacePrefix }}
-            terraformVariablePath: ${{ parameters.configuration.terraformVariablePath }}
 
         - template: tasks/tests-int.yml
           parameters:

devops/tasks/tf-apply.yml

@@ -74,12 +74,11 @@ steps:
 
         TF_PLAN_FILE="${TF_WORKSPACE_NAME}_plan.out"
         TF_CLI_ARGS=${TF_CLI_ARGS:-}
-        [ ! -f $TF_VARFILE ] && TF_VARFILE=${TF_TEMPLATE_WORKING_DIR}/override.tfvars
 
         echo "TF_WORKSPACE_NAME: ${TF_WORKSPACE_NAME}"
         echo "TF_VAR_DATA_PARTITION_NAME: ${TF_VAR_DATA_PARTITION_NAME}"
 
-        terraform apply -var-file $TF_VARFILE $TF_CLI_ARGS -input=false -auto-approve $TF_PLAN_FILE
+        terraform apply $TF_CLI_ARGS -input=false -auto-approve $TF_PLAN_FILE
 
         # Remove the flux folder auto-generated from bedrock
         rm -rf --interactive=never ${TERRAFORM_WORKSPACE_PREFIX,,}*