Merge pull request #1879 from oracle/release_gh

Releasing version 4.122.0

Author: MeharwadeDivya

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 4.122.0 (May 24, 2023)
+
+### Added
+- Remove hardcoded passwords from golden_gate integration test codes
+- ExaDB-C@C (EXACC) Data Plane Guest VMs (API/UI Only)
+- Support for Node Subsetting | ADB-D
+- Support for DNS Secondary Egress and creating DNS zones from zone files
+- Support for unified agent config CRI parser
+- Support for Create oci_dns_rrsets data source
+- Changes for setting resource ID in state file before workrequest completion
+### Bug Fix
+- Populate user resource optional fields only if they arent empty
+- Remove system tags from SZ requests
+- adding fix for cloudguard detector rule condition paramter unmarshalling issue
+
 ## 4.121.0 (May 17, 2023)
 
 ### Added

examples/cloudguard/security_zone/security_zone.tf

@@ -77,8 +77,4 @@ resource "oci_cloud_guard_security_zone" "test_security_zone" {
   #Optional
   description   = "${var.security_zone_description}"
 
-  //Added only because we are testing this in a splat-disabled env
-  lifecycle {
-    ignore_changes = [system_tags]
-  }
 }

examples/cloudguard/security_zone_recipe/security_zone_recipe.tf

@@ -66,8 +66,4 @@ resource "oci_cloud_guard_security_recipe" "test_security_recipe" {
   #Optional
   description       = "${var.security_recipe_description}"
 
-  //Added only because we are testing this in a splat-disabled env
-  lifecycle {
-    ignore_changes = [system_tags]
-  }
 }

examples/database/atp-d/main.tf

@@ -59,6 +59,10 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
   db_version          = "19.18.0.1.0"
 }
 
