Fixed logging agent resource dependency on identity group, fixed delete resource bug

srishtipmishra · srishtipmishra · commit 3c2ffd918dac · 2021-03-30T08:16:55.000-07:00
diff --git a/oci/logging_unified_agent_configuration_resource.go b/oci/logging_unified_agent_configuration_resource.go
@@ -750,8 +750,9 @@ func (s *LoggingUnifiedAgentConfigurationResourceCrud) Delete() error {
 	}
 
 	workId := response.OpcWorkRequestId
+
 	// Wait until it finishes
-	_, delWorkRequestErr := unifiedAgentConfigurationWaitForWorkRequest(workId, "logging",
+	_, delWorkRequestErr := unifiedAgentConfigurationWaitForWorkRequest(workId, "unifiedagentconfiguration",
 		oci_logging.ActionTypesDeleted, s.D.Timeout(schema.TimeoutDelete), s.DisableNotFoundRetries, s.Client)
 	return delWorkRequestErr
 }
diff --git a/oci/logging_unified_agent_configuration_test.go b/oci/logging_unified_agent_configuration_test.go
@@ -77,7 +77,8 @@ var (
 	}
 
 	UnifiedAgentConfigurationResourceDependencies = DefinedTagsDependencies +
-		generateResourceFromRepresentationMap("oci_identity_group", "test_group", Required, Create, groupRepresentation) +
+		generateResourceFromRepresentationMap("oci_identity_group", "test_group", Required, Create,
+			getUpdatedRepresentationCopy("name", Representation{repType: Required, create: `LoggingAgentIdentityGroup`}, groupRepresentation)) +
 		generateResourceFromRepresentationMap("oci_logging_log_group", "test_log_group", Required, Create, logGroupRepresentation) +
 		generateResourceFromRepresentationMap("oci_logging_log", "test_log", Required, Create, customLogRepresentation) +
 		generateResourceFromRepresentationMap("oci_objectstorage_bucket", "test_bucket", Required, Create, bucketRepresentation) +

Original file line number	Diff line number	Diff line change
`@@ -750,8 +750,9 @@ func (s *LoggingUnifiedAgentConfigurationResourceCrud) Delete() error {`
`750`	`750`	`}`
`751`	`751`
`752`	`752`	`workId := response.OpcWorkRequestId`
	`753`	`+`
`753`	`754`	`// Wait until it finishes`
`754`		`- _, delWorkRequestErr := unifiedAgentConfigurationWaitForWorkRequest(workId, "logging",`
	`755`	`+ _, delWorkRequestErr := unifiedAgentConfigurationWaitForWorkRequest(workId, "unifiedagentconfiguration",`
`755`	`756`	`oci_logging.ActionTypesDeleted, s.D.Timeout(schema.TimeoutDelete), s.DisableNotFoundRetries, s.Client)`
`756`	`757`	`return delWorkRequestErr`
`757`	`758`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,8 @@ var (`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`UnifiedAgentConfigurationResourceDependencies = DefinedTagsDependencies +`
`80`		`- generateResourceFromRepresentationMap("oci_identity_group", "test_group", Required, Create, groupRepresentation) +`
	`80`	`+ generateResourceFromRepresentationMap("oci_identity_group", "test_group", Required, Create,`
	`81`	+ getUpdatedRepresentationCopy("name", Representation{repType: Required, create: `LoggingAgentIdentityGroup`}, groupRepresentation)) +
`81`	`82`	`generateResourceFromRepresentationMap("oci_logging_log_group", "test_log_group", Required, Create, logGroupRepresentation) +`
`82`	`83`	`generateResourceFromRepresentationMap("oci_logging_log", "test_log", Required, Create, customLogRepresentation) +`
`83`	`84`	`generateResourceFromRepresentationMap("oci_objectstorage_bucket", "test_bucket", Required, Create, bucketRepresentation) +`