Candidate for release_v3.49.0

Candidate for release_v3.49.0

Author: jotruon

CHANGELOG.md

@@ -1,4 +1,8 @@
-## 3.48.1 (Unreleased)
+## 3.49.0 (Unreleased)
+
+### Added
+- Support for Oracle Content and Experience
+
 ## 3.48.0 (October 16, 2019)
 
 ### Added

examples/compute/image/image.tf

@@ -128,5 +128,5 @@ data "oci_core_images" "supported_shape_images" {
 }
 
 output "supported_shape_images" {
-  value = "${data.oci_core_images.supported_shape_images}"
+  value = "${data.oci_core_images.supported_shape_images.images}"
 }

examples/compute/instance/instance.tf

@@ -252,6 +252,23 @@ resource "oci_core_vcn" "test_vcn" {
   dns_label      = "testvcn"
 }
 
+resource "oci_core_internet_gateway" "test_internet_gateway" {
+  compartment_id = "${var.compartment_ocid}"
+  display_name   = "TestInternetGateway"
+  vcn_id         = "${oci_core_vcn.test_vcn.id}"
+}
+
+resource "oci_core_default_route_table" "default_route_table" {
+  manage_default_resource_id = "${oci_core_vcn.test_vcn.default_route_table_id}"
+  display_name               = "DefaultRouteTable"
+
+  route_rules {
+    destination       = "0.0.0.0/0"
+    destination_type  = "CIDR_BLOCK"
+    network_entity_id = "${oci_core_internet_gateway.test_internet_gateway.id}"
+  }
+}
+
 resource "oci_core_subnet" "test_subnet" {
   availability_domain = "${data.oci_identity_availability_domain.ad.name}"
   cidr_block          = "10.1.20.0/24"

examples/networking/route_table_attachment/route_table_attachment.tf

@@ -101,13 +101,17 @@ resource "oci_core_instance" "example_instance" {
   availability_domain = "${data.oci_identity_availability_domain.ad.name}"
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "testInstance"
-  hostname_label      = "instance"
-  image               = "${var.instance_image_ocid[var.region]}"
   shape               = "${var.instance_shape}"
 
   create_vnic_details {
+    hostname_label         = "instance"
     subnet_id              = "${oci_core_subnet.example_subnet.id}"
     skip_source_dest_check = true
     assign_public_ip       = true
   }
+
+  source_details {
+    source_type = "image"
+    source_id   = "${var.instance_image_ocid[var.region]}"
+  }
 }

examples/oce/main.tf

@@ -0,0 +1,56 @@
+// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+
+variable "tenancy_ocid" {}
+
+variable "tenancy_name" {}
+
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "compartment_ocid" {}
+variable "region" {}
+
+variable "admin_email" {}
+
+variable "idcs_access_token" {}
+
+provider "oci" {
+  region           = "${var.region}"
+  tenancy_ocid     = "${var.tenancy_ocid}"
+  user_ocid        = "${var.user_ocid}"
+  fingerprint      = "${var.fingerprint}"
+  private_key_path = "${var.private_key_path}"
+}
+
+resource "oci_oce_oce_instance" "test_oce_instance" {
+  admin_email              = "${var.admin_email}"
+  compartment_id           = "${var.compartment_ocid}"
+  idcs_access_token        = "${var.idcs_access_token}"
+  name                     = "testoceinstance"
+  object_storage_namespace = "${var.tenancy_name}"
+  tenancy_id               = "${var.tenancy_ocid}"
+  tenancy_name             = "${var.tenancy_name}"
+}
+
+data "oci_oce_oce_instances" "test_oce_instances" {
+  compartment_id = "${var.compartment_ocid}"
+
+  filter {
+    name   = "id"
+    values = ["${oci_oce_oce_instance.test_oce_instance.id}"]
+  }
+
+  state = "Active"
+}
+
+data "oci_oce_oce_instance" "test_oce_instance" {
+  oce_instance_id = "${oci_oce_oce_instance.test_oce_instance.id}"
+}
+
+output "active_oce_instances" {
+  value = ["${data.oci_oce_oce_instances.test_oce_instances.oce_instances}"]
+}
+
+output "output_nested_service_data" {
+  value = "${jsondecode(data.oci_oce_oce_instance.test_oce_instance.service.dns).A.domain}"
+}

examples/storage/block/volume_group/block.tf

@@ -42,7 +42,11 @@ resource "oci_core_volume" "t2" {
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "-tf-volume-with-backup-policy"
   size_in_gbs         = "${var.DBSize}"
-  backup_policy_id    = "${data.oci_core_volume_backup_policies.test_boot_volume_backup_policies.volume_backup_policies.0.id}"
+}
+
+resource "oci_core_volume_backup_policy_assignment" "policy" {
+  asset_id  = "${oci_core_volume.t2.id}"
+  policy_id = "${data.oci_core_volume_backup_policies.test_boot_volume_backup_policies.volume_backup_policies.0.id}"
 }
 
 data "oci_core_volume_backup_policies" "test_boot_volume_backup_policies" {

oci/audit_configuration_resource.go

@@ -23,15 +23,15 @@ func AuditConfigurationResource() *schema.Resource {
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Required: true,
+				ForceNew: true,
 			},
-
-			// Optional
 			"retention_period_days": {
 				Type:     schema.TypeInt,
-				Optional: true,
-				Computed: true,
+				Required: true,
 			},
 
+			// Optional
+
 			// Computed
 		},
 	}

