Merge pull request #1851 from oracle/release_gh_new

Releasing 1.18.0 version

Author: ravinitp

CHANGELOG.md

@@ -6,20 +6,20 @@
  */
 
 //Common Variables required
-variable "tenancy_ocid" {}
-variable "user_ocid" {}
-variable "fingerprint" {}
-variable "private_key_path" {}
-variable "region" {}
-variable "compartment_ocid" {}
-
-provider "oci" {
-  tenancy_ocid     = var.tenancy_ocid
-  user_ocid        = var.user_ocid
-  fingerprint      = var.fingerprint
-  private_key_path = var.private_key_path
-  region           = var.region
-}
+#variable "tenancy_ocid" {}
+#variable "user_ocid" {}
+#variable "fingerprint" {}
+#variable "private_key_path" {}
+#variable "region" {}
+#variable "compartment_ocid" {}
+
+#provider "oci" {
+#  tenancy_ocid     = var.tenancy_ocid
+#  user_ocid        = var.user_ocid
+#  fingerprint      = var.fingerprint
+#  private_key_path = var.private_key_path
+#  region           = var.region
+#}
 
 //******  CG Enable ******
 variable "cloud_guard_configuration_reporting_region" {
@@ -232,4 +232,4 @@ resource "oci_cloud_guard_target" "test_target" {
   lifecycle {
     ignore_changes = [system_tags]
   }
-}
+}

examples/cloudguard/cloudguard_basic_example/main.tf

@@ -31,6 +31,10 @@ variable allow_listed_http_vcn {
   default = ""
 }
 
+variable certificate_secret_id {
+  default = ""
+}
+
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -42,34 +46,40 @@ provider "oci" {
 resource "oci_integration_integration_instance" "test_integration_instance" {
   #Required
   compartment_id            = var.compartment_id
-  display_name              = "displayName"
-  integration_instance_type = "STANDARD"
+  display_name              = "instance4643"
+  integration_instance_type = "STANDARDX"
+  shape                     = "DEVELOPMENT"
+  # shape                     = "PRODUCTION"
   is_byol                   = "false"
   message_packs             = "10"
 
-  #Optional
-  consumption_model = "${var.integration_instance_consumption_model}"
-  custom_endpoint {
-    hostname = "hostname.com"
-  }
-  freeform_tags = {
-    "bar-key" = "value"
-  }
-
   idcs_at                = var.integration_instance_idcs_access_token
-  is_file_server_enabled = true
-  is_visual_builder_enabled = true
-  state                  = "ACTIVE"
-
-  network_endpoint_details {
-    allowlisted_http_ips = ["172.16.0.239/32"]
-    allowlisted_http_vcns {
-      allowlisted_ips = ["172.16.0.239/32"]
-      id = "${var.allow_listed_http_vcn}"
-    }
-    is_integration_vcn_allowlisted = "false"
-    network_endpoint_type = "PUBLIC"
-  }
+
+  #Optional
+# For stand / enterprise type only
+#  consumption_model = "${var.integration_instance_consumption_model}"
+#  custom_endpoint {
+#    certificate_secret_id = var.certificate_secret_id
+#    hostname = "hostname.com"
+#  }
+#  freeform_tags = {
+#    "bar-key" = "value"
+#  }
+
+#  is_file_server_enabled = true
+#  is_visual_builder_enabled = true
+#  state                  = "ACTIVE"
+
+# For stand / enterprise type only
+#  network_endpoint_details {
+#    allowlisted_http_ips = ["10.0.0.0/28"]
+#    allowlisted_http_vcns {
+#      allowlisted_ips = ["0.0.0.0/0"]
+#      id = "${var.allow_listed_http_vcn}"
+#    }
+#    is_integration_vcn_allowlisted = "false"
+#    network_endpoint_type = "PUBLIC"
+#  }
 
 }
 
@@ -78,8 +88,8 @@ data "oci_integration_integration_instances" "test_integration_instances" {
   compartment_id = var.compartment_id
 
   #Optional
-  display_name = "displayName"
-  state        = "Active"
+#  display_name = "displayName"
+#  state        = "Active"
 }
 
 data "oci_integration_integration_instance" "test_integration_instance" {