+variable "cloud_exadata_infrastructure_un_allocated_resource_db_servers" {
+  default = []
+}
+
 resource "random_string" "autonomous_database_admin_password" {
   length      = 16
   min_numeric = 1
@@ -146,4 +150,7 @@ output "autonomous_container_databases" {
 data "oci_database_cloud_exadata_infrastructure_un_allocated_resource" "test_cloud_exadata_infrastructure_un_allocated_resources" {
   #Required
   cloud_exadata_infrastructure_id = oci_database_cloud_exadata_infrastructure.test_cloud_exadata_infrastructure.id
+
+  #Optional
+  db_servers = var.cloud_exadata_infrastructure_un_allocated_resource_db_servers
 }

examples/dns/global/rrset.tf

@@ -50,3 +50,8 @@ data "oci_dns_rrset" "test_rrset" {
   zone_name_or_id = oci_dns_zone.zone3.id
 }
 
+data "oci_dns_rrsets" "test_rrsets" {
+  domain          = "el.${oci_dns_zone.zone3.name}"
+  rtype           = "CNAME"
+  zone_name_or_id = oci_dns_zone.zone3.id
+}

examples/dns/global/zone.tf

@@ -17,35 +17,35 @@ resource "oci_dns_zone" "zone1" {
   zone_type      = "PRIMARY"
 }
 
-resource "oci_dns_zone" "zone3" {
-  compartment_id = var.compartment_ocid
-  name           = "${data.oci_identity_tenancy.tenancy.name}-${random_string.random_prefix.result}-tf-example3-primary.oci-dns1"
-  zone_type      = "PRIMARY"
-}
-
 resource "oci_dns_tsig_key" "test_tsig_key" {
   algorithm      = "hmac-sha1"
   compartment_id = var.compartment_ocid
-  name           = "${random_string.random_prefix.result}-test_tsig_key-name"
+  name           = "${random_string.random_prefix.result}-test-tsig-key-name"
   secret         = "c2VjcmV0"
 }
 
 resource "oci_dns_zone" "zone2" {
   compartment_id = var.compartment_ocid
-  name           = "${data.oci_identity_tenancy.tenancy.name}-${random_string.random_prefix.result}-tf-example-secondary.oci-dns2"
-  zone_type      = "SECONDARY"
+  name           = "${data.oci_identity_tenancy.tenancy.name}-${random_string.random_prefix.result}-tf-example2-primary.oci-dns2"
+  zone_type      = "PRIMARY"
 
-  external_masters {
+  external_downstreams {
     address     = "77.64.12.1"
     tsig_key_id = oci_dns_tsig_key.test_tsig_key.id
   }
 
-  external_masters {
+  external_downstreams {
     address     = "77.64.12.2"
     tsig_key_id = oci_dns_tsig_key.test_tsig_key.id
   }
 }
 
+resource "oci_dns_zone" "zone3" {
+  compartment_id = var.compartment_ocid
+  name           = "${data.oci_identity_tenancy.tenancy.name}-${random_string.random_prefix.result}-tf-example3-primary.oci-dns1"
+  zone_type      = "PRIMARY"
+}
+
 data "oci_dns_zones" "zs" {
   compartment_id = var.compartment_ocid
   name_contains  = "example"

examples/dns/private/rrset/rrset.tf

@@ -65,3 +65,10 @@ data "oci_dns_rrset" "test_rrset" {
   view_id         = oci_dns_view.test_view.id
 }
 
+data "oci_dns_rrsets" "test_rrsets" {
+  domain          = "el.${oci_dns_zone.zone3.name}"
+  rtype           = "CNAME"
+  zone_name_or_id = oci_dns_zone.zone3.id
+  scope           = "PRIVATE"
+  view_id         = oci_dns_view.test_view.id
+}

examples/dns/zone_file/provider.tf

@@ -0,0 +1,33 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+/*
+ * Provider config for dns sample
+ */
+
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "compartment_ocid" {
+}
+
+variable "region" {
+}
+
+provider "oci" {
+  region           = var.region
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+}
+

examples/dns/zone_file/zone.tf

@@ -0,0 +1,40 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+/*
+ * This file demonstrates creating a zone from a zone file using terraform.
+ */
+
+/*
+ * Step 1: Create the zone from the zone file.
+ *         Run Terraform plan/apply and wait until the zone has been created. Note the OCID of the zone.
+ * Step 2: Uncomment the oci_dns_zone below, and comment out the oci_dns_action_create_zone_from_zone_file
+           Run `terraform import oci_dns_zone.zone ZONE_OCID`, replacing ZONE_OCID with the OCID of the zone from step 1.
+ * Step 3: Run Terraform plan/apply.
+           Terraform will show that it is deleting the oci_dns_action_create_zone_from_zone_file resource, but the zone will not be deleted. The zone is now fully managed by the oci_dns_zone resource.
+ */
+
+resource "random_string" "random_prefix" {
+  length  = 4
+  number  = false
+  special = false
+}
+
+data "oci_identity_tenancy" "tenancy" {
+  tenancy_id = var.tenancy_ocid
+}
+
+locals {
+  zone_name = "${data.oci_identity_tenancy.tenancy.name}-${random_string.random_prefix.result}-tf-example-primary.oci-dns1"
+}
+
+resource "oci_dns_action_create_zone_from_zone_file" "zonefile" {
+  compartment_id = var.compartment_ocid
+  create_zone_from_zone_file_details = "$ORIGIN ${local.zone_name}.\n$TTL 3600\n${local.zone_name}.	IN	SOA	ns1.${local.zone_name}. admin.${local.zone_name}. ( 1 7200 3600 14400 3600)\n${local.zone_name}.	IN	NS	ns1.${local.zone_name}."
+}
+
+#resource "oci_dns_zone" "zone" {
+#  name = local.zone_name
+#  compartment_id = var.compartment_ocid
+#  zone_type = "PRIMARY"
+#}

examples/identity_domains/api_key.tf

@@ -46,7 +46,7 @@ resource "oci_identity_domains_api_key" "test_api_key" {
   schemas       = ["urn:ietf:params:scim:schemas:oracle:idcs:apikey"]
 
   #Optional
-  attribute_sets = []
+  attribute_sets = ["all"]
   attributes     = ""
   authorization  = var.api_key_authorization
   description    = var.api_key_description
@@ -68,6 +68,13 @@ resource "oci_identity_domains_api_key" "test_api_key" {
     #must be a user that exists
     value = oci_identity_domains_user.test_user.id
   }
+
+  lifecycle {
+    ignore_changes = [
+      // ignore fields that will never be returned
+      urnietfparamsscimschemasoracleidcsextensionself_change_user
+    ]
+  }
 }
 
 data "oci_identity_domains_api_keys" "test_api_keys" {