Added - Support for OIC Instance Creation for Healthcare Feature

Author: Xu Zhang

examples/integration/main.tf

@@ -59,7 +59,7 @@ provider "oci" {
 resource "oci_integration_integration_instance" "test_integration_instance" {
   #Required
   compartment_id            = var.compartment_id
-  integration_instance_type = "STANDARDX"
+  integration_instance_type = "HEALTHCARE"
   shape                     = "DEVELOPMENT"
   display_name              = "displayName"
   is_byol                   = "false"
@@ -96,17 +96,17 @@ data "oci_integration_integration_instance" "test_integration_instance" {
   integration_instance_id = oci_integration_integration_instance.test_integration_instance.id
 }
 
-resource "oci_integration_integration_instance" "test_integration_instance_idcs" {
-  #Required
-  compartment_id            = var.compartment_id
-  display_name              = "instance4643_idcs"
-  integration_instance_type = "STANDARDX"
-  shape                     = "DEVELOPMENT"
-  # shape                     = "PRODUCTION"
-  is_byol                   = "false"
-  message_packs             = "10"
-  idcs_at                   = var.integration_instance_idcs_access_token
-}
+# resource "oci_integration_integration_instance" "test_integration_instance_idcs" {
+#   #Required
+#   compartment_id            = var.compartment_id
+#   display_name              = "instance4643_idcs"
+#   integration_instance_type = "STANDARDX"
+#   shape                     = "DEVELOPMENT"
+#   # shape                     = "PRODUCTION"
+#   is_byol                   = "false"
+#   message_packs             = "10"
+#   idcs_at                   = var.integration_instance_idcs_access_token
+# }
 
 resource "oci_integration_private_endpoint_outbound_connection" "integration_private_endpoint" {
   integration_instance_id = oci_integration_integration_instance.test_integration_instance.id

internal/integrationtest/integration_integration_instance_test.go

@@ -132,7 +132,7 @@ var (
 	}
 
 	ignoreDefinedTagsDifferencesRepresentationAgain = map[string]interface{}{
-		"ignore_changes": acctest.Representation{RepType: acctest.Required, Create: []string{`defined_tags`}},
+		"ignore_changes": acctest.Representation{RepType: acctest.Required, Create: []string{`defined_tags`, `system_tags`}},
 	}
 
 	integrationInstanceAlternateCustomEndpointsRepresentation = map[string]interface{}{
@@ -187,6 +187,9 @@ func TestIntegrationIntegrationInstanceResource_basic(t *testing.T) {
 	nsgId := utils.GetEnvSettingWithBlankDefault("nsg_id")
 	nsgIdStr := fmt.Sprintf("variable \"nsg_id\" { default = \"%s\" }\n", nsgId)
 
+	domainIdVariable := utils.GetEnvSettingWithBlankDefault("domain_id")
+	domainIdVariableStr := fmt.Sprintf("variable \"domain_id\" { default = \"%s\" }\n", domainIdVariable)
+
 	resourceName := "oci_integration_integration_instance.test_integration_instance"
 	datasourceName := "data.oci_integration_integration_instances.test_integration_instances"
 	singularDatasourceName := "data.oci_integration_integration_instance.test_integration_instance"
@@ -200,7 +203,7 @@ func TestIntegrationIntegrationInstanceResource_basic(t *testing.T) {
 	acctest.ResourceTest(t, testAccCheckIntegrationIntegrationInstanceDestroy, []resource.TestStep{
 		// verify Create
 		{
-			Config: config + instanceTypeVariableStr + compartmentIdVariableStr + subnetIdStr + nsgIdStr + idcsAccessTokenVariableStr() + IntegrationIntegrationInstanceResourceDependencies +
+			Config: config + instanceTypeVariableStr + compartmentIdVariableStr + domainIdVariableStr + subnetIdStr + nsgIdStr + idcsAccessTokenVariableStr() + IntegrationIntegrationInstanceResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_integration_integration_instance", "test_integration_instance", acctest.Required, acctest.Create, integrationInstanceRepresentation) +
 				acctest.GenerateResourceFromRepresentationMap("oci_integration_private_endpoint_outbound_connection", "integration_private_endpoint", acctest.Required, acctest.Create, integrationPrivateEndpointRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
@@ -260,7 +263,6 @@ func TestIntegrationIntegrationInstanceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
 				resource.TestCheckResourceAttrSet(resourceName, "domain_id"),
 				resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
-				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(resourceName, "consumption_model", "UCM"),
 				resource.TestCheckResourceAttr(resourceName, "custom_endpoint.#", "0"),
 				// resource.TestCheckResourceAttrSet(resourceName, "custom_endpoint.0.certificate_secret_id"),

internal/service/integration/integration_integration_instance_data_source.go

@@ -156,6 +156,10 @@ func (s *IntegrationIntegrationInstanceDataSourceCrud) SetData() error {
 		s.D.Set("state_message", *s.Res.StateMessage)
 	}
 
+	if s.Res.SystemTags != nil {
+		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
+	}
+
 	if s.Res.TimeCreated != nil {
 		s.D.Set("time_created", s.Res.TimeCreated.String())
 	}

internal/service/integration/integration_integration_instance_resource.go

@@ -364,6 +364,11 @@ func IntegrationIntegrationInstanceResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"system_tags": {
+				Type:     schema.TypeMap,
+				Computed: true,
+				Elem:     schema.TypeString,
+			},
 			"time_created": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -1006,6 +1011,10 @@ func (s *IntegrationIntegrationInstanceResourceCrud) SetData() error {
 		s.D.Set("state_message", *s.Res.StateMessage)
 	}
 
+	if s.Res.SystemTags != nil {
+		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
+	}
+
 	if s.Res.TimeCreated != nil {
 		s.D.Set("time_created", s.Res.TimeCreated.String())
 	}

internal/service/integration/integration_integration_instances_data_source.go

@@ -190,6 +190,10 @@ func (s *IntegrationIntegrationInstancesDataSourceCrud) SetData() error {
 			integrationInstance["state_message"] = *r.StateMessage
 		}
 
+		if r.SystemTags != nil {
+			integrationInstance["system_tags"] = tfresource.SystemTagsToMap(r.SystemTags)
+		}
+
 		if r.TimeCreated != nil {
 			integrationInstance["time_created"] = r.TimeCreated.String()
 		}

website/docs/d/integration_integration_instance.html.markdown

@@ -84,6 +84,7 @@ The following attributes are exported:
 * `shape` - Shape
 * `state` - The current state of the integration instance.
 * `state_message` - An message describing the current state in more detail. For example, can be used to provide actionable information for a resource in Failed state.
+* `system_tags` - Usage of system tag keys. These predefined keys are scoped to namespaces. Example: `{"orcl-cloud.free-tier-retained": "true"}` 
 * `time_created` - The time the the Integration Instance was created. An RFC3339 formatted datetime string.
 * `time_updated` - The time the IntegrationInstance was updated. An RFC3339 formatted datetime string.
 

website/docs/d/integration_integration_instances.html.markdown

@@ -97,6 +97,7 @@ The following attributes are exported:
 * `shape` - Shape
 * `state` - The current state of the integration instance.
 * `state_message` - An message describing the current state in more detail. For example, can be used to provide actionable information for a resource in Failed state.
+* `system_tags` - Usage of system tag keys. These predefined keys are scoped to namespaces. Example: `{"orcl-cloud.free-tier-retained": "true"}` 
 * `time_created` - The time the the Integration Instance was created. An RFC3339 formatted datetime string.
 * `time_updated` - The time the IntegrationInstance was updated. An RFC3339 formatted datetime string.
 

website/docs/r/integration_integration_instance.html.markdown

@@ -158,6 +158,7 @@ The following attributes are exported:
 * `shape` - Shape
 * `state` - The current state of the integration instance.
 * `state_message` - An message describing the current state in more detail. For example, can be used to provide actionable information for a resource in Failed state.
+* `system_tags` - Usage of system tag keys. These predefined keys are scoped to namespaces. Example: `{"orcl-cloud.free-tier-retained": "true"}` 
 * `time_created` - The time the the Integration Instance was created. An RFC3339 formatted datetime string.
 * `time_updated` - The time the IntegrationInstance was updated. An RFC3339 formatted datetime string.