Update step template version

.gitignore

@@ -1,2 +1,3 @@
 .terraform*
 .env
+*.tfstate*

.gitlab/.gitlab-ci.yml

@@ -2,6 +2,7 @@ include:
   - project: 'developerdurp/yml'
     ref: 'main'
     file:
-      - 'pipelines/gitlab_generic_packages.yml'
+      - 'pipeline.yml'
+      #- 'pipelines/gitlab_generic_packages.yml'
         #- 'pipelines/docker-build-generic.yml'
   - local: .variables.yml

.octopus/deployment_process.ocl

@@ -2,26 +2,11 @@ step "plan-to-apply-a-terraform-template" {
     name = "Terraform Plan"
 
     action "terraform-plan" {
-        action_type = "Octopus.TerraformPlan"
-        environments = ["development"]
         is_required = true
         properties = {
-            Octopus.Action.GoogleCloud.ImpersonateServiceAccount = "False"
-            Octopus.Action.GoogleCloud.UseVMServiceAccount = "True"
-            Octopus.Action.Package.DownloadOnTentacle = "False"
-            Octopus.Action.Package.FeedId = "nexus-nuget"
-            Octopus.Action.Package.PackageId = "#{TF_PACKAGE}"
             Octopus.Action.RunOnServer = "true"
-            Octopus.Action.Script.ScriptSource = "Package"
-            Octopus.Action.Terraform.AdditionalInitParams = "#{TF_INIT}"
-            Octopus.Action.Terraform.AllowPluginDownloads = "True"
-            Octopus.Action.Terraform.AzureAccount = "False"
-            Octopus.Action.Terraform.EnvVariables = "{\"TF_VAR_GITLAB_PROJECT_ID\":\"#{GITLAB_PROJECT_ID}\",\"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}\"}"
-            Octopus.Action.Terraform.GoogleCloudAccount = "False"
-            Octopus.Action.Terraform.ManagedAccount = "None"
-            Octopus.Action.Terraform.PlanJsonOutput = "False"
-            Octopus.Action.Terraform.RunAutomaticFileSubstitution = "True"
-            OctopusUseBundledTooling = "False"
+            Octopus.Action.Template.Id = "ActionTemplates-1"
+            Octopus.Action.Template.Version = "3"
         }
         worker_pool_variable = ""
 
@@ -29,15 +14,6 @@ step "plan-to-apply-a-terraform-template" {
             feed = "nexus"
             image = "#{TF_Container}"
         }
-
-        packages {
-            acquisition_location = "Server"
-            feed = "nexus-nuget"
-            package_id = "#{TF_PACKAGE}"
-            properties = {
-                SelectionMode = "immediate"
-            }
-        }
     }
 }
 
@@ -45,16 +21,11 @@ step "approve-plan" {
     name = "Approve Plan"
 
     action {
-        action_type = "Octopus.Manual"
-        environments = ["development"]
         is_required = true
         properties = {
-            Octopus.Action.Manual.BlockConcurrentDeployments = "False"
-            Octopus.Action.Manual.Instructions = <<-EOT
-                ```
-                #{Octopus.Action[Terraform Plan].Output.TerraformPlanOutput}
-                ```
-                EOT
+            Octopus.Action.RunOnServer = "false"
+            Octopus.Action.Template.Id = "ActionTemplates-3"
+            Octopus.Action.Template.Version = "0"
         }
     }
 }
@@ -63,24 +34,10 @@ step "terraform-apply" {
     name = "Terraform Apply"
 
     action {
-        action_type = "Octopus.TerraformApply"
         properties = {
-            Octopus.Action.GoogleCloud.ImpersonateServiceAccount = "False"
-            Octopus.Action.GoogleCloud.UseVMServiceAccount = "True"
-            Octopus.Action.Package.DownloadOnTentacle = "False"
-            Octopus.Action.Package.FeedId = "nexus-nuget"
-            Octopus.Action.Package.PackageId = "#{TF_PACKAGE}"
             Octopus.Action.RunOnServer = "true"
-            Octopus.Action.Script.ScriptSource = "Package"
-            Octopus.Action.Terraform.AdditionalInitParams = "#{TF_INIT}"
-            Octopus.Action.Terraform.AllowPluginDownloads = "True"
-            Octopus.Action.Terraform.AzureAccount = "False"
-            Octopus.Action.Terraform.EnvVariables = "{\"TF_VAR_GITLAB_PROJECT_ID\":\"#{GITLAB_PROJECT_ID}\",\"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}\"}"
-            Octopus.Action.Terraform.GoogleCloudAccount = "False"
-            Octopus.Action.Terraform.ManagedAccount = "None"
-            Octopus.Action.Terraform.PlanJsonOutput = "False"
-            Octopus.Action.Terraform.RunAutomaticFileSubstitution = "True"
-            OctopusUseBundledTooling = "False"
+            Octopus.Action.Template.Id = "ActionTemplates-2"
+            Octopus.Action.Template.Version = "1"
         }
         worker_pool_variable = ""
 
@@ -88,14 +45,5 @@ step "terraform-apply" {
             feed = "nexus"
             image = "#{TF_Container}"
         }
-
-        packages {
-            acquisition_location = "Server"
-            feed = "nexus-nuget"
-            package_id = "#{TF_PACKAGE}"
-            properties = {
-                SelectionMode = "immediate"
-            }
-        }
     }
 }

