Candidate for release_v3.84.0

Candidate for release_v3.84.0

Author: afedorch

CHANGELOG.md

@@ -1,4 +1,11 @@
 ## 3.84.0 (Unreleased)
+
+### Added
+- Support `name` field to Identity Provider Group Summary response
+- Support for ADB-S: Private Endpoint
+- Support for `register` and `reregister` to `datasafe` in `Autonomous database - Dedicated` resources
+- Support for `network_endpoint_details` in `oci_analytics_analytics_instance` resource
+
 ## 3.83.1 (July 03, 2020)
 
 ### Fixed

examples/analytics/main.tf

@@ -22,7 +22,7 @@ provider "oci" {
   private_key_path = "${var.private_key_path}"
 }
 
-resource "oci_analytics_analytics_instance" "test_oce_instance" {
+resource "oci_analytics_analytics_instance" "test_oce_instance_public" {
   compartment_id     = "${var.compartment_ocid}"
   description        = "OAC instance"
   email_notification = "${var.email_notification}"
@@ -34,16 +34,59 @@ resource "oci_analytics_analytics_instance" "test_oce_instance" {
     capacity_value = 2
   }
 
-  name              = "testoacinstance"
+  name              = "testoacinstance1"
   freeform_tags     = "${map("freeformkey", "freeformvalue")}"
   state             = "ACTIVE"
   idcs_access_token = "${var.idcs_access_token}"
+
+  # Optional
+  network_endpoint_details {
+    #Required
+    network_endpoint_type = "PUBLIC"
+
+    #Optional
+    whitelisted_ips = ["${oci_core_vcn.test_vcn.cidr_block}"]
+
+    whitelisted_vcns = [{
+      #Optional
+      id              = "${oci_core_vcn.test_vcn.id}"
+      whitelisted_ips = ["${oci_core_vcn.test_vcn.cidr_block}"]
+    }]
+  }
+}
+
+resource "oci_analytics_analytics_instance" "test_oce_instance_private" {
+  compartment_id     = "${var.compartment_ocid}"
+  description        = "OAC instance"
+  email_notification = "${var.email_notification}"
+  feature_set        = "ENTERPRISE_ANALYTICS"
+  license_type       = "LICENSE_INCLUDED"
+
+  capacity {
+    capacity_type  = "OLPU_COUNT"
+    capacity_value = 2
+  }
+
+  name              = "testoacinstance2"
+  freeform_tags     = "${map("freeformkey", "freeformvalue")}"
+  state             = "ACTIVE"
+  idcs_access_token = "${var.idcs_access_token}"
+
+  # Optional
+  network_endpoint_details {
+    #Required
+    network_endpoint_type = "PRIVATE"
+
+    #Optional
+    subnet_id = "${oci_core_subnet.test_subnet.id}"
+    vcn_id    = "${oci_core_vcn.test_vcn.id}"
+  }
 }
 
 data "oci_analytics_analytics_instances" "test_instance" {
   compartment_id = "${var.compartment_ocid}"
 }
 
 output "test" {
-  value = "${data.oci_analytics_analytics_instances.test_instance.analytics_instances.*.id}"
+  value = "${data.oci_analytics_analytics_instances.test_instance.id}"
 }

examples/analytics/subnet.tf

@@ -0,0 +1,20 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+resource "oci_core_vcn" "test_vcn" {
+  cidr_block     = "10.0.0.0/16"
+  compartment_id = "${var.compartment_ocid}"
+  display_name   = "exampleVCN"
+  dns_label      = "tfexamplevcn"
+}
+
+resource "oci_core_subnet" "test_subnet" {
+  cidr_block        = "10.0.1.0/24"
+  display_name      = "regionalSubnet"
+  dns_label         = "regionalsubnet"
+  compartment_id    = "${var.compartment_ocid}"
+  vcn_id            = "${oci_core_vcn.test_vcn.id}"
+  security_list_ids = ["${oci_core_vcn.test_vcn.default_security_list_id}"]
+  route_table_id    = "${oci_core_vcn.test_vcn.default_route_table_id}"
+  dhcp_options_id   = "${oci_core_vcn.test_vcn.default_dhcp_options_id}"
+}

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 v21.1.0+incompatible
+	github.com/oracle/oci-go-sdk v21.2.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

@@ -457,6 +457,8 @@ github.com/oracle/oci-go-sdk v21.0.0+incompatible h1:NMVM7JHdbH2crOOOiN3iEdmMJ6Z
 github.com/oracle/oci-go-sdk v21.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v21.1.0+incompatible h1:VFYs6hcxQ8plUGWbIcZAGbDhQttMwH+CWSvRZjJGXNo=
 github.com/oracle/oci-go-sdk v21.1.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v21.2.0+incompatible h1:iaZTdpIQjd73yYCju+s+3dgG49ZCxtj2O25eqDfrgsE=
+github.com/oracle/oci-go-sdk v21.2.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=

main.go

@@ -23,6 +23,7 @@ func main() {
 	var compartmentName = flag.String("compartment_name", "", "[export] The name of a compartment to export.")
 	var outputPath = flag.String("output_path", "", "[export] Path to output generated configurations and state files of the exported compartment")
 	var services = flag.String("services", "", "[export] Comma-separated list of service resources to export. By default, all compartment-scope resources are exported.")
+	var excludeServices = flag.String("exclude_services", "", "[export] [experimental] Comma-separated list of service resources to exclude from export. If a service is present in both 'services' and 'exclude_services' argument, it will be excluded.")
 	var ids = flag.String("ids", "", "[export] Comma-separated list of resource IDs to export. The ID could either be an OCID or a Terraform import ID. By default, all resources are exported.")
 	var generateStateFile = flag.Bool("generate_state", false, "[export][experimental] Set this to import the discovered resources into a state file along with the Terraform configuration")
 	var help = flag.Bool("help", false, "Prints usage options")
@@ -70,6 +71,10 @@ func main() {
 				args.Services = strings.Split(*services, ",")
 			}
 
+			if excludeServices != nil && *excludeServices != "" {
+				args.ExcludeServices = strings.Split(*excludeServices, ",")
+			}
+
 			if ids != nil && *ids != "" {
 				args.IDs = strings.Split(*ids, ",")
 			}

oci/analytics_analytics_instance_data_source.go

@@ -99,6 +99,16 @@ func (s *AnalyticsAnalyticsInstanceDataSourceCrud) SetData() error {
 		s.D.Set("name", *s.Res.Name)
 	}
 
+	if s.Res.NetworkEndpointDetails != nil {
+		networkEndpointDetailsArray := []interface{}{}
+		if networkEndpointDetailsMap := NetworkEndpointDetailsToMap(&s.Res.NetworkEndpointDetails); networkEndpointDetailsMap != nil {
+			networkEndpointDetailsArray = append(networkEndpointDetailsArray, networkEndpointDetailsMap)
+		}
+		s.D.Set("network_endpoint_details", networkEndpointDetailsArray)
+	} else {
+		s.D.Set("network_endpoint_details", nil)
+	}
+
 	if s.Res.ServiceUrl != nil {
 		s.D.Set("service_url", *s.Res.ServiceUrl)
 	}