Merge pull request #1088 from terraform-providers/release_merge_v3.80.0

Release merge v3.80.0

Author: alexng-canuck

CHANGELOG.md

@@ -1,4 +1,21 @@
 ## 3.80.0 (Unreleased)
+
+### Added
+- Support resource discovery for `waas` resources
+- Support resource discovery for `database` resources: exadata infrastructures, vm clusters, backup destinations, databases, database backups
+- Support resource discovery for `dns` resources
+- Support addition of File Server capability to `oci_integration_integration_instance`
+- Support for MultiVM-Gen 2 Exadata Cloud at Customer
+- Support for `dbVersion` field added to Autonomous Database back resource
+- Support for patch and patch history in `database_vm_cluster`
+- Support resource discovery for `monitoring` resources
+- Support resource discovery for `identity` resources
+- Support resource discovery for `dataflow` resources
+- Added `oci_dns_rrset` resource to support DNS RRSet
+
+### Fixed
+- updated `static_routes` attribute to be empty in `oci_core_ipsec` resource
+
 ## 3.79.0 (June 03, 2020)
 
 ### Added

examples/database/exadata_cc/vm_cluster.tf

@@ -92,6 +92,9 @@ resource "oci_database_vm_cluster" "test_vm_cluster" {
   is_local_backup_enabled     = "false"
   is_sparse_diskgroup_enabled = "false"
   license_model               = "LICENSE_INCLUDED"
+  data_storage_size_in_tbs    = "84"
+  db_node_storage_size_in_gbs = "120"
+  memory_size_in_gbs          = "60"
 }
 
 data "oci_database_vm_cluster_recommended_network" "test_vm_cluster_recommended_network" {

examples/dns/rrset.tf

@@ -0,0 +1,45 @@
+resource "oci_dns_rrset" "rrset-a" {
+  zone_name_or_id = "${oci_dns_zone.zone3.name}"
+  domain          = "${oci_dns_zone.zone3.name}"
+  rtype           = "A"
+
+  items {
+    domain = "${oci_dns_zone.zone3.name}"
+    rtype  = "A"
+    rdata  = "192.168.0.3"
+    ttl    = 3600
+  }
+
+  items {
+    domain = "${oci_dns_zone.zone3.name}"
+    rtype  = "A"
+    rdata  = "192.168.0.4"
+    ttl    = 3600
+  }
+}
+
+resource "oci_dns_rrset" "rrset-aaaa" {
+  zone_name_or_id = "${oci_dns_zone.zone3.name}"
+  domain          = "${oci_dns_zone.zone3.name}"
+  rtype           = "AAAA"
+
+  items {
+    domain = "${oci_dns_zone.zone3.name}"
+    rtype  = "AAAA"
+    rdata  = "0000:0000:8a2e:0000:0000:0370:0000:0000"
+    ttl    = 3600
+  }
+}
+
+resource "oci_dns_rrset" "rrset-cname" {
+  zone_name_or_id = "${oci_dns_zone.zone3.name}"
+  domain          = "el.${oci_dns_zone.zone3.name}"
+  rtype           = "CNAME"
+
+  items {
+    domain = "el.${oci_dns_zone.zone3.name}"
+    rtype  = "CNAME"
+    rdata  = "${oci_dns_zone.zone3.name}"
+    ttl    = 86400
+  }
+}

examples/dns/zone.tf

@@ -17,6 +17,12 @@ 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}"

examples/integration/main.tf

@@ -33,8 +33,9 @@ resource "oci_integration_integration_instance" "test_integration_instance" {
     "bar-key" = "value"
   }
 