.octopus/deployment_settings.ocl

@@ -1,3 +1,5 @@
+default_guided_failure_mode = "On"
+
 connectivity_policy {
     allow_deployments_to_no_targets = true
 }

.octopus/variables.ocl

@@ -1,11 +1,30 @@
-variable "TF_INIT" {
-    value "-backend-config=\"address=https://gitlab.com/api/v4/projects/#{GITLAB_PROJECT_ID}/terraform/state/gitlab\" -backend-config=\"lock_address=https://gitlab.com/api/v4/projects/#{GITLAB_PROJECT_ID}/terraform/state/gitlab/lock\" -backend-config=\"unlock_address=https://gitlab.com/api/v4/projects/#{GITLAB_PROJECT_ID}/terraform/state/gitlab/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 "TF_PACKAGE" {
     value "TERRAFORM.GITLAB.PROJECTS" {}
 }
 
 variable "TF_CONTAINER" {
-    value "developerdurp/octopus-packages" {}
+    value "developerdurp/octopus-build-container:22.4.0" {}
+}
+
+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\"" {}
+}
+
+variable "OCTO_TENANT_ID" {
+    value "#{Octopus.Deployment.Tenant.Id}" {}
 }

.variables.yml

@@ -1,3 +1,4 @@
 variables:
-  PROJECT_NAME: TERRAFORM.GITLAB.PROJECTS
-  OCTO_PROJECT_NAME: "Gitlab Projects"
+  PIPELINE: 'gitlab'
+  PROJECT_NAME: "TERRAFORM.GITLAB.PROJECTS"
+  OCTO_PROJECT_NAME: "Gitlab Projects"

Dockerfile

@@ -1,13 +0,0 @@
-FROM ubuntu:22.04
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        curl \
-        unzip \
-        apt-transport-https \
-        software-properties-common && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN curl https://releases.hashicorp.com/terraform/1.6.4/terraform_1.6.4_linux_amd64.zip -o tf.zip
-RUN unzip -d /usr/local/bin/ tf.zip && rm tf.zip

TERRAFORM.GITLAB.PROJECTS/gitlab.tf

@@ -0,0 +1,46 @@
+provider "gitlab" {
+  token = var.GITLAB_TOKEN
+}
+
+resource "gitlab_project" "project" {
+  name                                  = octopusdeploy_tenant.tenant.name
+  allow_merge_on_skipped_pipeline       = false
+  only_allow_merge_if_pipeline_succeeds = true
+  remove_source_branch_after_merge      = true
+  squash_option                         = "default_on"
+  ci_config_path                        = ".gitlab/.gitlab-ci.yml"
+  shared_runners_enabled                = false
+  visibility_level                      = "public"
+  ci_forward_deployment_enabled         = true
+}
+
+resource "gitlab_branch_protection" "master" {
+  project            = gitlab_project.project.id
+  branch             = "main"
+  push_access_level  = "maintainer"
+  merge_access_level = "developer"
+  allow_force_push   = false
+}
+
+resource "gitlab_branch_protection" "release" {
+  project            = gitlab_project.project.id
+  branch             = "release/*"
+  push_access_level  = "maintainer"
+  merge_access_level = "developer"
+  allow_force_push   = false
+}
+
+resource "gitlab_project_runner_enablement" "k3s" {
+  project   = gitlab_project.project.id
+  runner_id = var.GITLAB_SHARED_RUNNER_ID
+}
+
+
+resource "gitlab_project_variable" "OCTOAPI" {
+  count = var.Enable_OCTOAPI ? 1 : 0 
+  project   = gitlab_project.project.id
+  key       = "OCTOAPI"
+  value     = var.OCTOAPI
+  protected = false
+  masked    = true
+}