oci/audit_configuration_test.go

@@ -13,17 +13,13 @@ import (
 )
 
 var (
-	ConfigurationRequiredOnlyResource = ConfigurationResourceDependencies +
-		generateResourceFromRepresentationMap("oci_audit_configuration", "test_configuration", Required, Create, configurationRepresentation)
-
 	ConfigurationResourceConfig = ConfigurationResourceDependencies +
 		generateResourceFromRepresentationMap("oci_audit_configuration", "test_configuration", Optional, Update, configurationRepresentation)
 
 	configurationSingularDataSourceRepresentation = map[string]interface{}{
 		"compartment_id": Representation{repType: Required, create: `${var.tenancy_ocid}`},
 	}
 
-	//@CODEGEN the service does not allow retention_period_days to be optional but it is optional in the spec HYD-9426. Service only supports PUT but not POST
 	configurationRepresentation = map[string]interface{}{
 		"compartment_id":        Representation{repType: Required, create: `${var.tenancy_ocid}`},
 		"retention_period_days": Representation{repType: Required, create: `100`, update: `91`},
@@ -58,6 +54,7 @@ func TestAuditConfigurationResource_basic(t *testing.T) {
 				Config: config + ConfigurationResourceDependencies +
 					generateResourceFromRepresentationMap("oci_audit_configuration", "test_configuration", Required, Create, configurationRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", tenancyId),
 					resource.TestCheckResourceAttr(resourceName, "retention_period_days", "100"),
 
 					func(s *terraform.State) (err error) {
@@ -72,6 +69,7 @@ func TestAuditConfigurationResource_basic(t *testing.T) {
 				Config: config + ConfigurationResourceDependencies +
 					generateResourceFromRepresentationMap("oci_audit_configuration", "test_configuration", Optional, Update, configurationRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", tenancyId),
 					resource.TestCheckResourceAttr(resourceName, "retention_period_days", "91"),
 
 					func(s *terraform.State) (err error) {

oci/core_dedicated_vm_host_resource.go

@@ -8,6 +8,7 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 
 	oci_core "github.com/oracle/oci-go-sdk/core"
+	oci_work_requests "github.com/oracle/oci-go-sdk/workrequests"
 )
 
 func CoreDedicatedVmHostResource() *schema.Resource {
@@ -89,6 +90,7 @@ func createCoreDedicatedVmHost(d *schema.ResourceData, m interface{}) error {
 	sync := &CoreDedicatedVmHostResourceCrud{}
 	sync.D = d
 	sync.Client = m.(*OracleClients).computeClient
+	sync.workRequestClient = m.(*OracleClients).workRequestClient
 
 	return CreateResource(d, sync)
 }
@@ -105,6 +107,7 @@ func updateCoreDedicatedVmHost(d *schema.ResourceData, m interface{}) error {
 	sync := &CoreDedicatedVmHostResourceCrud{}
 	sync.D = d
 	sync.Client = m.(*OracleClients).computeClient
+	sync.workRequestClient = m.(*OracleClients).workRequestClient
 
 	return UpdateResource(d, sync)
 }
@@ -113,6 +116,7 @@ func deleteCoreDedicatedVmHost(d *schema.ResourceData, m interface{}) error {
 	sync := &CoreDedicatedVmHostResourceCrud{}
 	sync.D = d
 	sync.Client = m.(*OracleClients).computeClient
+	sync.workRequestClient = m.(*OracleClients).workRequestClient
 	sync.DisableNotFoundRetries = true
 
 	return DeleteResource(d, sync)
@@ -121,6 +125,7 @@ func deleteCoreDedicatedVmHost(d *schema.ResourceData, m interface{}) error {
 type CoreDedicatedVmHostResourceCrud struct {
 	BaseCrud
 	Client                 *oci_core.ComputeClient
+	workRequestClient      *oci_work_requests.WorkRequestClient
 	Res                    *oci_core.DedicatedVmHost
 	DisableNotFoundRetries bool
 }
@@ -200,8 +205,13 @@ func (s *CoreDedicatedVmHostResourceCrud) Create() error {
 		return err
 	}
 
-	s.Res = &response.DedicatedVmHost
-	return nil
+	workId := response.OpcWorkRequestId
+	identifier, err := WaitForWorkRequestWithErrorHandling(s.workRequestClient, workId, "dedicatedvmhost", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
+	if err != nil {
+		return err
+	}
+	s.D.SetId(*identifier)
+	return s.Get()
 }
 
 func (s *CoreDedicatedVmHostResourceCrud) Get() error {
@@ -272,8 +282,19 @@ func (s *CoreDedicatedVmHostResourceCrud) Delete() error {
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
 
-	_, err := s.Client.DeleteDedicatedVmHost(context.Background(), request)
-	return err
+	response, err := s.Client.DeleteDedicatedVmHost(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	workId := response.OpcWorkRequestId
+	if workId != nil {
+		_, err = WaitForWorkRequestWithErrorHandling(s.workRequestClient, workId, "dedicatedvmhost", oci_work_requests.WorkRequestResourceActionTypeDeleted, s.D.Timeout(schema.TimeoutDelete), s.DisableNotFoundRetries)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
 }
 
 func (s *CoreDedicatedVmHostResourceCrud) SetData() error {
@@ -331,9 +352,16 @@ func (s *CoreDedicatedVmHostResourceCrud) updateCompartment(compartment interfac
 
 	changeCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
 
-	_, err := s.Client.ChangeDedicatedVmHostCompartment(context.Background(), changeCompartmentRequest)
+	response, err := s.Client.ChangeDedicatedVmHostCompartment(context.Background(), changeCompartmentRequest)
 	if err != nil {
 		return err
 	}
+	workId := response.OpcWorkRequestId
+	if workId != nil {
+		_, err = WaitForWorkRequestWithErrorHandling(s.workRequestClient, workId, "dedicatedvmhost", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
+		if err != nil {
+			return err
+		}
+	}
 	return nil
 }

oci/core_drg_resource.go

@@ -278,7 +278,8 @@ func (s *CoreDrgResourceCrud) updateCompartment(compartment interface{}) error {
 		return err
 	}
 	workId := response.OpcWorkRequestId
-	_, err = WaitForWorkRequest(s.workRequestClient, workId, "core", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
+	// work request doesn't return identifier once succeeded
+	_, err = WaitForWorkRequest(s.workRequestClient, workId, "core", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries, false)
 	if err != nil {
 		return err
 	}