Update deployment process

.octopus/deployment_process.ocl

@@ -12,14 +12,16 @@ step "plan-to-apply-a-terraform-template" {
             Octopus.Action.Package.PackageId = "#{TF_PACKAGE}"
             Octopus.Action.RunOnServer = "true"
             Octopus.Action.Script.ScriptSource = "Package"
+            Octopus.Action.Terraform.AdditionalActionParams = "-var-file=./variables.tfvars"
             Octopus.Action.Terraform.AdditionalInitParams = "#{TF_INIT}"
             Octopus.Action.Terraform.AllowPluginDownloads = "True"
             Octopus.Action.Terraform.AzureAccount = "False"
-            Octopus.Action.Terraform.EnvVariables = "{\"TF_VAR_GITLAB_PROJECT_NAME\":\"#{GITLAB_PROJECT_NAME}\",\"TF_VAR_GITLAB_SHARED_RUNNER_ID\":\"#{GITLAB_SHARED_RUNNER_ID}\",\"TF_VAR_GITLAB_TOKEN\":\"#{GITLAB_TOKEN}\",\"TF_VAR_OCTO_TENANT_ID\":\"#{Octopus.Deployment.Tenant.Id}\",\"TF_VAR_OCTOAPI\":\"#{OCTOAPI}\",\"TF_VAR_Development\":\"#{Development}\"}"
+            Octopus.Action.Terraform.EnvVariables = "{}"
+            Octopus.Action.Terraform.FileSubstitution = "variables.tfvars"
             Octopus.Action.Terraform.GoogleCloudAccount = "False"
             Octopus.Action.Terraform.ManagedAccount = "None"
             Octopus.Action.Terraform.PlanJsonOutput = "False"
-            Octopus.Action.Terraform.RunAutomaticFileSubstitution = "True"
+            Octopus.Action.Terraform.RunAutomaticFileSubstitution = "False"
             OctopusUseBundledTooling = "False"
         }
         worker_pool_variable = ""
@@ -71,14 +73,16 @@ step "terraform-apply" {
             Octopus.Action.Package.PackageId = "#{TF_PACKAGE}"
             Octopus.Action.RunOnServer = "true"
             Octopus.Action.Script.ScriptSource = "Package"
+            Octopus.Action.Terraform.AdditionalActionParams = "-var-file=./variables.tfvars"
             Octopus.Action.Terraform.AdditionalInitParams = "#{TF_INIT}"
             Octopus.Action.Terraform.AllowPluginDownloads = "True"
             Octopus.Action.Terraform.AzureAccount = "False"
-            Octopus.Action.Terraform.EnvVariables = "{\"TF_VAR_GITLAB_PROJECT_NAME\":\"#{GITLAB_PROJECT_NAME}\",\"TF_VAR_GITLAB_SHARED_RUNNER_ID\":\"#{GITLAB_SHARED_RUNNER_ID}\",\"TF_VAR_GITLAB_TOKEN\":\"#{GITLAB_TOKEN}\",\"TF_VAR_OCTOAPI\":\"#{OCTOAPI}\",\"TF_VAR_OCTO_TENANT_ID\":\"#{Octopus.Deployment.Tenant.Id}\",\"TF_VAR_Development\":\"#{Development}\"}"
+            Octopus.Action.Terraform.EnvVariables = "{}"
+            Octopus.Action.Terraform.FileSubstitution = "variables.tfvars"
             Octopus.Action.Terraform.GoogleCloudAccount = "False"
             Octopus.Action.Terraform.ManagedAccount = "None"
             Octopus.Action.Terraform.PlanJsonOutput = "False"
-            Octopus.Action.Terraform.RunAutomaticFileSubstitution = "True"
+            Octopus.Action.Terraform.RunAutomaticFileSubstitution = "False"
             OctopusUseBundledTooling = "False"
         }
         worker_pool_variable = ""

.octopus/variables.ocl

@@ -6,10 +6,21 @@ variable "TF_CONTAINER" {
     value "developerdurp/octopus-build-container:22.4.0" {}
 }
 
-variable "TF_INIT" {
-    value "-backend-config=\"address=https://gitlab.com/api/v4/projects/#{GITLAB_PROJECT_ID}/terraform/state/#{Octopus.Deployment.Tenant.Id}\" -backend-config=\"lock_address=https://gitlab.com/api/v4/projects/#{GITLAB_PROJECT_ID}/terraform/state/#{Octopus.Deployment.Tenant.Id}/lock\" -backend-config=\"unlock_address=https://gitlab.com/api/v4/projects/#{GITLAB_PROJECT_ID}/terraform/state/#{Octopus.Deployment.Tenant.Id}/lock\" -backend-config=\"username=developerdurp\" -backend-config=\"password=#{GITLAB_TOKEN}\" -backend-config=\"lock_method=POST\" -backend-config=\"unlock_method=DELETE\"  -backend-config=\"retry_wait_min=5\"" {}
-}
-
 variable "GITLAB_PROJECT_ID" {
     value "52389386" {}
+}
+
+variable "RUNSPACE_GITLAB_PROJECT_IMPORT" {
+    value {
+        process = ["runbook/import-project"]
+
+        prompt {
+            description = ""
+            label = ""
+        }
+    }
+}
+
+variable "TF_INIT" {
+    value "-backend-config=\"address=https://gitlab.com/api/v4/projects/#{GITLAB_PROJECT_ID}/terraform/state/#{Octopus.Deployment.Tenant.Id}\" -backend-config=\"lock_address=https://gitlab.com/api/v4/projects/#{GITLAB_PROJECT_ID}/terraform/state/#{Octopus.Deployment.Tenant.Id}/lock\" -backend-config=\"unlock_address=https://gitlab.com/api/v4/projects/#{GITLAB_PROJECT_ID}/terraform/state/#{Octopus.Deployment.Tenant.Id}/lock\" -backend-config=\"username=developerdurp\" -backend-config=\"password=#{GITLAB_TOKEN}\" -backend-config=\"lock_method=POST\" -backend-config=\"unlock_method=DELETE\"  -backend-config=\"retry_wait_min=5\"" {}
 }

TERRAFORM.GITLAB.PROJECTS/variables.tfvars

@@ -0,0 +1,6 @@
+GITLAB_TOKEN="#{GITLAB_TOKEN}"
+GITLAB_PROJECT_NAME="#{GITLAB_PROJECT_NAME}"
+GITLAB_SHARED_RUNNER_ID="#{GITLAB_SHARED_RUNNER_ID}"
+OCTOAPI="#{OCTOAPI}"
+OCTO_TENANT_ID="#{OCTO_TENANT_ID}"
+Development="#{Development}"