Merge pull request #2085 from oracle/release_gh

Releasing version 5.36.0

Author: Maxrovr

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 5.36.0 (April 03, 2024)
+
+### Added
+- Support for Management Agent wait_for_host_id and prevent destroy resource
+- Support for Email Delivery: Submit Configuration API
+- Support for Support for TLS 1.3
+- Support for Telesis IPv6 Single Stack/ Private IP Support
+- Support for Cloudguard-Logging Integration for JWCC - Customer Enablement
+
+### Bug Fix
+- Remove computed: true from the SecretContent.Name field. Manually add the logic to set both the name and content to null if nothing is provided.
+- Handle empty members in DR Protection Group
+
 ## 5.35.0 (March 27, 2024)
 
 ### Added

examples/cloudguard/data_source/cloud_guard_data_source.tf

@@ -24,6 +24,10 @@ variable "data_source_freeform_tags" {
   default = { "bar-key" = "value" }
 }
 
+variable "data_source_status" {
+  default = "DISABLED"
+}
+
 //Has to be unique
 variable "data_source_display_name" {
   default = "displayName"
@@ -71,7 +75,11 @@ variable "data_source_data_source_details_logging_query_details_key_entities_cou
 }
 
 variable "data_source_data_source_details_query_start_time_start_policy_type" {
-  default = "NO_DELAY_START_POLICY"
+  default = "ABSOLUTE_TIME_START_POLICY"
+}
+
+variable "data_source_data_source_details_query_start_time_query_start_time" {
+  default = "2023-10-18T12:52:59.817Z"
 }
 
 provider "oci" {
@@ -115,10 +123,12 @@ resource "oci_cloud_guard_data_source" "test_data_source" {
 
     query_start_time {
       start_policy_type = var.data_source_data_source_details_query_start_time_start_policy_type
+      query_start_time = var.data_source_data_source_details_query_start_time_query_start_time
     }
   }
 
   #Optional
   defined_tags  = { "example-tag-namespace-all.example-tag" = var.data_source_defined_tags_value }
   freeform_tags = var.data_source_freeform_tags
+  status        = var.data_source_status
 }

examples/email/configuration.tf

@@ -0,0 +1,7 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+data "oci_email_configuration" "test_configuration" {
+  #Required
+  compartment_id = var.compartment_ocid
+}

examples/management_agent/management_agent.tf

@@ -9,6 +9,12 @@ variable "region" {}
 variable "compartment_ocid" {}
 variable "root_compartment_ocid" {}
 
+variable "shape" {
+  default = "VM.Standard.E4.Flex"
+}
+
+variable "subnet" {
+}
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -121,4 +127,65 @@ data "oci_management_agent_management_agent_available_histories" "test_managemen
 data "oci_management_agent_management_agent_get_auto_upgradable_config" "test_management_agent_get_auto_upgradable_config" {
   #Required
   compartment_id = var.tenancy_ocid
+}
+
+
+resource "oci_core_instance" "instance" {
+
+  agent_config {
+    is_monitoring_disabled = false
+    is_management_disabled = false
+    plugins_config {
+      desired_state = "ENABLED"
+      name          = "Management Agent"
+    }
+
+  }
+
+  availability_domain = data.oci_identity_availability_domains.ads.availability_domains[0].name
+  compartment_id      = var.compartment_ocid
+  shape               = var.shape
+  shape_config {
+    ocpus         = 1
+    memory_in_gbs = 8
+  }
+
+  source_details {
+    source_type = "image"
+    source_id   =  data.oci_core_images.compute_images.images[0].id
+  }
+
+  create_vnic_details {
+    subnet_id              = var.subnet
+    display_name           = "example_vnic"
+    assign_public_ip       = false
+    skip_source_dest_check = false
+  }
+
+  display_name = "Terraform example Agent host"
+
+}
+data "oci_identity_availability_domains" "ads" {
+  compartment_id = var.compartment_ocid
+}
+data "oci_core_images" "compute_images" {
+  #Required
+  compartment_id           = var.compartment_ocid
+  operating_system         = "Oracle Autonomous Linux"
+  operating_system_version = "7.9"
+}
+
+
+data "oci_management_agent_management_agents" "find_compute_agent" {
+  compartment_id   = var.compartment_ocid
+  host_id          = oci_core_instance.instance.id
+  wait_for_host_id = 10
+}
+
+
+
+resource "oci_management_agent_management_agent" "test_compute_management_agent" {
+  freeform_tags     = { "TestingTag" : "TestingValue" }
+  managed_agent_id  = data.oci_management_agent_management_agents.find_compute_agent.management_agents[0].id
+  deploy_plugins_id = [data.oci_management_agent_management_agent_plugins.test_management_agent_plugins.management_agent_plugins.0.id]
 }

