reverting changes to master

Maxrovr · Maxrovr · commit 9194acff5314 · 2021-09-07T15:33:12.000-04:00
diff --git a/oci/core_boot_volume_backup_copy_test.go b/oci/core_boot_volume_backup_copy_test.go
@@ -159,8 +159,7 @@ func TestResourceCoreBootVolumeBackup_copy(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + BootVolumeBackupCopyResourceDependencies +
-				generateResourceFromRepresentationMap("oci_core_boot_volume_backup", "test_boot_volume_backup_copy", Optional, Update, bootVolumeBackupWithSourceDetailsRepresentation),
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
diff --git a/oci/core_dedicated_vm_host_resource_test.go b/oci/core_dedicated_vm_host_resource_test.go
@@ -488,7 +488,7 @@ func TestResourceCoreDedicatedVmHost_E2ShapeDVH(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + DedicatedVmHostResourceConfig,
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
@@ -688,7 +688,7 @@ func TestResourceCoreDedicatedVmHost_E3ShapeDVH(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + DedicatedVmHostResourceConfig,
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/core_subnet_realm_test.go b/oci/core_subnet_realm_test.go
@@ -170,7 +170,7 @@ func TestGovSpecificCoreSubnetResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + SubnetResourceConfig,
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/core_vcn_realm_test.go b/oci/core_vcn_realm_test.go
@@ -150,10 +150,7 @@ func TestGovSpecificCoreVcnResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + VcnResourceDependencies +
-				generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Optional, Update, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
-					"is_ipv6enabled": Representation{repType: Optional, create: `true`},
-				})),
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
diff --git a/oci/database_backup_destination_resource_test.go b/oci/database_backup_destination_resource_test.go
@@ -153,7 +153,7 @@ func TestResourceDatabaseBackupDestination_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + BackupDestinationNFSResourceConfig,
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ResourceName:      resourceName,
diff --git a/oci/golden_gate_database_registration_test.go b/oci/golden_gate_database_registration_test.go
@@ -319,7 +319,7 @@ func TestGoldenGateDatabaseRegistrationResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + DatabaseRegistrationResourceConfig,
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
diff --git a/oci/golden_gate_deployment_backup_test.go b/oci/golden_gate_deployment_backup_test.go
@@ -241,7 +241,7 @@ func TestGoldenGateDeploymentBackupResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + DeploymentBackupResourceConfig,
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/golden_gate_deployment_test.go b/oci/golden_gate_deployment_test.go
@@ -288,7 +288,7 @@ func TestGoldenGateDeploymentResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + goldenGateDeploymentOggKeyVariableStr + goldenGateDeploymentResourceConfig,
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
diff --git a/oci/identity_api_key_test.go b/oci/identity_api_key_test.go
@@ -118,7 +118,7 @@ func TestIdentityApiKeyResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + ApiKeyResourceDependencies + generateResourceFromRepresentationMap("oci_identity_api_key", "test_api_key", Optional, Update, apiKeyRepresentation),
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateIdFunc:       getApiKeyImportId(resourceName),
diff --git a/oci/identity_auth_token_test.go b/oci/identity_auth_token_test.go
@@ -115,7 +115,7 @@ func TestIdentityAuthTokenResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + AuthTokenResourceDependencies + generateResourceFromRepresentationMap("oci_identity_auth_token", "test_auth_token", Optional, Update, authTokenRepresentation),
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateIdFunc: getAuthTokenImportId(resourceName),
diff --git a/oci/identity_compartment_test.go b/oci/identity_compartment_test.go
@@ -212,7 +212,7 @@ func TestIdentityCompartmentResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + CompartmentResourceConfig,
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
diff --git a/oci/identity_customer_secret_key_test.go b/oci/identity_customer_secret_key_test.go
@@ -119,7 +119,7 @@ func TestIdentityCustomerSecretKeyResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + CustomerSecretKeyResourceDependencies + generateResourceFromRepresentationMap("oci_identity_customer_secret_key", "test_customer_secret_key", Optional, Update, customerSecretKeyRepresentation),
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateIdFunc: getCustomerKeyImportId(resourceName),
diff --git a/oci/identity_dynamic_group_test.go b/oci/identity_dynamic_group_test.go
@@ -175,7 +175,7 @@ variable "dynamic_group_name" { default = "DevCompartmentDynamicGroup" }
 		},
 		// verify resource import
 		{
-			Config:                  config + matchingRule2VariableStr + compartmentIdVariableStr + DynamicGroupResourceDependencies + generateResourceFromRepresentationMap("oci_identity_dynamic_group", "test_dynamic_group", Optional, Update, dynamicGroupRepresentation),
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/identity_group_test.go b/oci/identity_group_test.go
@@ -185,8 +185,7 @@ func TestIdentityGroupResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + GroupResourceDependencies +
-				generateResourceFromRepresentationMap("oci_identity_group", "test_group", Optional, Update, groupRepresentation),
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/identity_identity_provider_test.go b/oci/identity_identity_provider_test.go
@@ -210,7 +210,7 @@ func TestIdentityIdentityProviderResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + IdentityProviderResourceDependencies + generateResourceFromRepresentationMap("oci_identity_identity_provider", "test_identity_provider", Optional, Update, identityProviderRepresentation),
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/identity_idp_group_mapping_test.go b/oci/identity_idp_group_mapping_test.go
@@ -134,7 +134,7 @@ func TestIdentityIdpGroupMappingResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + IdpGroupMappingResourceDependencies + generateResourceFromRepresentationMap("oci_identity_idp_group_mapping", "test_idp_group_mapping", Optional, Update, idpGroupMappingRepresentation),
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateIdFunc:       getIdpGroupMappingImportId(resourceName),
diff --git a/oci/identity_policy_scenario_test.go b/oci/identity_policy_scenario_test.go
@@ -136,24 +136,7 @@ func (s *ResourceIdentityPolicyTestSuite) TestAccResourceIdentityPolicy_basic()
 			},
 			// verify resource import
 			{
-				Config:                  s.Config + s.TokenFn(`
-				resource "oci_identity_policy" "p" {
-					compartment_id = "${var.tenancy_ocid}"
-					name = "{{.token}}"
-					description = "automated test policy (updated)"
-					version_date = "2018-04-18"
-					statements = [
-						"Allow group ${oci_identity_group.t.name} to inspect instances in tenancy",
-						"Allow group ${oci_identity_group.t.name} to read instances in tenancy"
-					]
-				}
-				data "oci_identity_policies" "p" {
-					compartment_id = "${var.tenancy_ocid}"
-					filter {
-						name   = "statements"
-						values = ["Allow group ${oci_identity_group.t.name} to inspect instances in tenancy"]
-					}
-				}`, nil),
+				Config:                  s.Config,
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{},
diff --git a/oci/identity_policy_test.go b/oci/identity_policy_test.go
@@ -164,7 +164,7 @@ func TestIdentityPolicyResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + PolicyResourceDependencies + generateResourceFromRepresentationMap("oci_identity_policy", "test_policy", Optional, Update, policyRepresentation),
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
diff --git a/oci/identity_smtp_credential_test.go b/oci/identity_smtp_credential_test.go
@@ -116,7 +116,7 @@ func TestIdentitySmtpCredentialResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + SmtpCredentialResourceDependencies + generateResourceFromRepresentationMap("oci_identity_smtp_credential", "test_smtp_credential", Optional, Update, smtpCredentialRepresentation),
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateIdFunc: getSmtpCredentialImportId(resourceName),
diff --git a/oci/identity_swift_password_test.go b/oci/identity_swift_password_test.go
@@ -115,9 +115,7 @@ func TestIdentitySwiftPasswordResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config +
-				compartmentIdVariableStr + SwiftPasswordResourceDependencies +
-				generateResourceFromRepresentationMap("oci_identity_swift_password", "test_swift_password", Optional, Update, swiftPasswordRepresentation),
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateIdFunc: getSwiftPasswordImportId(resourceName),
diff --git a/oci/identity_tag_namespace_test.go b/oci/identity_tag_namespace_test.go
@@ -188,9 +188,7 @@ func TestIdentityTagNamespaceResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config +
-				compartmentIdVariableStr + TagNamespaceResourceDependencies +
-				generateResourceFromRepresentationMap("oci_identity_tag_namespace", "test_tag_namespace", Optional, Update, tagNamespaceRepresentation),
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/identity_user_group_membership_test.go b/oci/identity_user_group_membership_test.go
@@ -99,9 +99,7 @@ func TestIdentityUserGroupMembershipResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config +
-				compartmentIdVariableStr + UserGroupMembershipResourceDependencies +
-				generateResourceFromRepresentationMap("oci_identity_user_group_membership", "test_user_group_membership", Optional, Update, userGroupMembershipRepresentation),
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/load_balancer_backend_set_test.go b/oci/load_balancer_backend_set_test.go
@@ -245,9 +245,7 @@ func TestLoadBalancerBackendSetResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + BackendSetResourceDependencies +
-				generateResourceFromRepresentationMap("oci_load_balancer_backend_set", "test_backend_set", Optional, Update, backendSetRepresentation) +
-				generateResourceFromRepresentationMap("oci_load_balancer_backend", "test_backend", Optional, Update, backendRepresentation),
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
diff --git a/oci/load_balancer_certificate_test.go b/oci/load_balancer_certificate_test.go
@@ -124,8 +124,7 @@ func TestLoadBalancerCertificateResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + CertificateResourceDependencies +
-				generateResourceFromRepresentationMap("oci_load_balancer_certificate", "test_certificate", Optional, Update, certificateRepresentation),
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
diff --git a/oci/load_balancer_hostname_test.go b/oci/load_balancer_hostname_test.go
@@ -111,8 +111,7 @@ func TestLoadBalancerHostnameResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + HostnameResourceDependencies +
-				generateResourceFromRepresentationMap("oci_load_balancer_hostname", "test_hostname", Optional, Update, hostnameRepresentation),
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
diff --git a/oci/load_balancer_load_balancer_resource_test.go b/oci/load_balancer_load_balancer_resource_test.go
@@ -495,8 +495,7 @@ func TestResourceLoadBalancerLoadBalancerResource_basic(t *testing.T) {
 			},
 			// verify resource import
 			{
-				Config:            config + compartmentIdVariableStr + LoadBalancerResourceDependencies +
-					generateResourceFromRepresentationMap("oci_load_balancer_load_balancer", "test_load_balancer", Optional, Update, loadBalancerFlexRepresentation),
+				Config:            config,
 				ImportState:       true,
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{
diff --git a/oci/load_balancer_path_route_set_test.go b/oci/load_balancer_path_route_set_test.go
@@ -133,8 +133,7 @@ func TestLoadBalancerPathRouteSetResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + PathRouteSetResourceDependencies +
-				generateResourceFromRepresentationMap("oci_load_balancer_path_route_set", "test_path_route_set", Optional, Update, pathRouteSetRepresentation),
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
diff --git a/oci/logging_custom_log_test.go b/oci/logging_custom_log_test.go
@@ -200,7 +200,7 @@ func TestLoggingCustomLogResource_basic(t *testing.T) {
 			},
 			// verify resource import
 			{
-				Config:                  config + compartmentIdVariableStr + CustomLogResourceConfig,
+				Config:                  config,
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{},
diff --git a/oci/logging_unified_agent_configuration_test.go b/oci/logging_unified_agent_configuration_test.go
@@ -298,7 +298,7 @@ func TestLoggingUnifiedAgentConfigurationResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + UnifiedAgentConfigurationResourceConfig,
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/logging_unified_agent_scenario_test.go b/oci/logging_unified_agent_scenario_test.go
@@ -530,7 +530,7 @@ func TestLoggingUnifiedAgentConfigurationLogTailResource_basic(t *testing.T) {
 			},
 			// verify resource import
 			{
-				Config:                  config + compartmentIdVariableStr + UnifiedAgentConfigurationLogTailResourceConfig,
+				Config:                  config,
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{},
diff --git a/oci/metering_computation_custom_table_test.go b/oci/metering_computation_custom_table_test.go
@@ -165,7 +165,7 @@ func TestMeteringComputationCustomTableResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + CustomTableResourceConfig,
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/metering_computation_query_test.go b/oci/metering_computation_query_test.go
@@ -220,7 +220,7 @@ func TestMeteringComputationQueryResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + tenancyIdVariableStr + QueryResourceConfig,
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/network_load_balancer_backend_set_test.go b/oci/network_load_balancer_backend_set_test.go
@@ -427,8 +427,7 @@ func TestNetworkLoadBalancerBackendSetResource_basic(t *testing.T) {
 
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + NlbBackendSetResourceDependencies +
-				generateResourceFromRepresentationMap("oci_network_load_balancer_backend_set", "test_backend_set", Optional, Update, nlbHttpBackendSetRepresentation),
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/network_load_balancer_backend_test.go b/oci/network_load_balancer_backend_test.go
@@ -155,7 +155,7 @@ func TestNetworkLoadBalancerBackendResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + NlbBackendResourceConfig,
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/network_load_balancer_listener_test.go b/oci/network_load_balancer_listener_test.go
@@ -137,7 +137,7 @@ func TestNetworkLoadBalancerListenerResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + NlbListenerResourceConfig,
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/objectstorage_object_test.go b/oci/objectstorage_object_test.go
@@ -394,8 +394,7 @@ func TestObjectStorageObjectResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:            config + compartmentIdVariableStr + ObjectResourceDependencies +
-				generateResourceFromRepresentationMap("oci_objectstorage_object", "test_object", Optional, Update, objectRepresentation),
+			Config:            config,
 			ImportState:       true,
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
diff --git a/oci/ocvp_esxi_host_test.go b/oci/ocvp_esxi_host_test.go
@@ -189,7 +189,7 @@ func TestOcvpEsxiHostResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + EsxiHostResourceConfig,
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/sch_service_connector_resource_test.go b/oci/sch_service_connector_resource_test.go
@@ -229,7 +229,7 @@ func TestSchServiceConnectorResource_streamingAnalytics(t *testing.T) {
 
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + ServiceConnectorResourceConfig + imageVariableStr,
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},
diff --git a/oci/streaming_stream_resource_test.go b/oci/streaming_stream_resource_test.go
@@ -229,7 +229,7 @@ func TestStreamingStreamWithStreamPoolIdResource_basic(t *testing.T) {
 		},
 		// verify resource import
 		{
-			Config:                  config + compartmentIdVariableStr + StreampoolidResourceConfig,
+			Config:                  config,
 			ImportState:             true,
 			ImportStateVerify:       true,
 			ImportStateVerifyIgnore: []string{},

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ func TestGovSpecificCoreSubnetResource_basic(t *testing.T) {`
`170`	`170`	`},`
`171`	`171`	`// verify resource import`
`172`	`172`	`{`
`173`		`- Config: config + compartmentIdVariableStr + SubnetResourceConfig,`
	`173`	`+ Config: config,`
`174`	`174`	`ImportState: true,`
`175`	`175`	`ImportStateVerify: true,`
`176`	`176`	`ImportStateVerifyIgnore: []string{},`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ func TestResourceDatabaseBackupDestination_basic(t *testing.T) {`
`153`	`153`	`},`
`154`	`154`	`// verify resource import`
`155`	`155`	`{`
`156`		`- Config: config + compartmentIdVariableStr + BackupDestinationNFSResourceConfig,`
	`156`	`+ Config: config,`
`157`	`157`	`ImportState: true,`
`158`	`158`	`ImportStateVerify: true,`
`159`	`159`	`ResourceName: resourceName,`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ func TestGoldenGateDatabaseRegistrationResource_basic(t *testing.T) {`
`319`	`319`	`},`
`320`	`320`	`// verify resource import`
`321`	`321`	`{`
`322`		`- Config: config + compartmentIdVariableStr + DatabaseRegistrationResourceConfig,`
	`322`	`+ Config: config,`
`323`	`323`	`ImportState: true,`
`324`	`324`	`ImportStateVerify: true,`
`325`	`325`	`ImportStateVerifyIgnore: []string{`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ func TestGoldenGateDeploymentBackupResource_basic(t *testing.T) {`
`241`	`241`	`},`
`242`	`242`	`// verify resource import`
`243`	`243`	`{`
`244`		`- Config: config + compartmentIdVariableStr + DeploymentBackupResourceConfig,`
	`244`	`+ Config: config,`
`245`	`245`	`ImportState: true,`
`246`	`246`	`ImportStateVerify: true,`
`247`	`247`	`ImportStateVerifyIgnore: []string{},`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ func TestGoldenGateDeploymentResource_basic(t *testing.T) {`
`288`	`288`	`},`
`289`	`289`	`// verify resource import`
`290`	`290`	`{`
`291`		`- Config: config + compartmentIdVariableStr + goldenGateDeploymentOggKeyVariableStr + goldenGateDeploymentResourceConfig,`
	`291`	`+ Config: config,`
`292`	`292`	`ImportState: true,`
`293`	`293`	`ImportStateVerify: true,`
`294`	`294`	`ImportStateVerifyIgnore: []string{`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func TestIdentityApiKeyResource_basic(t *testing.T) {`
`118`	`118`	`},`
`119`	`119`	`// verify resource import`
`120`	`120`	`{`
`121`		`- Config: config + compartmentIdVariableStr + ApiKeyResourceDependencies + generateResourceFromRepresentationMap("oci_identity_api_key", "test_api_key", Optional, Update, apiKeyRepresentation),`
	`121`	`+ Config: config,`
`122`	`122`	`ImportState: true,`
`123`	`123`	`ImportStateVerify: true,`
`124`	`124`	`ImportStateIdFunc: getApiKeyImportId(resourceName),`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ func TestIdentityAuthTokenResource_basic(t *testing.T) {`
`115`	`115`	`},`
`116`	`116`	`// verify resource import`
`117`	`117`	`{`
`118`		`- Config: config + compartmentIdVariableStr + AuthTokenResourceDependencies + generateResourceFromRepresentationMap("oci_identity_auth_token", "test_auth_token", Optional, Update, authTokenRepresentation),`
	`118`	`+ Config: config,`
`119`	`119`	`ImportState: true,`
`120`	`120`	`ImportStateVerify: true,`
`121`	`121`	`ImportStateIdFunc: getAuthTokenImportId(resourceName),`