oracle-devrel · xs2suruchi · Sep 30, 2024 · Sep 16, 2024 · Sep 16, 2024 · Sep 23, 2024
diff --git a/Dockerfile b/Dockerfile
@@ -15,6 +15,7 @@ RUN microdnf install -y sudo && \
     chown -R $USERNAME:$USERNAME /cd3user/tenancies/ && \
     microdnf install -y vim && \
     microdnf install -y dnf && \
+    microdnf install -y graphviz && \
     echo 'alias vi="vim"' >> /etc/bashrc
 
 USER $USERNAME

diff --git a/OCIWorkVMStack/main.tf b/OCIWorkVMStack/main.tf
@@ -38,6 +38,7 @@ module "instance" {
   instance_shape            = var.instance_shape
   instance_ram              = var.instance_ram
   instance_ocpus            = var.instance_ocpus
+  boot_volume_size          = var.boot_volume_size
   instance_ad               = var.instance_ad
   instance_fd               = var.instance_fd
   ssh_public_key            = var.ssh_public_key

diff --git a/OCIWorkVMStack/modules/compute/instance.tf b/OCIWorkVMStack/modules/compute/instance.tf
@@ -6,15 +6,14 @@ resource "oci_core_instance" "instances" {
   shape               = var.instance_shape
 
   shape_config {
-
     memory_in_gbs = var.instance_ram
     ocpus         = var.instance_ocpus
     #baseline_ocpu_utilization = var.baseline_ocpu_utilization
   }
   source_details {
     source_id   = var.instance_image_ocid
     source_type = "image"
-    #boot_volume_size_in_gbs = var.boot_volume_size
+    boot_volume_size_in_gbs = var.boot_volume_size
   }
   create_vnic_details {
     #assign_public_ip = local.PulicIP == true ? "false" : "true"
@@ -30,6 +29,20 @@ resource "oci_core_instance" "instances" {
     config_region       = var.config_region
     user_data           = fileexists("${path.root}/scripts/${var.cloud_init_script}") ? "${base64encode(file("${path.root}/scripts/${var.cloud_init_script}"))}" : null
   }
+  instance_options {
+    are_legacy_imds_endpoints_disabled = "true"
+  }
+
+  is_pv_encryption_in_transit_enabled   = "true"
+  agent_config {
+    are_all_plugins_disabled = "false"
+    is_management_disabled   = "false"
+    is_monitoring_disabled   = "false"
+    plugins_config {
+      desired_state = "ENABLED"
+      name          = "Bastion"
+    }
+  }
 
   lifecycle {
     ignore_changes = []

diff --git a/OCIWorkVMStack/modules/compute/variables.tf b/OCIWorkVMStack/modules/compute/variables.tf
@@ -57,6 +57,12 @@ variable "instance_ocpus" {
   default     = 1
 }
 
+variable "boot_volume_size" {
+  description = "Boot volume size"
+  type        = number
+  default     = 50
+}
+
 variable "instance_ad" {
   description = "The Availability domain in which instance will be provisioned."
   type        = string

diff --git a/OCIWorkVMStack/schema.yaml b/OCIWorkVMStack/schema.yaml
@@ -29,10 +29,12 @@ variableGroups:
    - instance_shape
    - instance_ocpus
    - instance_ram
+   - boot_volume_size
    - instance_ad
    - instance_fd
    - ssh_public_key
 
+
 - title : "Networking Details for CD3 Automation Toolkit WorkVM"
   variables:
   - vcn_strategy
@@ -165,7 +167,16 @@ variables:
     maximum: 1024
     multipleOf: 1
     required: true
-
+  boot_volume_size:
+    visible:
+    type: integer
+    title: Boot volume size in GBs
+    description: Boot volume size in GBs. Default is 50 GB and value should be multiple of 1.
+    default: 50
+    minimum: 50
+    maximum: 32768
+    multipleOf: 1
+    required: true
   instance_ad:
     type: oci:identity:availabilitydomain:name
     title: Select Availability domain

diff --git a/OCIWorkVMStack/variables.tf b/OCIWorkVMStack/variables.tf
@@ -99,6 +99,12 @@ variable "instance_ocpus" {
   default     = 1
 }
 
+variable "boot_volume_size" {
+  description = "Boot volume size"
+  type        = number
+  default     = 50
+}
+
 variable "instance_ad" {
   description = "The Availability domain in which instance will be provisioned."
   type        = string

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Additionally, the toolkit also supports seamless resource management using OCI D
 🚀 Click the below button to quickly launch CD3 toolkit container in Oracle Cloud and start managing your Infra as Code. 
 <br>
 
-[![Deploy_To_OCI](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/cd3-automation-toolkit/archive/refs/heads/main.zip)
+[![Deploy_To_OCI](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/cd3-automation-toolkit/archive/refs/heads/develop.zip)
 
 <br>
 

diff --git a/cd3_automation_toolkit/Compute/export_instances_nonGreenField.py b/cd3_automation_toolkit/Compute/export_instances_nonGreenField.py
@@ -371,8 +371,8 @@ def export_instances(inputfile, outdir, service_dir,config1, signer1, ct, export
 
         tempStrKeys = "\n" + tempStrKeys
         tempStrKeys = "#START_instance_ssh_keys#" + tempStrKeys + "\t#instance_ssh_keys_END#"
-        if ("\\n" in tempStrKeys):
-            tempStrKeys = tempStrKeys.replace("\\n", "\\\\n")
+        if ("\\" in tempStrKeys):
+            tempStrKeys = tempStrKeys.replace("\\", "\\\\")
 
         var_data[reg] = re.sub('#START_instance_ssh_keys#.*?#instance_ssh_keys_END#', tempStrKeys,
                                var_data[reg],flags=re.DOTALL)

diff --git a/cd3_automation_toolkit/Compute/templates/dedicatedvmhosts-template b/cd3_automation_toolkit/Compute/templates/dedicatedvmhosts-template
@@ -1,6 +1,7 @@
 {% if count == 0 %}
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
-
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
 ############################
 # Dedicated VM Hosts
 # Dedicated VM Hosts - tfvars

diff --git a/cd3_automation_toolkit/Compute/templates/instances-template b/cd3_automation_toolkit/Compute/templates/instances-template
@@ -1,6 +1,7 @@
 {% if count == 0 %}
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
-
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
 ############################
 # Instances
 # Instance - tfvars
@@ -90,10 +91,10 @@ instances = {
             {% if plugin_match %}
             plugins_details = {
                     {% if plugin_bastion %}
-                        Bastion = "{{ plugin_bastion.upper() }}",
+                        Bastion = "{{ plugin_bastion.upper() }}"
                     {% endif %}
                     {% if plugin_management_agent %}
-                        "Management Agent" =  "{{ plugin_management_agent.upper() }}",
+                        "Management Agent" =  "{{ plugin_management_agent.upper() }}"
                     {% endif %}
                     {% if plugin_vulnerability_scanning %}
                         "Vulnerability Scanning" = "{{ plugin_vulnerability_scanning.upper() }}"
@@ -125,6 +126,13 @@ instances = {
                     {% if plugin_compute_hpc_rdma_auto_configuration %}
                         "Compute HPC RDMA Auto-Configuration" = "{{ plugin_compute_hpc_rdma_auto_configuration.upper() }}"
                     {% endif %}
+                    {% if plugin_os_management_hub_agent %}
+                        "OS Management Hub Agent" = "{{ plugin_os_management_hub_agent.upper() }}"
+                    {% endif %}
+                    {% if plugin_cloud_guard_workload_protection %}
+                        "Cloud Guard Workload Protection" = "{{ plugin_cloud_guard_workload_protection.upper() }}"
+                    {% endif %}
+
             }
             {% endif %}
 

diff --git a/cd3_automation_toolkit/CostManagement/Budget/templates/budget-alert-rule-template b/cd3_automation_toolkit/CostManagement/Budget/templates/budget-alert-rule-template
@@ -1,7 +1,4 @@
 {% if count == 0 %}
-
-// Copyright (c) 2024, Oracle and/or its affiliates.
-
 ############################
 # Governance
 # Create Budget Alert Rules

diff --git a/cd3_automation_toolkit/CostManagement/Budget/templates/budget-template b/cd3_automation_toolkit/CostManagement/Budget/templates/budget-template
@@ -1,6 +1,7 @@
 {% if count == 0 %}
-// Copyright (c) 2024, Oracle and/or its affiliates.
-
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
 ############################
 # Governance
 # Create Budgets

diff --git a/cd3_automation_toolkit/Database/templates/adb-template b/cd3_automation_toolkit/Database/templates/adb-template
@@ -1,6 +1,7 @@
 {% if count == 0 %}
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
-
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
 ############################
 # ADB
 # ADB - tfvars

diff --git a/cd3_automation_toolkit/Database/templates/dbsystems-vm-bm-template b/cd3_automation_toolkit/Database/templates/dbsystems-vm-bm-template
@@ -1,6 +1,7 @@
 {% if count == 0 %}
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
-
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
 ############################
 # Database
 # DBSystem-VM-BM - tfvars

diff --git a/cd3_automation_toolkit/Database/templates/exa-infra-template b/cd3_automation_toolkit/Database/templates/exa-infra-template
@@ -1,6 +1,7 @@
 {% if count == 0 %}
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
-
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
 ############################
 # Database
 # ExaInfra - tfvars

diff --git a/cd3_automation_toolkit/Database/templates/exa-vmclusters-template b/cd3_automation_toolkit/Database/templates/exa-vmclusters-template
@@ -1,6 +1,7 @@
 {% if count == 0 %}
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
-
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
 ############################
 # Database
 # ExaVMClusters - tfvars

diff --git a/cd3_automation_toolkit/DeveloperServices/OKE/templates/cluster-template b/cd3_automation_toolkit/DeveloperServices/OKE/templates/cluster-template
@@ -1,6 +1,7 @@
 {% if count == 0 %}
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
-
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
 #############################
 # Developer Services
 # OKE Cluster - tfvars

diff --git a/cd3_automation_toolkit/DeveloperServices/OKE/templates/nodepool-template b/cd3_automation_toolkit/DeveloperServices/OKE/templates/nodepool-template
@@ -1,6 +1,7 @@
 {% if count == 0 %}
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
-
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
 #############################
 # Developer Services
 # OKE Nodepool - tfvars

diff --git a/cd3_automation_toolkit/DeveloperServices/OKE/templates/virtual-nodepool-template b/cd3_automation_toolkit/DeveloperServices/OKE/templates/virtual-nodepool-template
@@ -1,6 +1,7 @@
 {% if count == 0 %}
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
-
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
 #############################
 # Developer Services
 # OKE Nodepool - tfvars

diff --git a/cd3_automation_toolkit/Excel_Columns b/cd3_automation_toolkit/Excel_Columns
@@ -8,6 +8,11 @@
         "Description" : "description",
         "Name" : "name"
     },
+    "Users" :
+    {
+        "Family Name" : "family_name",
+        "User Name" : "name"
+    },
     "Policies" :
     {
        "Description" : "description",

diff --git a/cd3_automation_toolkit/Governance/Billing/__init__.py b/cd3_automation_toolkit/Governance/Billing/__init__.py
diff --git a/cd3_automation_toolkit/Governance/Billing/create_terraform_budget.py b/cd3_automation_toolkit/Governance/Billing/create_terraform_budget.py
-Original file line number
+Diff line change
@@ Expand Up @@
     🚀 Click the below button to quickly launch CD3 toolkit container in Oracle Cloud and start managing your Infra as Code.
     <br>
-    [![Deploy_To_OCI](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/cd3-automation-toolkit/archive/refs/heads/main.zip)
+    [![Deploy_To_OCI](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/cd3-automation-toolkit/archive/refs/heads/develop.zip)
     <br>
@@ Expand Down @@