TERRAFORM.GITLAB.PROJECTS/import.tf

@@ -0,0 +1,11 @@
+import {
+  to = octopusdeploy_tag.gitlabprojects
+  id = "TagSets-1/Tags-1"
+}
+
+import {
+  to = octopusdeploy_tenant.tenant
+  id = var.OCTO_TENANT_ID
+}
+ 
+

TERRAFORM.GITLAB.PROJECTS/main.tf

@@ -5,50 +5,10 @@ terraform {
       source  = "gitlabhq/gitlab"
       version = "16.2.0"
     }
+    octopusdeploy = {
+      source = "OctopusDeployLabs/octopusdeploy"
+      version = "0.13.3"
+    }
   }
 }
 
-provider "gitlab" {
-  token = var.GITLAB_TOKEN
-}
-
-resource "gitlab_project" "project" {
-  name                                  = var.GITLAB_PROJECT_NAME
-  allow_merge_on_skipped_pipeline       = false
-  only_allow_merge_if_pipeline_succeeds = true
-  remove_source_branch_after_merge      = true
-  squash_option                         = "default_on"
-  ci_config_path                        = ".gitlab/.gitlab-ci.yml"
-  shared_runners_enabled                = false
-  visibility_level                      = "public"
-  ci_forward_deployment_enabled         = true
-}
-
-resource "gitlab_branch_protection" "master" {
-  project            = gitlab_project.project.id
-  branch             = "main"
-  push_access_level  = "maintainer"
-  merge_access_level = "developer"
-  allow_force_push   = false
-}
-
-resource "gitlab_branch_protection" "release" {
-  project            = gitlab_project.project.id
-  branch             = "release/*"
-  push_access_level  = "maintainer"
-  merge_access_level = "developer"
-  allow_force_push   = false
-}
-
-resource "gitlab_project_runner_enablement" "k3s" {
-  project   = gitlab_project.project.id
-  runner_id = var.GITLAB_SHARED_RUNNER_ID
-}
-
-resource "gitlab_project_variable" "OCTOAPI" {
-  project   = gitlab_project.project.id
-  key       = "OCTOAPI"
-  value     = var.OCTOAPI
-  protected = false
-  masked    = true
-}

TERRAFORM.GITLAB.PROJECTS/octopus.tf

@@ -0,0 +1,34 @@
+provider "octopusdeploy" {
+  address = "https://octopus.internal.durp.info"
+  api_key = var.OCTOAPI
+}
+
+resource "octopusdeploy_tenant" "tenant" {
+  name = var.GITLAB_PROJECT_NAME
+  project_environment {
+    environments = var.Development ? [
+      "Environments-1",
+      "Environments-2"
+    ] : [
+      "Environments-1"
+    ] 
+    project_id = "Projects-1"
+  }
+  tenant_tags = [
+    octopusdeploy_tag.gitlabprojects.canonical_tag_name
+  ]
+}
+
+resource "octopusdeploy_tag" "gitlabprojects" {
+  name = "Gitlab Project"
+  color = "#333333"
+  tag_set_id = "TagSets-1"
+}
+
+resource "octopusdeploy_tenant_common_variable" "gitlabprojectname" {
+  library_variable_set_id = "LibraryVariableSets-2"
+  template_id = "f14ad0ff-d8cf-44a8-bd8d-ff23b0fdb0f4"
+  tenant_id = octopusdeploy_tenant.tenant.id
+  value = octopusdeploy_tenant.tenant.name
+}
+

TERRAFORM.GITLAB.PROJECTS/variables.tf

@@ -2,18 +2,30 @@ variable "GITLAB_TOKEN" {
   type = string
 }
 
-variable "GITLAB_PROJECT_ID" {
-  type = number
-}
-
 variable "GITLAB_PROJECT_NAME" {
   type = string
 }
 
 variable "GITLAB_SHARED_RUNNER_ID" {
   type = number
+  default = 0
+}
+
+variable "Enable_OCTOAPI" {
+  type = bool
+  default = false
 }
 
 variable "OCTOAPI" {
   type = string
+  default = ""
+}
+
+variable "OCTO_TENANT_ID" {
+  type = string
+}
+
+variable "Development" {
+  type = bool
+  default = false
 }

TERRAFORM.GITLAB.PROJECTS/variables.tfvars

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