Merge pull request #1015 from terraform-providers/release_merge_v3.70.0

Candidate for release_v3.70.0

Author: ksmulpuri

CHANGELOG.md

@@ -1,4 +1,11 @@
 ## 3.70.0 (Unreleased)
+
+### Added
+- Support for non-default profiles for credentials
+- Support for limits and usage data source in KMS
+- Support for Allowing resources to be moved between compartments in dataflow application
+- Support for `InstancePrincipal` and `InstancePrincipalWithCerts` auth mode in Resource discovery
+
 ## 3.69.0 (April 01, 2020)
 
 ### Added
@@ -23,9 +30,6 @@
 - Support for VM 20c Preview in DBAAS
 - Support for console connection for db nodes in BM and VM db systems
 
-### Fixed
-- Fixed load balancer listener to write default hostnames in state [Github issue #975](https://github.com/terraform-providers/terraform-provider-oci/issues/975)
-
 ## 3.66.0 (March 11, 2020)
 
 ### Added

examples/api_gateway/main.tf

@@ -266,8 +266,6 @@ data "oci_functions_applications" "test_applications" {
   state        = "${var.application_state}"
 }
 
-# Terraform will take 40 minutes after destroying a function due to a known service issue.
-# please refer: https://docs.cloud.oracle.com/iaas/Content/Functions/Tasks/functionsdeleting.htm
 resource "oci_functions_function" "test_function" {
   #Required
   application_id = "${oci_functions_application.test_application.id}"

examples/functions/main.tf

@@ -69,8 +69,6 @@ data "oci_functions_applications" "test_applications" {
   state        = "${var.application_state}"
 }
 
-# Terraform will take 40 minutes after destroying a function due to a known service issue.
-# please refer: https://docs.cloud.oracle.com/iaas/Content/Functions/Tasks/functionsdeleting.htm
 resource "oci_functions_function" "test_function" {
   #Required
   application_id = "${oci_functions_application.test_application.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.2.0+incompatible
+	github.com/oracle/oci-go-sdk v17.3.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

@@ -35,6 +35,7 @@ func CoreVolumeAttachmentResource() *schema.Resource {
 				ForceNew:         true,
 				DiffSuppressFunc: EqualIgnoreCaseSuppressDiff,
 				ValidateFunc: validation.StringInSlice([]string{
+					"emulated",
 					"iscsi",
 					"paravirtualized",
 				}, true),
@@ -242,6 +243,50 @@ func (s *CoreVolumeAttachmentResourceCrud) Delete() error {
 
 func (s *CoreVolumeAttachmentResourceCrud) SetData() error {
 	switch v := (*s.Res).(type) {
+	case oci_core.EmulatedVolumeAttachment:
+		s.D.Set("attachment_type", "emulated")
+
+		if v.AvailabilityDomain != nil {
+			s.D.Set("availability_domain", *v.AvailabilityDomain)
+		}
+
+		if v.CompartmentId != nil {
+			s.D.Set("compartment_id", *v.CompartmentId)
+		}
+
+		if v.Device != nil {
+			s.D.Set("device", *v.Device)
+		}
+
+		if v.DisplayName != nil {
+			s.D.Set("display_name", *v.DisplayName)
+		}
+
+		if v.Id != nil {
+			s.D.Set("id", *v.Id)
+		}
+
+		if v.InstanceId != nil {
+			s.D.Set("instance_id", *v.InstanceId)
+		}
+
+		if v.IsPvEncryptionInTransitEnabled != nil {
+			s.D.Set("is_pv_encryption_in_transit_enabled", *v.IsPvEncryptionInTransitEnabled)
+		}
+
+		if v.IsReadOnly != nil {
+			s.D.Set("is_read_only", *v.IsReadOnly)
+		}
+
+		s.D.Set("state", v.LifecycleState)
+
+		if v.TimeCreated != nil {
+			s.D.Set("time_created", v.TimeCreated.String())
+		}
+
+		if v.VolumeId != nil {
+			s.D.Set("volume_id", *v.VolumeId)
+		}
 	case oci_core.IScsiVolumeAttachment:
 		s.D.Set("attachment_type", "iscsi")
 
@@ -367,6 +412,33 @@ func (s *CoreVolumeAttachmentResourceCrud) populateTopLevelPolymorphicAttachVolu
 		attachmentType = "" // default value
 	}
 	switch strings.ToLower(attachmentType) {
+	case strings.ToLower("emulated"):
+		details := oci_core.AttachEmulatedVolumeDetails{}
+		if device, ok := s.D.GetOkExists("device"); ok {
+			tmp := device.(string)
+			details.Device = &tmp
+		}
+		if displayName, ok := s.D.GetOkExists("display_name"); ok {
+			tmp := displayName.(string)
+			details.DisplayName = &tmp
+		}
+		if instanceId, ok := s.D.GetOkExists("instance_id"); ok {
+			tmp := instanceId.(string)
+			details.InstanceId = &tmp
+		}
+		if isReadOnly, ok := s.D.GetOkExists("is_read_only"); ok {
+			tmp := isReadOnly.(bool)
+			details.IsReadOnly = &tmp
+		}
+		if isShareable, ok := s.D.GetOkExists("is_shareable"); ok {
+			tmp := isShareable.(bool)
+			details.IsShareable = &tmp
+		}
+		if volumeId, ok := s.D.GetOkExists("volume_id"); ok {
+			tmp := volumeId.(string)
+			details.VolumeId = &tmp
+		}
+		request.AttachVolumeDetails = details
 	case strings.ToLower("iscsi"):
 		details := oci_core.AttachIScsiVolumeDetails{}
 		if useChap, ok := s.D.GetOkExists("use_chap"); ok {

oci/core_volume_attachment_resource.go

@@ -119,6 +119,50 @@ func (s *CoreVolumeAttachmentsDataSourceCrud) SetData() error {
 	for _, r := range s.Res.Items {
 		result := map[string]interface{}{}
 		switch v := (r).(type) {
+		case oci_core.EmulatedVolumeAttachment:
+			result["attachment_type"] = "emulated"
+
+			if v.AvailabilityDomain != nil {
+				result["availability_domain"] = string(*v.AvailabilityDomain)
+			}
+
+			if v.CompartmentId != nil {
+				result["compartment_id"] = string(*v.CompartmentId)
+			}
+
+			if v.Device != nil {
+				result["device"] = string(*v.Device)
+			}
+
+			if v.DisplayName != nil {
+				result["display_name"] = string(*v.DisplayName)
+			}
+
+			if v.Id != nil {
+				result["id"] = string(*v.Id)
+			}
+
+			if v.InstanceId != nil {
+				result["instance_id"] = string(*v.InstanceId)
+			}
+
+			if v.IsPvEncryptionInTransitEnabled != nil {
+				result["is_pv_encryption_in_transit_enabled"] = bool(*v.IsPvEncryptionInTransitEnabled)
+			}
+
+			if v.IsReadOnly != nil {
+				result["is_read_only"] = bool(*v.IsReadOnly)
+			}
+
+			result["state"] = string(v.LifecycleState)
+
+			if v.TimeCreated != nil {
+				result["time_created"] = v.TimeCreated.String()
+			}
+
+			if v.VolumeId != nil {
+				result["volume_id"] = string(*v.VolumeId)
+			}
 		case oci_core.IScsiVolumeAttachment:
 			result["attachment_type"] = "iscsi"
 

oci/core_volume_attachments_data_source.go

@@ -812,9 +812,26 @@ func elaspedInMillisecond(start time.Time) int64 {
 	return time.Since(start).Nanoseconds() / int64(time.Millisecond)
 }
 
-func WaitForWorkRequestWithErrorHandling(workRequestClient *oci_work_requests.WorkRequestClient, workRequestId *string, entityType string, action oci_work_requests.WorkRequestResourceActionTypeEnum,
+func WaitForWorkRequestWithErrorHandling(workRequestClient *oci_work_requests.WorkRequestClient, workRequestIds *string, entityType string, action oci_work_requests.WorkRequestResourceActionTypeEnum,
 	timeout time.Duration, disableFoundRetries bool) (*string, error) {
-	return WaitForWorkRequest(workRequestClient, workRequestId, entityType, action, timeout, disableFoundRetries, true)
+	var identifier *string
+	workRequestIdsSet := map[string]bool{}
+
+	for _, wId := range strings.Split(strings.TrimSpace(*workRequestIds), ",") {
+		if wId != "" {
+			workRequestIdsSet[strings.TrimSpace(wId)] = true
+		}
+	}
+
+	for wId := range workRequestIdsSet {
+		id, err := WaitForWorkRequest(workRequestClient, &wId, entityType, action, timeout, disableFoundRetries, true)
+		if err != nil {
+			return nil, err
+		}
+		identifier = id
+	}
+	return identifier, nil
+
 }
 
 func WaitForWorkRequest(workRequestClient *oci_work_requests.WorkRequestClient, workRequestId *string, entityType string, action oci_work_requests.WorkRequestResourceActionTypeEnum,

oci/crud_helpers.go

@@ -30,7 +30,6 @@ func DataflowApplicationResource() *schema.Resource {
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			"display_name": {
 				Type:     schema.TypeString,
@@ -357,6 +356,15 @@ func (s *DataflowApplicationResourceCrud) Get() error {
 }
 
 func (s *DataflowApplicationResourceCrud) Update() error {
+	if compartment, ok := s.D.GetOkExists("compartment_id"); ok && s.D.HasChange("compartment_id") {
+		oldRaw, newRaw := s.D.GetChange("compartment_id")
+		if newRaw != "" && oldRaw != "" {
+			err := s.updateCompartment(compartment)
+			if err != nil {
+				return err
+			}
+		}
+	}
 	request := oci_dataflow.UpdateApplicationRequest{}
 
 	tmp := s.D.Id()
@@ -598,3 +606,21 @@ func ApplicationParameterToMap(obj oci_dataflow.ApplicationParameter) map[string
 
 	return result
 }
+
+func (s *DataflowApplicationResourceCrud) updateCompartment(compartment interface{}) error {
+	changeCompartmentRequest := oci_dataflow.ChangeApplicationCompartmentRequest{}
+
+	idTmp := s.D.Id()
+	changeCompartmentRequest.ApplicationId = &idTmp
+
+	compartmentTmp := compartment.(string)
+	changeCompartmentRequest.CompartmentId = &compartmentTmp
+
+	changeCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "dataflow")
+
+	_, err := s.Client.ChangeApplicationCompartment(context.Background(), changeCompartmentRequest)
+	if err != nil {
+		return err
+	}
+	return nil
+}

oci/dataflow_application_resource.go

@@ -74,6 +74,8 @@ func TestDataflowApplicationResource_basic(t *testing.T) {
 	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
 	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
 
+	compartmentIdU := getEnvSettingWithDefault("compartment_id_for_update", compartmentId)
+	compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
 	fileUri := getEnvSettingWithBlankDefault("dataflow_file_uri")
 	fileUriUpdated := getEnvSettingWithBlankDefault("dataflow_file_uri_updated")
 	fileUriVariableStr := fmt.Sprintf("variable \"dataflow_file_uri\" { default = \"%s\" }\n", fileUri)
@@ -164,6 +166,48 @@ func TestDataflowApplicationResource_basic(t *testing.T) {
 				),
 			},
 
+			// verify update to the compartment (the compartment will be switched back in the next step)
+			{
+				Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + ApplicationResourceDependencies + fileUriVariableStr + warehouseBucketUriVariableStr + logsBucketUriVariableStr +
+					generateResourceFromRepresentationMap("oci_dataflow_application", "test_application", Optional, Create,
+						representationCopyWithNewProperties(dataFlowApplicationRepresentation, map[string]interface{}{
+							"compartment_id": Representation{repType: Required, create: `${var.compartment_id_for_update}`},
+						})),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "arguments.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
+					resource.TestCheckResourceAttr(resourceName, "configuration.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "description", "description"),
+					resource.TestCheckResourceAttr(resourceName, "display_name", "test_wordcount_app"),
+					resource.TestCheckResourceAttr(resourceName, "driver_shape", "VM.Standard2.1"),
+					resource.TestCheckResourceAttr(resourceName, "executor_shape", "VM.Standard2.1"),
+					resource.TestCheckResourceAttrSet(resourceName, "file_uri"),
+					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttr(resourceName, "language", "PYTHON"),
+					resource.TestCheckResourceAttrSet(resourceName, "logs_bucket_uri"),
+					resource.TestCheckResourceAttr(resourceName, "num_executors", "1"),
+					resource.TestCheckResourceAttrSet(resourceName, "owner_principal_id"),
+					resource.TestCheckResourceAttr(resourceName, "parameters.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "parameters.0.name", "name"),
+					resource.TestCheckResourceAttr(resourceName, "parameters.0.value", "value"),
+					resource.TestCheckResourceAttr(resourceName, "spark_version", "2.4"),
+					resource.TestCheckResourceAttrSet(resourceName, "state"),
+					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+					resource.TestCheckResourceAttrSet(resourceName, "time_updated"),
+					resource.TestCheckResourceAttrSet(resourceName, "warehouse_bucket_uri"),
+
+					func(s *terraform.State) (err error) {
+						resId2, err = fromInstanceState(s, resourceName, "id")
+						if resId != resId2 {
+							return fmt.Errorf("resource recreated when it was supposed to be updated")
+						}
+						return err
+					},
+				),
+			},
+
 			// verify updates to updatable parameters
 			{
 				Config: config + compartmentIdVariableStr + fileUriVariableStr + classNameStrUpdated + fileUriVariableStrUpdated + logsBucketUriVariableStr + warehouseBucketUriVariableStr + dataFlowApplicationResourceDependencies +