-  idcs_at = "${var.integration_instance_idcs_access_token}"
-  state   = "ACTIVE"
+  idcs_at                = "${var.integration_instance_idcs_access_token}"
+  is_file_server_enabled = true
+  state                  = "ACTIVE"
 }
 
 data "oci_integration_integration_instances" "test_integration_instances" {

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
 	github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
 	github.com/mitchellh/cli v1.0.0
-	github.com/oracle/oci-go-sdk v19.4.0+incompatible
+	github.com/oracle/oci-go-sdk v20.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

go.sum

@@ -449,6 +449,8 @@ github.com/oracle/oci-go-sdk v19.3.0+incompatible h1:gslDF/UZ5bXLh3oZoEyCPolOMS3
 github.com/oracle/oci-go-sdk v19.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v19.4.0+incompatible h1:9C9TQzYDbylb/dlDLwr9CL3EWK9EN8GvoVcYeFkjIXA=
 github.com/oracle/oci-go-sdk v19.4.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v20.0.0+incompatible h1:PdKuaDT0DKwG7YMDpwjqsogpLhXt4z7Uxdabssvaucc=
+github.com/oracle/oci-go-sdk v20.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58 h1:m3CEgv3ah1Rhy82L+c0QG/U3VyY1UsvsIdkh0/rU97Y=
 github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=

oci/core_ipsec_resource.go

@@ -216,6 +216,7 @@ func (s *CoreIpSecConnectionResourceCrud) Create() error {
 		request.FreeformTags = objectMapToStringMap(freeformTags.(map[string]interface{}))
 	}
 
+	request.StaticRoutes = []string{}
 	if staticRoutes, ok := s.D.GetOkExists("static_routes"); ok {
 		interfaces := staticRoutes.([]interface{})
 		tmp := make([]string, len(interfaces))
@@ -224,9 +225,7 @@ func (s *CoreIpSecConnectionResourceCrud) Create() error {
 				tmp[i] = interfaces[i].(string)
 			}
 		}
-		if len(tmp) != 0 || s.D.HasChange("static_routes") {
-			request.StaticRoutes = tmp
-		}
+		request.StaticRoutes = tmp
 	}
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
@@ -298,6 +297,7 @@ func (s *CoreIpSecConnectionResourceCrud) Update() error {
 	tmp := s.D.Id()
 	request.IpscId = &tmp
 
+	request.StaticRoutes = []string{}
 	if staticRoutes, ok := s.D.GetOkExists("static_routes"); ok {
 		interfaces := staticRoutes.([]interface{})
 		tmp := make([]string, len(interfaces))
@@ -306,9 +306,7 @@ func (s *CoreIpSecConnectionResourceCrud) Update() error {
 				tmp[i] = interfaces[i].(string)
 			}
 		}
-		if len(tmp) != 0 || s.D.HasChange("static_routes") {
-			request.StaticRoutes = tmp
-		}
+		request.StaticRoutes = tmp
 	}
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")

oci/database_autonomous_database_backup_test.go

@@ -5,6 +5,7 @@ package oci
 
 import (
 	"fmt"
+	"strconv"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
@@ -56,6 +57,8 @@ func TestDatabaseAutonomousDatabaseBackupResource_basic(t *testing.T) {
 	datasourceName := "data.oci_database_autonomous_database_backups.test_autonomous_database_backups"
 	singularDatasourceName := "data.oci_database_autonomous_database_backup.test_autonomous_database_backup"
 
+	var resId string
+
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() { testAccPreCheck(t) },
 		Providers: map[string]terraform.ResourceProvider{
@@ -69,6 +72,16 @@ func TestDatabaseAutonomousDatabaseBackupResource_basic(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(resourceName, "autonomous_database_id"),
 					resource.TestCheckResourceAttr(resourceName, "display_name", "Monthly Backup"),
+
+					func(s *terraform.State) (err error) {
+						resId, err = fromInstanceState(s, resourceName, "id")
+						if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
+							if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
+								return errExport
+							}
+						}
+						return err
+					},
 				),
 			},
 

oci/database_autonomous_exadata_infrastructure_resource.go

@@ -588,12 +588,13 @@ func (s *DatabaseAutonomousExadataInfrastructureResourceCrud) SetData() error {
 		s.D.Set("next_maintenance_run_id", *s.Res.NextMaintenanceRunId)
 	}
 
-	nsgIds := []interface{}{}
-	for _, item := range s.Res.NsgIds {
-		nsgIds = append(nsgIds, item)
+	if s.Res.NsgIds != nil {
+		nsgIds := []interface{}{}
+		for _, item := range s.Res.NsgIds {
+			nsgIds = append(nsgIds, item)
+		}
+		s.D.Set("nsg_ids", schema.NewSet(literalTypeHashCodeForSets, nsgIds))
 	}
-	s.D.Set("nsg_ids", schema.NewSet(literalTypeHashCodeForSets, nsgIds))
-
 	if s.Res.Shape != nil {
 		s.D.Set("shape", *s.Res.Shape)
 	}