Merge pull request #1841 from oracle/release_gh

Releasing version 4.117.0

Author: MeharwadeDivya

CHANGELOG.md

@@ -5,7 +5,7 @@ resource "oci_core_cross_connect" "cross_connect" {
   #Required
   compartment_id        = var.compartment_ocid
   location_name         = data.oci_core_cross_connect_locations.cross_connect_locations.cross_connect_locations[0].name
-  port_speed_shape_name = data.oci_core_cross_connect_port_speed_shapes.cross_connect_port_speed_shapes.cross_connect_port_speed_shapes[0].name
+  port_speed_shape_name = data.oci_core_cross_connect_port_speed_shapes.cross_connect_port_speed_shapes.cross_connect_port_speed_shapes[1].name
 
   #Optional
   cross_connect_group_id = oci_core_cross_connect_group.cross_connect_group.id

examples/fast_connect/cross_connect.tf

@@ -48,10 +48,10 @@ output "cross_connect_groups" {
 
 resource "oci_core_cross_connect_group" "test_cross_connect_group" {
     #Required
-    compartment_id = "${var.compartment_ocid}"
+    compartment_id = var.compartment_ocid
     #Optional
     customer_reference_name = "customerReferenceName"
-    defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}"
+    defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")
     display_name = "displayName"
     freeform_tags = {
         "Department" = "Finance"
@@ -63,21 +63,47 @@ resource "oci_core_cross_connect_group" "test_cross_connect_group" {
         encryption_cipher = "AES256_GCM"
         primary_key {
             #Required
-            connectivity_association_key_secret_id = "${var.secret_ocid_ckn}"
-            connectivity_association_key_secret_version = "${var.secret_version_cak}"
-            connectivity_association_name_secret_id = "${var.secret_ocid_cak}"
-            connectivity_association_name_secret_version = "${var.secret_version_ckn}"
+            connectivity_association_key_secret_id = var.secret_ocid_cak
+            connectivity_association_name_secret_id = var.secret_ocid_ckn
+            #Optional, api will always create with current version, but can use to update
+            connectivity_association_key_secret_version = var.secret_version_cak
+            connectivity_association_name_secret_version = var.secret_version_ckn
         }
 
     }
 }
 
+resource "oci_core_cross_connect_group" "test_cross_connect_group_2" {
+  #Required
+  compartment_id = var.compartment_ocid
+  #Optional
+  customer_reference_name = "customerReferenceName"
+  defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")
+  display_name = "displayName"
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+  macsec_properties {
+    #Required
+    state = "ENABLED"
+    #Optional
+    encryption_cipher = "AES256_GCM"
+    primary_key {
+      #Required
+      connectivity_association_key_secret_id = var.secret_ocid_cak
+      connectivity_association_name_secret_id = var.secret_ocid_ckn
+      #secret versions default to current version
+    }
+
+  }
+}
+
 variable defined_tag_namespace_name { default = "" }
 resource "oci_identity_tag_namespace" "tag-namespace1" {
         #Required
-        compartment_id = "${var.tenancy_ocid}"
+        compartment_id = var.tenancy_ocid
         description = "example tag namespace"
-        name = "${var.defined_tag_namespace_name != "" ? var.defined_tag_namespace_name : "example-tag-namespace-all"}"
+        name = var.defined_tag_namespace_name != "" ? var.defined_tag_namespace_name : "example-tag-namespace-all"
 
         is_retired = false
 }
@@ -86,7 +112,7 @@ resource "oci_identity_tag" "tag1" {
         #Required
         description = "example tag"
         name = "example-tag"
-        tag_namespace_id = "${oci_identity_tag_namespace.tag-namespace1.id}"
+        tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
 
         is_retired = false
 }

examples/fast_connect/cross_connect_group.tf

@@ -23,6 +23,46 @@ variable "oda_instance_state" {
 variable "compartment_ocid" {
 }
 
+variable "oda_private_endpoint_display_name" {
+  default = "oda_pe_name"
+}
+
+variable "oda_private_endpoint_description" {
+  default = "oda_pe_description"
+}
+
+variable "oda_private_endpoint_freeform_tags" {
+  default = { "test-key" = "value" }
+}
+
+variable "oda_private_endpoint_nsg_ids" {
+  default = []
+}
+
+variable "oda_private_endpoint_defined_tags_value" {
+  default = "value"
+}
+
+variable "oda_private_endpoint_is_used_for_rac_dbs" {
+  default = true
+}
+
+variable "oda_private_endpoint_scan_proxy_protocol" {
+  default = "TCP"
+}
+
+variable "oda_private_endpoint_scan_proxy_scan_listener_infos_scan_listener_fqdn" {
+  default = "myprefix-test-scan"
+}
+
+variable "oda_private_endpoint_scan_proxy_scan_listener_infos_scan_listener_port" {
+  default = 1521
+}
+
+variable "oda_private_endpoint_scan_proxy_scan_listener_type" {
+  default = "FQDN"
+}
+
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -47,11 +87,73 @@ data "oci_oda_oda_instances" "TFOdaInstances" {
 
   #Optional
   display_name = oci_oda_oda_instance.TFOdaInstance.display_name
-  #state        = var.oda_instance_state
 }
 
 data "oci_oda_oda_instance" "TFOdaInstance" {
   #Required
   oda_instance_id = oci_oda_oda_instance.TFOdaInstance.id
 }
 
+resource "oci_oda_oda_private_endpoint" "TFOdaPrivateEndpoint" {
+  compartment_id = var.compartment_ocid
+  subnet_id      = var.oda_private_endpoint_description
+  vcn_id         = oci_core_vcn.pe_vcn.id
+  display_name   = var.oda_private_endpoint_display_name
+  description    = var.oda_private_endpoint_description
+  freeform_tags  = var.oda_private_endpoint_freeform_tags
+  nsg_ids        = var.oda_private_endpoint_nsg_ids
+  defined_tags   = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.oda_private_endpoint_defined_tags_value}")}"
+  is_used_for_rac_dbs = var.oda_private_endpoint_is_used_for_rac_dbs
+}
+
+data "oci_oda_oda_private_endpoint" "test_oda_private_endpoint" {
+  #Required
+  oda_private_endpoint_id = oci_oda_oda_private_endpoint.TFOdaPrivateEndpoint.id
+}
+
+data "oci_oda_oda_private_endpoints" "test_oda_private_endpoints" {
+  #Required
+  compartment_id = var.compartment_ocid
+
+  #Optional
+  display_name = var.oda_private_endpoint_display_name
+}
+
+resource "oci_oda_oda_private_endpoint_attachment" "TFOdaPrivateEndpointAttachment" {
+  oda_instance_id = oci_oda_oda_instance.TFOdaInstance.id
+  oda_private_endpoint_id = oci_oda_oda_private_endpoint.TFOdaPrivateEndpoint.id
+}
+
+data "oci_oda_oda_private_endpoint_attachment" "test_oda_private_endpoint_attachment" {
+  #Required
+  oda_private_endpoint_attachment_id = oci_oda_oda_private_endpoint_attachment.TFOdaPrivateEndpointAttachment.id
+}
+
+data "oci_oda_oda_private_endpoint_attachments" "test_oda_private_endpoint_attachments" {
+  #Required
+  compartment_id = var.compartment_ocid
+  oda_private_endpoint_id = oci_oda_oda_private_endpoint.TFOdaPrivateEndpoint.id
+}
+
+resource "oci_oda_oda_private_endpoint_scan_proxy" "TFOdaPrivateEndpointScanProxy" {
+  #Required
+  oda_private_endpoint_id = oci_oda_oda_private_endpoint.TFOdaPrivateEndpoint.id
+  protocol = var.oda_private_endpoint_scan_proxy_protocol
+  scan_listener_infos {
+    #Optional
+    scan_listener_fqdn = var.oda_private_endpoint_scan_proxy_scan_listener_infos_scan_listener_fqdn
+    scan_listener_port = var.oda_private_endpoint_scan_proxy_scan_listener_infos_scan_listener_port
+  }
+  scan_listener_type = var.oda_private_endpoint_scan_proxy_scan_listener_type
+}
+
+data "oci_oda_oda_private_endpoint_scan_proxy" "test_oda_private_endpoint_scan_proxy" {
+  #Required
+  oda_private_endpoint_id = oci_oda_oda_private_endpoint.TFOdaPrivateEndpoint.id
+  oda_private_endpoint_scan_proxy_id = oci_oda_oda_private_endpoint_scan_proxy.TFOdaPrivateEndpointScanProxy.id
+}
+
+data "oci_oda_oda_private_endpoint_scan_proxies" "test_oda_private_endpoint_scan_proxies" {
+  #Required
+  oda_private_endpoint_id = oci_oda_oda_private_endpoint.TFOdaPrivateEndpoint.id
+}

examples/oracle_digital_assistant/main.tf

@@ -0,0 +1,89 @@
+variable "vcn_cidr_block" {
+  default = "10.0.0.0/25"
+}
+
+variable "vcn_display_name" {
+  default = "vcn_name"
+}
+
+variable "vcn_dns_label" {
+  default = "testvcn"
+}
+
+variable "ig_display_name" {
+  default = "ig_name"
+}
+
+variable "rt_display_name" {
+  default = "rt_name"
+}
+
+variable "subnet_cidr_block" {
+  default = "10.0.0.16/28"
+}
+
+variable "subnet_display_name" {
+  default = "subnet_name"
+}
+
+variable "subnet_dns_label" {
+  default = "test_subnet"
+}
+
+variable "security_list_dns_label" {
+  default = "test_security_list"
+}
+
+resource "oci_core_vcn" "pe_vcn" {
+  cidr_block     = var.vcn_cidr_block
+  compartment_id = var.compartment_ocid
+  display_name   = var.vcn_display_name
+  dns_label      = var.vcn_dns_label
+}
+
+resource "oci_core_internet_gateway" "pe_internet_gateway" {
+  compartment_id = var.vcn_cidr_block
+  display_name   = var.ig_display_name
+  vcn_id         = oci_core_vcn.pe_vcn.id
+}
+
+resource "oci_core_route_table" "pe_route_table" {
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_vcn.pe_vcn.id
+  display_name   = var.rt_display_name
+
+  route_rules {
+    destination       = "0.0.0.0/0"
+    destination_type  = "CIDR_BLOCK"
+    network_entity_id = oci_core_internet_gateway.pe_internet_gateway.id
+  }
+}
+
+resource "oci_core_subnet" "pe_subnet" {
+  cidr_block          = var.subnet_cidr_block
+  display_name        = var.subnet_display_name
+  dns_label           = var.subnet_dns_label
+  compartment_id      = var.compartment_ocid
+  vcn_id              = oci_core_vcn.pe_vcn.id
+  security_list_ids   = ["${oci_core_security_list.pe_security_list.id}"]
+  route_table_id      = ["${oci_core_route_table.pe_route_table.id}"]
+  prohibit_public_ip_on_vnic = true
+}
+
+resource "oci_core_security_list" "pe_security_list" {
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_vcn.pe_vcn.id
+  display_name   = var.security_list_dns_label
+
+  egress_security_rules {
+    protocol    = "all"
+    destination = "0.0.0.0/0"
+    stateless = false
+  }
+
+  ingress_security_rules {
+    protocol = "all"
+    source   = "0.0.0.0/0"
+    stateless = false
+  }
+}