support for updating OCE instance type

Author: varmax2511

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.18.0 (Unreleased)
+
+### Added
+- Support for updating instance type in `oci_oce_oce_instance`
+
 ## 4.17.0 (March 10, 2021)
 
 ### Added

examples/oracle_content_experience/main.tf

@@ -41,7 +41,7 @@ resource "oci_oce_oce_instance" "test_oce_instance" {
   compartment_id           = var.compartment_ocid
   idcs_access_token        = var.idcs_access_token
   name                     = "testoceinstance"
-  object_storage_namespace = var.tenancy_name
+  object_storage_namespace = data.oci_objectstorage_namespace.test_namespace.namespace
   tenancy_id               = var.tenancy_ocid
   tenancy_name             = var.tenancy_name
 
@@ -79,3 +79,8 @@ output "active_oce_instances" {
 output "output_nested_service_data" {
   value = jsondecode(data.oci_oce_oce_instance.test_oce_instance.service.dns).A.domain
 }
+
+data "oci_objectstorage_namespace" "test_namespace" {
+    #Optional
+    compartment_id = var.compartment_ocid
+}

oci/oce_oce_instance_resource.go

@@ -107,7 +107,6 @@ func OceOceInstanceResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
-				ForceNew: true,
 			},
 			"upgrade_schedule": {
 				Type:     schema.TypeString,
@@ -457,6 +456,10 @@ func (s *OceOceInstanceResourceCrud) Update() error {
 		request.InstanceLicenseType = oci_oce.LicenseTypeEnum(instanceLicenseType.(string))
 	}
 
+	if instanceUsageType, ok := s.D.GetOkExists("instance_usage_type"); ok {
+		request.InstanceUsageType = oci_oce.UpdateOceInstanceDetailsInstanceUsageTypeEnum(instanceUsageType.(string))
+	}
+
 	tmp := s.D.Id()
 	request.OceInstanceId = &tmp
 

oci/oce_oce_instance_test.go

@@ -47,20 +47,21 @@ var (
 		"compartment_id":           Representation{repType: Required, create: `${var.compartment_id}`},
 		"idcs_access_token":        Representation{repType: Required, create: `${var.idcs_access_token}`},
 		"name":                     Representation{repType: Required, create: instanceName},
-		"object_storage_namespace": Representation{repType: Required, create: `${data.oci_identity_tenancy.test_tenancy.name}`},
+		"object_storage_namespace": Representation{repType: Required, create: `${data.oci_objectstorage_namespace.test_namespace.namespace}`},
 		"tenancy_id":               Representation{repType: Required, create: `${data.oci_identity_tenancy.test_tenancy.id}`},
 		"tenancy_name":             Representation{repType: Required, create: `${data.oci_identity_tenancy.test_tenancy.name}`},
 		"defined_tags":             Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
 		"description":              Representation{repType: Optional, create: `description`, update: `description2`},
 		"freeform_tags":            Representation{repType: Optional, create: map[string]string{"bar-key": "value"}, update: map[string]string{"Department": "Accounting"}},
 		"instance_access_type":     Representation{repType: Optional, create: `PUBLIC`},
 		"instance_license_type":    Representation{repType: Optional, create: `NEW`, update: `BYOL`},
-		"instance_usage_type":      Representation{repType: Optional, create: `NONPRIMARY`},
+		"instance_usage_type":      Representation{repType: Optional, create: `NONPRIMARY`, update: `PRIMARY`},
 		"upgrade_schedule":         Representation{repType: Optional, create: `UPGRADE_IMMEDIATELY`},
 		"waf_primary_domain":       Representation{repType: Optional, create: `oracle.com`, update: `java.com`},
 	}
 
 	OceInstanceResourceDependencies = generateDataSourceFromRepresentationMap("oci_identity_tenancy", "test_tenancy", Required, Create, tenancySingularDataSourceRepresentation) +
+		generateDataSourceFromRepresentationMap("oci_objectstorage_namespace", "test_namespace", Optional, Create, namespaceSingularDataSourceRepresentation) +
 		DefinedTagsDependencies
 )
 
@@ -216,7 +217,7 @@ func TestOceOceInstanceResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "idcs_tenancy"),
 					resource.TestCheckResourceAttr(resourceName, "instance_access_type", "PUBLIC"),
 					resource.TestCheckResourceAttr(resourceName, "instance_license_type", "BYOL"),
-					resource.TestCheckResourceAttr(resourceName, "instance_usage_type", "NONPRIMARY"),
+					resource.TestCheckResourceAttr(resourceName, "instance_usage_type", "PRIMARY"),
 					resource.TestCheckResourceAttr(resourceName, "name", instanceName),
 					resource.TestCheckResourceAttrSet(resourceName, "object_storage_namespace"),
 					resource.TestCheckResourceAttrSet(resourceName, "tenancy_id"),
@@ -255,7 +256,7 @@ func TestOceOceInstanceResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(datasourceName, "oce_instances.0.idcs_tenancy"),
 					resource.TestCheckResourceAttr(datasourceName, "oce_instances.0.instance_access_type", "PUBLIC"),
 					resource.TestCheckResourceAttr(datasourceName, "oce_instances.0.instance_license_type", "BYOL"),
-					resource.TestCheckResourceAttr(datasourceName, "oce_instances.0.instance_usage_type", "NONPRIMARY"),
+					resource.TestCheckResourceAttr(datasourceName, "oce_instances.0.instance_usage_type", "PRIMARY"),
 					resource.TestCheckResourceAttr(datasourceName, "oce_instances.0.name", instanceName),
 					resource.TestCheckResourceAttrSet(datasourceName, "oce_instances.0.object_storage_namespace"),
 					resource.TestCheckResourceAttrSet(datasourceName, "oce_instances.0.state"),
@@ -286,7 +287,7 @@ func TestOceOceInstanceResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "idcs_tenancy"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "instance_access_type", "PUBLIC"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "instance_license_type", "BYOL"),
-					resource.TestCheckResourceAttr(singularDatasourceName, "instance_usage_type", "NONPRIMARY"),
+					resource.TestCheckResourceAttr(singularDatasourceName, "instance_usage_type", "PRIMARY"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "name", instanceName),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "object_storage_namespace"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),

website/docs/r/oce_oce_instance.html.markdown

@@ -50,7 +50,7 @@ The following arguments are supported:
 * `idcs_access_token` - (Required) Identity Cloud Service access token identifying a stripe and service administrator user
 * `instance_access_type` - (Optional) Flag indicating whether the instance access is private or public
 * `instance_license_type` - (Optional) (Updatable) Flag indicating whether the instance license is new cloud or bring your own license
-* `instance_usage_type` - (Optional) Instance type based on its usage
+* `instance_usage_type` - (Optional) (Updatable) Instance type based on its usage
 * `name` - (Required) OceInstance Name
 * `object_storage_namespace` - (Required) Object Storage Namespace of Tenancy
 * `tenancy_id` - (Required) Tenancy Identifier