Release merge v3.54.0

Release merge v3.54.0

Author: dshelbyo

CHANGELOG.md

@@ -1,4 +1,13 @@
-## 3.53.1 (Unreleased)
+## 3.54.0 (Unreleased)
+
+### Added
+- Support for Autonomous Database maintenance window
+- Support for `oci_database_autonomous_exadata_infrastructure_ocpu` datasource to get details of the OCPUs for the specified Autonomous Exadata Infrastructure instance
+
+### Fixed
+- Fixes an issue in resource discovery when duplicates of the same service are specified to the `-services` argument
+- Support and validation for the `ike_version`, `routing` attributes in `oci_core_ipsec_connection_tunnel_management` resource
+
 ## 3.53.0 (November 20, 2019)
 
 ### Added

examples/compute/cluster_network/cluster_network.tf

@@ -27,15 +27,15 @@ resource "oci_core_vcn" "test_vcn" {
 }
 
 resource "oci_core_route_table" "test_route_table" {
-  compartment_id = "${var.compartment_id}"
+  compartment_id = "${var.compartment_ocid}"
   vcn_id         = "${oci_core_vcn.test_vcn.id}"
   display_name   = "TestRouteTable"
 }
 
 resource "oci_core_subnet" "test_subnet" {
   availability_domain = "${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}"
   cidr_block          = "10.0.2.0/24"
-  compartment_id      = "${var.compartment_id}"
+  compartment_id      = "${var.compartment_ocid}"
   dhcp_options_id     = "${oci_core_vcn.test_vcn.default_dhcp_options_id}"
   display_name        = "TestSubnet"
   dns_label           = "dnslabel"
@@ -59,7 +59,7 @@ variable "InstanceImageOCID" {
 }
 
 resource "oci_core_network_security_group" "test_network_security_group1" {
-  compartment_id = "${var.compartment_id}"
+  compartment_id = "${var.compartment_ocid}"
   vcn_id         = "${oci_core_vcn.test_vcn.id}"
 }
 
@@ -72,7 +72,7 @@ resource "oci_core_instance_configuration" "test_instance_configuration" {
 
     launch_details {
       availability_domain = "${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}"
-      compartment_id      = "${var.compartment_id}"
+      compartment_id      = "${var.compartment_ocid}"
 
       create_vnic_details {
         assign_public_ip       = "false"
@@ -112,7 +112,7 @@ resource "oci_core_instance_configuration" "test_instance_configuration" {
 }
 
 resource "oci_core_cluster_network" "test_cluster_network" {
-  compartment_id = "${var.compartment_id}"
+  compartment_id = "${var.compartment_ocid}"
   display_name   = "hpc-cluster-network"
 
   instance_pools {

examples/compute/image/image.tf

@@ -15,7 +15,6 @@ variable "private_key_path" {}
 variable "region" {}
 variable "compartment_ocid" {}
 variable "ssh_public_key" {}
-variable "shape" {}
 
 variable "instance_image_ocid" {
   type = "map"
@@ -72,7 +71,7 @@ resource "oci_core_image" "custom_image" {
 resource "oci_core_shape_management" "compatible_shape" {
   compartment_id = "${var.compartment_ocid}"
   image_id       = "${oci_core_image.custom_image.id}"
-  shape_name     = "${var.shape}"
+  shape_name     = "VM.Standard2.1"
 }
 
 resource "oci_core_vcn" "test_vcn" {

examples/database/atp-d/main.tf

@@ -70,6 +70,15 @@ data "oci_database_autonomous_databases" "autonomous_databases" {
   db_workload                      = "OLTP"
 }
 
+data "oci_database_autonomous_exadata_infrastructure_ocpu" "test_autonomous_exadata_infrastructure_ocpu" {
+  #Required
+  autonomous_exadata_infrastructure_id = "${oci_database_autonomous_exadata_infrastructure.test_autonomous_exadata_infrastructure.id}"
+}
+
+output "autonomous_database_consumed_cpu" {
+  value = "${data.oci_database_autonomous_exadata_infrastructure_ocpu.test_autonomous_exadata_infrastructure_ocpu.consumed_cpu}"
+}
+
 output "autonomous_database_admin_password" {
   value = "${random_string.autonomous_database_admin_password.result}"
 }

examples/database/db_systems/variables.tf

@@ -45,7 +45,7 @@ variable "db_version" {
 }
 
 variable "db_home_display_name" {
-  default = "MyTFDBHome"
+  default = "MyTFDBHome1"
 }
 
 variable "db_disk_redundancy" {

examples/database/exadata_cc/activation.zip

@@ -1,11 +1,6 @@
 // Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 
-data "oci_core_app_catalog_listings" "test_app_catalog_listings" {
-  filter {
-    name   = "publisher_name"
-    values = ["Oracle CCE Image Management Pipeline"]
-  }
-}
+data "oci_core_app_catalog_listings" "test_app_catalog_listings" {}
 
 data "oci_core_app_catalog_listing_resource_versions" "test_app_catalog_listing_resource_versions" {
   #Required

examples/pic/agreement/app_catalog_listing_resource_version_agreement.tf

@@ -1,11 +1,6 @@
 // Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 
-data "oci_core_app_catalog_listings" "test_app_catalog_listings" {
-  filter {
-    name   = "publisher_name"
-    values = ["Oracle CCE Image Management Pipeline"]
-  }
-}
+data "oci_core_app_catalog_listings" "test_app_catalog_listings" {}
 
 data "oci_core_app_catalog_listing_resource_versions" "test_app_catalog_listing_resource_versions" {
   #Required

examples/pic/resource_version/app_catalog_listing_resource_version.tf

@@ -396,11 +396,11 @@ data "oci_waas_custom_protection_rules" "test_custom_protection_rules" {
 resource "oci_waas_http_redirect" "test_http_redirect" {
   #Required
   compartment_id = "${var.compartment_ocid}"
-  domain         = "example.net"
+  domain         = "example.com"
 
   target {
     #Required
-    host     = "example.com"
+    host     = "example.net"
     path     = "/test{path}"
     protocol = "HTTP"
     query    = "{query}"

examples/waas/waas_full.tf

@@ -6,7 +6,7 @@ require (
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
 	github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
 	github.com/mitchellh/cli v1.0.0
-	github.com/oracle/oci-go-sdk v12.5.0+incompatible
+	github.com/oracle/oci-go-sdk v13.0.0+incompatible
 	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.3.0
 	gopkg.in/yaml.v2 v2.2.2