476 cicd demo (#477)

Most changes are formatting (terraform fmt). Functionality changes:
 - add executable to .sh/.py files
 - move instance template files into cloud-init to avoid terraform provisioner
 - prevent a race on the adb wallet file and compute directories
 - specify source of OCI provider to avoid using out-dated hashicorp
 - Hard versioned SQLcl to 22.1

Author: gotsysdba

workshops/dcms-cicd/config/apply.sh

@@ -1,5 +1,5 @@
 locals {
-  micro-deployment-public-jenkins = var.deployment == "MDPUBJ" ? true : false
-  micro-deployment-private-jenkins = var.deployment == "MDPRVJ" ? true : false
-  distributed-builds-private-jenkins = var.deployment == "DBPRVJ" ? true: false
+  micro-deployment-public-jenkins    = var.deployment == "MDPUBJ" ? true : false
+  micro-deployment-private-jenkins   = var.deployment == "MDPRVJ" ? true : false
+  distributed-builds-private-jenkins = var.deployment == "DBPRVJ" ? true : false
 }

workshops/dcms-cicd/config/destroy.sh

@@ -1,24 +1,24 @@
-module micro-deploy-public-containerized-jenkins {
-  source = "./modules/micro-deploy-public-containerized-jenkins"
-  compartment_id = var.compartment_ocid
-  jenkins_password = var.jenkins_password
-  region = var.region
+module "micro-deploy-public-containerized-jenkins" {
+  source                 = "./modules/micro-deploy-public-containerized-jenkins"
+  compartment_id         = var.compartment_ocid
+  jenkins_password       = var.jenkins_password
+  region                 = var.region
   autonomous_database_id = var.autonomous_database_id
 
   count = local.micro-deployment-public-jenkins ? 1 : 0
 }
 
-module micro-deploy-private-containerized-jenkins {
-  source = "./modules/micro-deploy-private-containerized-jenkins"
-  compartment_id = var.compartment_ocid
+module "micro-deploy-private-containerized-jenkins" {
+  source           = "./modules/micro-deploy-private-containerized-jenkins"
+  compartment_id   = var.compartment_ocid
   jenkins_password = var.jenkins_password
-  region = var.region
+  region           = var.region
 
   count = local.micro-deployment-private-jenkins ? 1 : 0
 }
 
-module distributed-builds-private-jenkins {
-  source = "./modules/controller-agent-private-containerized-jenkins"
+module "distributed-builds-private-jenkins" {
+  source             = "./modules/controller-agent-private-containerized-jenkins"
   compartment_id     = var.compartment_ocid
   jenkins_password   = var.jenkins_password
   region             = var.region

workshops/dcms-cicd/config/terraform/locals.tf

@@ -1,14 +1,14 @@
-resource oci_core_instance agent_vm {
+resource "oci_core_instance" "agent_vm" {
   depends_on = [oci_core_instance.jenkins_vm]
-  for_each = toset(var.unique_agent_names)
+  for_each   = toset(var.unique_agent_names)
 
 
   availability_domain = local.availability_domain_name
   compartment_id      = var.compartment_id
   display_name        = "agent-vm-${each.value}"
   shape               = local.instance_shape
 
-  dynamic shape_config {
+  dynamic "shape_config" {
     for_each = local.is_flexible_instance_shape ? [1] : []
     content {
       ocpus         = var.instance_ocpus

workshops/dcms-cicd/config/terraform/main.tf

@@ -1,66 +1,66 @@
 
-resource oci_bastion_bastion bastion {
-    name = var.bastion_name
-    bastion_type = "STANDARD"
-    compartment_id = var.compartment_id
-    target_subnet_id = oci_core_subnet.prv_jenkins_controller_subnet.id
-    client_cidr_block_allow_list = ["0.0.0.0/0"]
-    defined_tags = {}
-    freeform_tags = {}
+resource "oci_bastion_bastion" "bastion" {
+  name                         = var.bastion_name
+  bastion_type                 = "STANDARD"
+  compartment_id               = var.compartment_id
+  target_subnet_id             = oci_core_subnet.prv_jenkins_controller_subnet.id
+  client_cidr_block_allow_list = ["0.0.0.0/0"]
+  defined_tags                 = {}
+  freeform_tags                = {}
 }
 
-resource oci_bastion_bastion bastion_agent {
-    name = var.bastion_agent_name
-    bastion_type = "STANDARD"
-    compartment_id = var.compartment_id
-    target_subnet_id = oci_core_subnet.prv_jenkins_agent_subnet.id
-    client_cidr_block_allow_list = ["0.0.0.0/0"]
-    defined_tags = {}
-    freeform_tags = {}
+resource "oci_bastion_bastion" "bastion_agent" {
+  name                         = var.bastion_agent_name
+  bastion_type                 = "STANDARD"
+  compartment_id               = var.compartment_id
+  target_subnet_id             = oci_core_subnet.prv_jenkins_agent_subnet.id
+  client_cidr_block_allow_list = ["0.0.0.0/0"]
+  defined_tags                 = {}
+  freeform_tags                = {}
 }
 
-resource "time_sleep" wait_five_mins {
-    depends_on = [oci_core_instance.jenkins_vm]
-    create_duration = "300s"
+resource "time_sleep" "wait_five_mins" {
+  depends_on      = [oci_core_instance.jenkins_vm]
+  create_duration = "300s"
 }
 
-resource oci_bastion_session bastion_session {
-    depends_on = [time_sleep.wait_five_mins]
-    bastion_id = oci_bastion_bastion.bastion.id
+resource "oci_bastion_session" "bastion_session" {
+  depends_on = [time_sleep.wait_five_mins]
+  bastion_id = oci_bastion_bastion.bastion.id
 
-    key_details {
-        public_key_content = tls_private_key.tls_key_pair.public_key_openssh
-    }
+  key_details {
+    public_key_content = tls_private_key.tls_key_pair.public_key_openssh
+  }
 
-    target_resource_details {
-        session_type = "MANAGED_SSH"
-        target_resource_id = oci_core_instance.jenkins_vm.id
-        target_resource_operating_system_user_name = "opc"
-        target_resource_port = 22
-        target_resource_private_ip_address = oci_core_instance.jenkins_vm.private_ip
-    }
+  target_resource_details {
+    session_type                               = "MANAGED_SSH"
+    target_resource_id                         = oci_core_instance.jenkins_vm.id
+    target_resource_operating_system_user_name = "opc"
+    target_resource_port                       = 22
+    target_resource_private_ip_address         = oci_core_instance.jenkins_vm.private_ip
+  }
 
-    display_name = var.session_display_name
-    session_ttl_in_seconds = var.session_ttl_in_seconds
+  display_name           = var.session_display_name
+  session_ttl_in_seconds = var.session_ttl_in_seconds
 }
 
-resource oci_bastion_session bastion_agent_session {
-    depends_on = [time_sleep.wait_five_mins]
-    bastion_id = oci_bastion_bastion.bastion_agent.id
-    for_each = toset(var.unique_agent_names)
+resource "oci_bastion_session" "bastion_agent_session" {
+  depends_on = [time_sleep.wait_five_mins]
+  bastion_id = oci_bastion_bastion.bastion_agent.id
+  for_each   = toset(var.unique_agent_names)
 
-    key_details {
-        public_key_content = tls_private_key.tls_key_pair.public_key_openssh
-    }
+  key_details {
+    public_key_content = tls_private_key.tls_key_pair.public_key_openssh
+  }
 
-    target_resource_details {
-        session_type = "MANAGED_SSH"
-        target_resource_id = oci_core_instance.agent_vm[each.key].id
-        target_resource_operating_system_user_name = "opc"
-        target_resource_port = 22
-        target_resource_private_ip_address = oci_core_instance.agent_vm[each.key].private_ip
-    }
+  target_resource_details {
+    session_type                               = "MANAGED_SSH"
+    target_resource_id                         = oci_core_instance.agent_vm[each.key].id
+    target_resource_operating_system_user_name = "opc"
+    target_resource_port                       = 22
+    target_resource_private_ip_address         = oci_core_instance.agent_vm[each.key].private_ip
+  }
 
-    display_name = var.session_agent_display_name
-    session_ttl_in_seconds = var.session_ttl_in_seconds
+  display_name           = var.session_agent_display_name
+  session_ttl_in_seconds = var.session_ttl_in_seconds
 }

workshops/dcms-cicd/config/terraform/modules/controller-agent-private-containerized-jenkins/agent/setup.sh

@@ -1,10 +1,10 @@
-resource oci_core_instance jenkins_vm {
+resource "oci_core_instance" "jenkins_vm" {
   availability_domain = local.availability_domain_name
   compartment_id      = var.compartment_id
   display_name        = "jenkins-vm"
   shape               = local.instance_shape
 
-  dynamic shape_config {
+  dynamic "shape_config" {
     for_each = local.is_flexible_instance_shape ? [1] : []
     content {
       ocpus         = var.instance_ocpus

workshops/dcms-cicd/config/terraform/modules/controller-agent-private-containerized-jenkins/agents.tf

@@ -1,4 +1,4 @@
-data oci_core_images instance_images {
+data "oci_core_images" "instance_images" {
   compartment_id           = var.compartment_id
   operating_system         = var.instance_os
   operating_system_version = var.linux_os_version
@@ -11,6 +11,6 @@ data oci_core_images instance_images {
   }
 }
 
-data oci_identity_availability_domains ADs {
+data "oci_identity_availability_domains" "ADs" {
   compartment_id = var.compartment_id
 }

workshops/dcms-cicd/config/terraform/modules/controller-agent-private-containerized-jenkins/bastion.tf

@@ -1,48 +1,48 @@
-resource oci_load_balancer_load_balancer load_balancer {
-    #Required
-    compartment_id = var.compartment_id
-    display_name = "jenkins-load-balancer"
-    shape = var.load_balancer_shape
-    subnet_ids = [oci_core_subnet.pub_jenkins_lb_subnet.id]
-
-    reserved_ips {
-        id = oci_core_public_ip.jenkins_public_ip.id
-    }
-    shape_details {
-        maximum_bandwidth_in_mbps = var.load_balancer_shape_details_maximum_bandwidth_in_mbps
-        minimum_bandwidth_in_mbps = var.load_balancer_shape_details_minimum_bandwidth_in_mbps
-    }
-
-    defined_tags = {}
-    freeform_tags = {}
+resource "oci_load_balancer_load_balancer" "load_balancer" {
+  #Required
+  compartment_id = var.compartment_id
+  display_name   = "jenkins-load-balancer"
+  shape          = var.load_balancer_shape
+  subnet_ids     = [oci_core_subnet.pub_jenkins_lb_subnet.id]
+
+  reserved_ips {
+    id = oci_core_public_ip.jenkins_public_ip.id
+  }
+  shape_details {
+    maximum_bandwidth_in_mbps = var.load_balancer_shape_details_maximum_bandwidth_in_mbps
+    minimum_bandwidth_in_mbps = var.load_balancer_shape_details_minimum_bandwidth_in_mbps
+  }
+
+  defined_tags  = {}
+  freeform_tags = {}
 }
 
-resource oci_load_balancer_backend_set backend_set {
+resource "oci_load_balancer_backend_set" "backend_set" {
+  #Required
+  health_checker {
     #Required
-    health_checker {
-        #Required
-        protocol = "TCP"
-        port = var.backend_set_health_checker_port
-    }
+    protocol = "TCP"
+    port     = var.backend_set_health_checker_port
+  }
 
-    load_balancer_id = oci_load_balancer_load_balancer.load_balancer.id
-    name = var.backend_set_name
-    policy = "ROUND_ROBIN"
+  load_balancer_id = oci_load_balancer_load_balancer.load_balancer.id
+  name             = var.backend_set_name
+  policy           = "ROUND_ROBIN"
 
 }
 
-resource oci_load_balancer_backend backend {
-    backendset_name = oci_load_balancer_backend_set.backend_set.name
-    ip_address = oci_core_instance.jenkins_vm.private_ip
-    load_balancer_id = oci_load_balancer_load_balancer.load_balancer.id
-    port = 80
+resource "oci_load_balancer_backend" "backend" {
+  backendset_name  = oci_load_balancer_backend_set.backend_set.name
+  ip_address       = oci_core_instance.jenkins_vm.private_ip
+  load_balancer_id = oci_load_balancer_load_balancer.load_balancer.id
+  port             = 80
 }
 
 
-resource "oci_load_balancer_listener" jenkins_lb_listener_with_ssl {
-    load_balancer_id         = oci_load_balancer_load_balancer.load_balancer.id
-    name                     = "http"
-    default_backend_set_name = oci_load_balancer_backend_set.backend_set.name
-    port                     = 80
-    protocol                 = "HTTP"
+resource "oci_load_balancer_listener" "jenkins_lb_listener_with_ssl" {
+  load_balancer_id         = oci_load_balancer_load_balancer.load_balancer.id
+  name                     = "http"
+  default_backend_set_name = oci_load_balancer_backend_set.backend_set.name
+  port                     = 80
+  protocol                 = "HTTP"
 }