Adding support for the JMS OCA plugin (#104)

* adding JMS OCA plugin * fix typo * documenting a new variable
oracle-terraform-modules · Nov 29, 2022 · b19dbe0 · b19dbe0
1 parent aedd7e9
commit b19dbe0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/docs/terraformoptions.adoc b/docs/terraformoptions.adoc
@@ -95,7 +95,8 @@
   "monitoring": "ENABLED",
   "osms": "ENABLED",
   "run_command": "ENABLED",
-  "vulnerability_scanning": "ENABLED"
+  "vulnerability_scanning": "ENABLED",
+  "java_management_service": "DISABLED"
 }
 ----
 

diff --git a/main.tf b/main.tf
@@ -47,8 +47,8 @@ locals {
     // prepare data with default values for flex shapes. Used to populate shape_config block with default values
     // Iterate through data.oci_core_shapes.current_ad.shapes (this exclude duplicate data in multi-ad regions) and create a map { name = { memory_in_gbs = "xx"; ocpus = "xx" } }
     for i in data.oci_core_shapes.current_ad.shapes : i.name => {
-      "memory_in_gbs" = i.memory_in_gbs
-      "ocpus"         = i.ocpus
+      memory_in_gbs = i.memory_in_gbs
+      ocpus         = i.ocpus
     }
   }
   shape_is_flex = length(regexall("^*.Flex", var.shape)) > 0 # evaluates to boolean true when var.shape contains .Flex
@@ -120,6 +120,10 @@ resource "oci_core_instance" "instance" {
       desired_state = var.cloud_agent_plugins.vulnerability_scanning
       name          = "Vulnerability Scanning"
     }
+    plugins_config {
+      desired_state = var.cloud_agent_plugins.java_management_service
+      name = "Oracle Java Management Service"
+    }
   }
 
   create_vnic_details {

diff --git a/variables.tf b/variables.tf
@@ -95,15 +95,16 @@ variable "cloud_agent_plugins" {
   description = "Whether each Oracle Cloud Agent plugins should be ENABLED or DISABLED."
   type        = map(string)
   default = {
-    autonomous_linux       = "ENABLED"
-    bastion                = "ENABLED"
-    block_volume_mgmt      = "DISABLED"
-    custom_logs            = "ENABLED"
-    management             = "DISABLED"
-    monitoring             = "ENABLED"
-    osms                   = "ENABLED"
-    run_command            = "ENABLED"
-    vulnerability_scanning = "ENABLED"
+    autonomous_linux        = "ENABLED"
+    bastion                 = "ENABLED"
+    block_volume_mgmt       = "DISABLED"
+    custom_logs             = "ENABLED"
+    management              = "DISABLED"
+    monitoring              = "ENABLED"
+    osms                    = "ENABLED"
+    run_command             = "ENABLED"
+    vulnerability_scanning  = "ENABLED"
+    java_management_service = "DISABLED"
   }
   #* need to craft a validation condition at some point
 }