examples/management_agent/management_agent_data_source.tf

@@ -15,5 +15,4 @@ resource "oci_management_agent_management_agent_data_source" "add_datasource" {
 data "oci_management_agent_management_agent_data_sources" "test_datasource_data" {
   management_agent_id = data.oci_management_agent_management_agents.find_agent.management_agents[0].id
   name = "PrometheusTestA"
-  depends_on = [oci_management_agent_management_agent_data_source.add_datasource]
 }

examples/network_load_balancer/network_load_balancer_full/nlb_full.tf

@@ -45,7 +45,7 @@ locals {
   ######################################################################################################################
   # IPV6 Constants
   ######################################################################################################################
-  ipv6_cidr_block = oci_core_vcn.vcn1.ipv6cidr_blocks[0] // this ends in 0::/56
+  ipv6_cidr_block = oci_core_vcn.vcn1.ipv6private_cidr_blocks[0] // this ends in 0::/56
 }
 
 provider "oci" {
@@ -69,6 +69,11 @@ resource "oci_core_vcn" "vcn1" {
   display_name   = "vcn1"
   dns_label      = "vcn1"
   is_ipv6enabled =  true
+  is_oracle_gua_allocation_enabled = false
+  ipv6private_cidr_blocks = ["2000:1000:1200::/56", "fc00:1000:1200::/56"]
+  lifecycle {
+    ignore_changes = [ is_ipv6enabled ]
+  }
 }
 
 resource "oci_core_subnet" "subnet1" {
@@ -94,7 +99,7 @@ resource "oci_core_ipv6" "nlb-ipv6-addr" {
 
 resource "oci_core_subnet" "subnet-ipv6" {
   cidr_block          = "10.1.21.0/24"
-  ipv6cidr_block      = "${substr(local.ipv6_cidr_block,0,length(local.ipv6_cidr_block)-6)}1::/64"
+  ipv6cidr_blocks      = ["2000:1000:1200:0005::/64"]
   display_name        = "subnet-ipv6"
   dns_label           = "subnetipv6"
   security_list_ids   = [oci_core_security_list.securitylist1.id]
@@ -108,6 +113,22 @@ resource "oci_core_subnet" "subnet-ipv6" {
   }
 }
 
+resource "oci_core_subnet" "subnet-ipv62" {
+  cidr_block          = "10.1.22.0/24"
+  ipv6cidr_blocks      = ["2000:1000:1200:0001::/64", "fc00:1000:1200:0001::/64"]
+  display_name        = "subnet-ipv62"
+  dns_label           = "subnetipv62"
+  security_list_ids   = [oci_core_security_list.securitylist1.id]
+  compartment_id      = var.compartment_ocid
+  vcn_id              = oci_core_vcn.vcn1.id
+  route_table_id      = oci_core_route_table.routetable-ipv6.id
+  dhcp_options_id     = oci_core_vcn.vcn1.default_dhcp_options_id
+
+  provisioner "local-exec" {
+    command = "sleep 5"
+  }
+}
+
 resource "oci_core_vnic_attachment" "vnic-ipv6" {
   #Required
   create_vnic_details {
@@ -288,7 +309,10 @@ resource "oci_network_load_balancer_network_load_balancer" "nlb1" {
   subnet_id = oci_core_subnet.subnet1.id
 
   display_name = "nlb1"
+
   is_symmetric_hash_enabled = false
+
+  assigned_private_ipv4 = "10.1.20.5"
 }
 
 resource "oci_network_load_balancer_backend_set" "nlb-bes1" {
@@ -323,7 +347,7 @@ resource "oci_network_load_balancer_backend_set" "nlb-bes2" {
     interval_in_millis  = 10000
     retries             = 3
   }
-  depends_on   = [oci_network_load_balancer_backend_set.nlb-bes1]
+  depends_on = [oci_network_load_balancer_backend_set.nlb-bes1]
 }
 
 resource "oci_network_load_balancer_backend_set" "nlb-bes3" {
@@ -357,7 +381,7 @@ resource "oci_network_load_balancer_listener" "nlb-listener2" {
   network_load_balancer_id    = oci_network_load_balancer_network_load_balancer.nlb1.id
   name                        = "udp_listener"
   default_backend_set_name    = oci_network_load_balancer_backend_set.nlb-bes2.name
-  port                        = 80
+  port                        = 22
   protocol                    = "UDP"
   depends_on = [oci_network_load_balancer_listener.nlb-listener1]
 }
@@ -366,7 +390,7 @@ resource "oci_network_load_balancer_listener" "nlb-listener3" {
   network_load_balancer_id    = oci_network_load_balancer_network_load_balancer.nlb1.id
   name                        = "tcp_and_udp_listener"
   default_backend_set_name    = oci_network_load_balancer_backend_set.nlb-bes3.name
-  port                        = 8080
+  port                        = 100
   protocol                    = "TCP_AND_UDP"
   depends_on = [oci_network_load_balancer_listener.nlb-listener2]
 }
@@ -387,7 +411,7 @@ resource "oci_network_load_balancer_backend" "nlb-be2" {
   network_load_balancer_id = oci_network_load_balancer_network_load_balancer.nlb1.id
   backend_set_name         = oci_network_load_balancer_backend_set.nlb-bes2.name
   target_id                = oci_core_instance.instance1.id
-  port                     = 20
+  port                     = 22
   is_backup                = false
   is_drain                 = false
   is_offline               = false
@@ -414,11 +438,22 @@ resource "oci_network_load_balancer_network_load_balancer" "nlb-ipv6" {
   compartment_id = var.compartment_ocid
 
   subnet_id = oci_core_subnet.subnet-ipv6.id
+  assigned_ipv6 = "2000:1000:1200:0005:0001:0000:0001:0000"
   is_private = false
   display_name = "nlb-ipv6"
   nlb_ip_version = "IPV4_AND_IPV6"
 }
 
+resource "oci_network_load_balancer_network_load_balancer" "nlb-ipv6-subnetIpv6Cidr" {
+  compartment_id = var.compartment_ocid
+
+  subnet_id = oci_core_subnet.subnet-ipv62.id
+  subnet_ipv6cidr = "fc00:1000:1200:0001::/64"
+  is_private = false
+  display_name = "nlb-ipv6-subnetIpv6Cidr"
+  nlb_ip_version = "IPV4_AND_IPV6"
+}
+
 resource "oci_network_load_balancer_backend_set" "nlb-bes-ipv6" {
   name                     = "nlb-bes-ipv6"
   network_load_balancer_id = oci_network_load_balancer_network_load_balancer.nlb-ipv6.id
@@ -450,7 +485,7 @@ resource "oci_network_load_balancer_listener" "nlb-listener-ipv6" {
 resource "oci_network_load_balancer_backend" "nlb-be-ipv6" {
   network_load_balancer_id = oci_network_load_balancer_network_load_balancer.nlb-ipv6.id
   backend_set_name         = oci_network_load_balancer_backend_set.nlb-bes-ipv6.name
-  ip_address               = "2607:9b80:9a0a:9a7e:abcd:ef01:2345:6789"
+  ip_address               = "2000:1000:1200:0001:0001:1000:0000:0000"
   port                     = 80
   is_backup                = false
   is_drain                 = false

examples/vault_secret/main.tf

@@ -54,14 +54,14 @@ resource "oci_vault_secret" "test_secret" {
     stage   = "CURRENT"
   }
   key_id = var.kms_key_ocid
-  secret_name = "TFsample1"
+  secret_name = "TFsample1e13"
   vault_id    = var.kms_vault_ocid
 }
 
 resource "oci_vault_secret" "test_secret_with_auto_rotation" {
   compartment_id = var.compartment_ocid
   key_id         = var.kms_key_ocid
-  secret_name    = "TFSecretAutoRotation"
+  secret_name    = "TFSecretAutoRotation211"
   vault_id       = var.kms_vault_ocid
 
   secret_content {
@@ -75,7 +75,7 @@ resource "oci_vault_secret" "test_secret_with_auto_rotation" {
   }
 
   rotation_config {
-    is_scheduled_rotation_enabled = "true"
+    is_scheduled_rotation_enabled = "false"
     rotation_interval = "P90D"
     target_system_details {
       function_id = var.function_ocid
@@ -87,7 +87,7 @@ resource "oci_vault_secret" "test_secret_with_auto_rotation" {
 resource "oci_vault_secret" "test_secret_with_target_system" {
   compartment_id = var.compartment_ocid
   key_id         = var.kms_key_ocid
-  secret_name    = "TFSecretWithTargetSystem"
+  secret_name    = "TFSecretWithTargetSyste2121m"
   vault_id       = var.kms_vault_ocid
 
   secret_content {
@@ -109,6 +109,21 @@ resource "oci_vault_secret" "test_secret_with_target_system" {
   }
 }
 
+resource "oci_vault_secret" "test_secret_without_version_name" {
+  compartment_id = var.compartment_ocid
+  secret_content {
+    #Required
+    content_type = "BASE64"
+
+    #Optional
+    content = "PHZhcj4mbHQ7YmFzZTY0X2VuY29kZWRfc2VjcmV0X2NvbnRlbnRzJmd0OzwvdmFyPg=="
+    stage   = "CURRENT"
+  }
+  key_id = var.kms_key_ocid
+  secret_name = "TFsampleWithoutVersionName212"
+  vault_id    = var.kms_vault_ocid
+}
+
 
 data "oci_vault_secret" "test_secret" {
   secret_id = oci_vault_secret.test_secret.id

go.mod

@@ -65,7 +65,7 @@ require (
 	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
-	github.com/oracle/oci-go-sdk/v65 v65.62.0
+	github.com/oracle/oci-go-sdk/v65 v65.63.0
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sony/gobreaker v0.5.0 // indirect
 	github.com/ulikunitz/xz v0.5.10 // indirect

go.sum

@@ -509,8 +509,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/oracle/oci-go-sdk/v65 v65.62.0 h1:A+3n6e4TanUK94yvZBqUyK62mvDZ2YC29lJebVKsmcg=
-github.com/oracle/oci-go-sdk/v65 v65.62.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
+github.com/oracle/oci-go-sdk/v65 v65.63.0 h1:Q6eZU2olI+nOMpnrvHtpCE774AS1bYOujv89p4pOi08=
+github.com/oracle/oci-go-sdk/v65 v65.63.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

internal/globalvar/version.go

@@ -7,8 +7,8 @@ import (
 	"log"
 )
 
-const Version = "5.35.0"
-const ReleaseDate = "2024-03-27"
+const Version = "5.36.0"
+const ReleaseDate = "2024-04-03"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)