Merge pull request #1027 from terraform-providers/release_gh

Release gh

Author: yifnfan

CHANGELOG.md

@@ -1,4 +1,9 @@
 ## 3.71.0 (Unreleased)
+
+### Added
+- Support for private customer onboarding and delayed upgrade in `oci_oce_oce_instance`
+- Support private stream pools and custom KMS key integration in streaming service
+
 ## 3.70.0 (April 08, 2020)
 
 ### Added

examples/oce/main.tf

@@ -32,10 +32,12 @@ resource "oci_oce_oce_instance" "test_oce_instance" {
   tenancy_name             = "${var.tenancy_name}"
 
   #optional
-  freeform_tags       = "${map("freeformkey", "freeformvalue")}"
-  description         = "description"
-  instance_usage_type = "NONPRIMARY"
-  waf_primary_domain  = "oracle.com"
+  freeform_tags        = "${map("freeformkey", "freeformvalue")}"
+  description          = "description"
+  instance_access_type = "PUBLIC"
+  instance_usage_type  = "NONPRIMARY"
+  upgrade_schedule     = "UPGRADE_IMMEDIATELY"
+  waf_primary_domain   = "oracle.com"
 }
 
 data "oci_oce_oce_instances" "test_oce_instances" {

examples/streaming/main.tf

@@ -15,6 +15,7 @@ provider "oci" {
   region           = "${var.region}"
 }
 
+/*
 resource "oci_streaming_stream" "stream" {
   compartment_id     = "${var.compartment_ocid}"
   name               = "stream1"
@@ -63,13 +64,34 @@ resource "oci_streaming_connect_harness" "test_connect_harness" {
 data "oci_streaming_connect_harness" "test_connect_harness" {
   connect_harness_id = "${oci_streaming_connect_harness.test_connect_harness.id}"
 }
+*/
 
 resource "oci_streaming_stream_pool" "test_stream_pool" {
   #Required
   compartment_id = "${var.compartment_ocid}"
   name           = "TFStreamPool"
+
+  private_endpoint_settings {
+    nsg_ids             = ["${oci_core_network_security_group.test_nsg.id}"]
+    private_endpoint_ip = "10.0.0.5"
+    subnet_id           = "${oci_core_subnet.test_subnet.id}"
+  }
+}
+
+resource "oci_core_vcn" "test_vcn" {
+  cidr_block     = "10.0.0.0/16"
+  compartment_id = "${var.compartment_ocid}"
+  display_name   = "testvcn"
+  dns_label      = "dnslabel"
 }
 
-data "oci_streaming_stream_pool" "test_stream_pool" {
-  stream_pool_id = "${oci_streaming_stream_pool.test_stream_pool.id}"
+resource "oci_core_subnet" "test_subnet" {
+  cidr_block     = "10.0.0.0/24"
+  compartment_id = "${var.compartment_ocid}"
+  vcn_id         = "${oci_core_vcn.test_vcn.id}"
+}
+
+resource "oci_core_network_security_group" "test_nsg" {
+  compartment_id = "${var.compartment_ocid}"
+  vcn_id         = "${oci_core_vcn.test_vcn.id}"
 }

go.mod

@@ -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 v17.3.0+incompatible
+	github.com/oracle/oci-go-sdk v17.4.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

@@ -436,6 +436,8 @@ github.com/oracle/oci-go-sdk v17.2.0+incompatible h1:e/oLH8Cf+uvJsRozNocwNJ5zNok
 github.com/oracle/oci-go-sdk v17.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v17.3.0+incompatible h1:a9PyjUO0hU/FvwUqOcFMfWS3iz35ojJcqwxWZPewGdg=
 github.com/oracle/oci-go-sdk v17.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v17.4.0+incompatible h1:W9yFhlwQ9+p0mE2oPrS++v821eIT17gTUpJXkmGZb9o=
+github.com/oracle/oci-go-sdk v17.4.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/audit_events_data_source.go

@@ -4,6 +4,7 @@ package oci
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
@@ -416,6 +417,10 @@ func (s *AuditAuditEventsDataSourceCrud) SetData() error {
 func dataToMap(obj *oci_audit.Data) map[string]interface{} {
 	result := map[string]interface{}{}
 
+	for keys := range obj.AdditionalDetails {
+		obj.AdditionalDetails[keys] = fmt.Sprintf("%v", obj.AdditionalDetails[keys])
+	}
+
 	result["additional_details"] = obj.AdditionalDetails
 
 	if obj.AvailabilityDomain != nil {

oci/bds_bds_instance_resource.go

@@ -102,7 +102,7 @@ func BdsBdsInstanceResource() *schema.Resource {
 						"number_of_nodes": {
 							Type:         schema.TypeInt,
 							Required:     true,
-							ValidateFunc: validation.IntBetween(1, 1),
+							ValidateFunc: validation.IntBetween(1, 2),
 						},
 					},
 				},
@@ -138,7 +138,7 @@ func BdsBdsInstanceResource() *schema.Resource {
 						"number_of_nodes": {
 							Type:         schema.TypeInt,
 							Required:     true,
-							ValidateFunc: validation.IntBetween(1, 1),
+							ValidateFunc: validation.IntBetween(1, 2),
 						},
 					},
 				},

oci/export_compartment_test.go

@@ -332,6 +332,9 @@ func deleteTestChild(d *schema.ResourceData, m interface{}) error {
 func initResourceDiscoveryTests() {
 	resourceNameCount = map[string]int{}
 
+	resourcesMap = ResourcesMap()
+	datasourcesMap = DataSourcesMap()
+
 	resourcesMap["oci_test_parent"] = testParentResource()
 	resourcesMap["oci_test_child"] = testChildResource()
 	datasourcesMap["oci_test_parents"] = testParentsDatasource()
@@ -343,6 +346,13 @@ func initResourceDiscoveryTests() {
 	initTestResources()
 }
 
+func cleanupResourceDiscoveryTests() {
+	delete(resourcesMap, "oci_test_parent")
+	delete(resourcesMap, "oci_test_child")
+	delete(datasourcesMap, "oci_test_parents")
+	delete(datasourcesMap, "oci_test_children")
+}
+
 func initTestResources() {
 	numParentResources := 4
 	if parentResources == nil || len(parentResources) != numParentResources {
@@ -445,6 +455,7 @@ func generateTestResourceFromSchema(id int, resourceSchemaMap map[string]*schema
 // Basic test to ensure that RunExportCommand generates TF artifacts
 func TestUnitRunExportCommand_basic(t *testing.T) {
 	initResourceDiscoveryTests()
+	defer cleanupResourceDiscoveryTests()
 	compartmentId := resourceDiscoveryTestCompartmentOcid
 	outputDir, err := os.Getwd()
 	outputDir = fmt.Sprintf("%s%sdiscoveryTest-%d", outputDir, string(os.PathSeparator), time.Now().Nanosecond())
@@ -484,6 +495,7 @@ func TestUnitRunExportCommand_basic(t *testing.T) {
 
 func TestUnitRunExportCommand_error(t *testing.T) {
 	initResourceDiscoveryTests()
+	defer cleanupResourceDiscoveryTests()
 	compartmentId := resourceDiscoveryTestCompartmentOcid
 	outputDir, err := os.Getwd()
 	outputDir = fmt.Sprintf("%s%sdiscoveryTest-%d", outputDir, string(os.PathSeparator), time.Now().Nanosecond())
@@ -510,6 +522,7 @@ func TestUnitRunExportCommand_error(t *testing.T) {
 // Test that resources can be found using a resource dependency graph
 func TestUnitFindResources_basic(t *testing.T) {
 	initResourceDiscoveryTests()
+	defer cleanupResourceDiscoveryTests()
 	rootResource := getRootCompartmentResource()
 
 	results, err := findResources(nil, rootResource, compartmentTestingResourceGraph, nil)
@@ -542,6 +555,7 @@ func TestUnitFindResources_basic(t *testing.T) {
 // Test that only targeted ocid resources are exportable
 func TestUnitFindResources_restrictedOcids(t *testing.T) {
 	initResourceDiscoveryTests()
+	defer cleanupResourceDiscoveryTests()
 	rootResource := getRootCompartmentResource()
 
 	// Parent resources are defined as alwaysExportable. So even if it's not specified in the ocids, it should be exported.
@@ -593,6 +607,7 @@ func TestUnitFindResources_restrictedOcids(t *testing.T) {
 // Test that overriden find function is invoked if a resource has one
 func TestUnitFindResources_overrideFn(t *testing.T) {
 	initResourceDiscoveryTests()
+	defer cleanupResourceDiscoveryTests()
 	rootResource := getRootCompartmentResource()
 
 	// Create an override function that returns nothing when discovering child test resources
@@ -624,6 +639,7 @@ func TestUnitFindResources_overrideFn(t *testing.T) {
 // Test that process resource function is invoked if a resource has one
 func TestUnitFindResources_processResourceFn(t *testing.T) {
 	initResourceDiscoveryTests()
+	defer cleanupResourceDiscoveryTests()
 	rootResource := getRootCompartmentResource()
 
 	// Create a processing function that adds a new attribute to every discovered child resource
@@ -717,6 +733,7 @@ func TestUnitGenerateTerraformNameFromResource_basic(t *testing.T) {
 // Test that correct HCL is generated from a discovered test resource
 func TestUnitGetHCLString_basic(t *testing.T) {
 	initResourceDiscoveryTests()
+	defer cleanupResourceDiscoveryTests()
 	rootResource := getRootCompartmentResource()
 
 	results, err := findResources(nil, rootResource, compartmentTestingResourceGraph, nil)
@@ -792,6 +809,7 @@ parent_id = "ocid1.parent.abcdefghiklmnop.3"
 // Test that HCL can be generated when optional or required fields are missing
 func TestUnitGetHCLString_missingFields(t *testing.T) {
 	initResourceDiscoveryTests()
+	defer cleanupResourceDiscoveryTests()
 	rootResource := getRootCompartmentResource()
 
 	results, err := findResources(nil, rootResource, compartmentTestingResourceGraph, nil)
@@ -833,6 +851,7 @@ func TestUnitGetHCLString_missingFields(t *testing.T) {
 // Test that HCL can be generated with values replaced by interpolation syntax
 func TestUnitGetHCLString_interpolationMap(t *testing.T) {
 	initResourceDiscoveryTests()
+	defer cleanupResourceDiscoveryTests()
 	rootResource := getRootCompartmentResource()
 
 	results, err := findResources(nil, rootResource, compartmentTestingResourceGraph, nil)

oci/export_resource_helpers.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	oci_core "github.com/oracle/oci-go-sdk/core"
+	oci_identity "github.com/oracle/oci-go-sdk/identity"
 	oci_load_balancer "github.com/oracle/oci-go-sdk/loadbalancer"
 )
 
@@ -90,7 +91,7 @@ func init() {
 	exportIdentityAvailabilityDomainHints.processDiscoveredResourcesFn = processAvailabilityDomains
 	exportIdentityAvailabilityDomainHints.getHCLStringOverrideFn = getAvailabilityDomainHCLDatasource
 	exportIdentityAuthenticationPolicyHints.processDiscoveredResourcesFn = processIdentityAuthenticationPolicies
-	exportIdentityTagHints.processDiscoveredResourcesFn = processTagDefinitions
+	exportIdentityTagHints.findResourcesOverrideFn = findIdentityTags
 
 	exportObjectStorageBucketHints.getIdFn = getObjectStorageBucketId
 	exportObjectStorageBucketHints.requireResourceRefresh = true
@@ -635,6 +636,66 @@ func getObjectStorageBucketId(resource *OCIResource) (string, error) {
 	return getBucketCompositeId(name, namespace), nil
 }
 
+func findIdentityTags(clients *OracleClients, tfMeta *TerraformResourceAssociation, parent *OCIResource) ([]*OCIResource, error) {
+	// List on Tags does not return validator, and resource Read requires tagNamespaceId
+	// which is also not returned in Summary response. Tags also do not have composite id in state.
+	// Getting tags using ListTagsRequest and the calling tagResource.Read
+	tagNamespaceId := parent.id
+	request := oci_identity.ListTagsRequest{}
+
+	request.TagNamespaceId = &tagNamespaceId
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(true, "identity")
+	results := []*OCIResource{}
+
+	response, err := clients.identityClient.ListTags(context.Background(), request)
+	if err != nil {
+		return results, err
+	}
+
+	request.Page = response.OpcNextPage
+
+	for request.Page != nil {
+		listResponse, err := clients.identityClient.ListTags(context.Background(), request)
+		if err != nil {
+			return results, err
+		}
+
+		response.Items = append(response.Items, listResponse.Items...)
+		request.Page = listResponse.OpcNextPage
+	}
+
+	for _, tag := range response.Items {
+		tagResource := resourcesMap[tfMeta.resourceClass]
+
+		d := tagResource.TestResourceData()
+		d.Set("tag_namespace_id", parent.id)
+		d.Set("name", tag.Name)
+
+		if err := tagResource.Read(d, clients); err != nil {
+			return results, err
+		}
+
+		resource := &OCIResource{
+			compartmentId:    parent.compartmentId,
+			sourceAttributes: convertResourceDataToMap(tagResource.Schema, d),
+			rawResource:      tag,
+			TerraformResource: TerraformResource{
+				id:             d.Id(),
+				terraformClass: tfMeta.resourceClass,
+				terraformName:  fmt.Sprintf("%s_%s", parent.parent.terraformName, *tag.Name),
+			},
+			getHclStringFn: getHclStringFromGenericMap,
+			parent:         parent,
+		}
+
+		results = append(results, resource)
+	}
+
+	return results, nil
+
+}
+
 func findLoadBalancerListeners(clients *OracleClients, tfMeta *TerraformResourceAssociation, parent *OCIResource) ([]*OCIResource, error) {
 	loadBalancerId := parent.sourceAttributes["load_balancer_id"].(string)
 	backendSetName := parent.sourceAttributes["name"].(string)
@@ -690,14 +751,6 @@ func findLoadBalancerListeners(clients *OracleClients, tfMeta *TerraformResource
 	return results, nil
 }
 
-func processTagDefinitions(clients *OracleClients, resources []*OCIResource) ([]*OCIResource, error) {
-	for _, resource := range resources {
-		resource.sourceAttributes["tag_namespace_id"] = resource.parent.id
-		resource.importId = fmt.Sprintf("tagNamespaces/%s/tags/%s", resource.parent.id, resource.sourceAttributes["name"].(string))
-	}
-	return resources, nil
-}
-
 func processNetworkSecurityGroupRules(clients *OracleClients, resources []*OCIResource) ([]*OCIResource, error) {
 	for _, resource := range resources {
 		resource.sourceAttributes["network_security_group_id"] = resource.parent.id