OCM-13406 | ci: fix one function issue leading the destroy and post-destroy cases failure

Author: yuwang-RH

tests/utils/handler/cluster_handler.go

@@ -394,11 +394,13 @@ func (ch *clusterHandler) GenerateClusterCreateFlags() ([]string, error) {
 		if ch.profile.ClusterConfig.SharedVPC && ch.profile.ClusterConfig.HCP {
 			sharedVPCAdditionalPrincipalsForHostedCP = fmt.Sprintf("%s,%s", sharedRoute53RoleArn, sharedVPCEndPointRoleArn)
 		}
-		if sharedVPCAdditionalPrincipalsForHostedCP != "" {
+		if sharedVPCAdditionalPrincipalsForHostedCP != "" && additionalPrincipalRoleArn != "" {
 			flags = append(flags, "--additional-allowed-principals",
 				fmt.Sprintf("%s,%s", sharedVPCAdditionalPrincipalsForHostedCP, additionalPrincipalRoleArn))
-		} else if additionalPrincipalRoleArn != "" {
+		} else if sharedVPCAdditionalPrincipalsForHostedCP == "" && additionalPrincipalRoleArn != "" {
 			flags = append(flags, "--additional-allowed-principals", additionalPrincipalRoleArn)
+		} else if sharedVPCAdditionalPrincipalsForHostedCP != "" && additionalPrincipalRoleArn == "" {
+			flags = append(flags, "--additional-allowed-principals", sharedVPCAdditionalPrincipalsForHostedCP)
 		}
 
 	}

tests/utils/handler/resources_handler.go

@@ -122,6 +122,7 @@ func newResourcesHandler(client *rosacli.Client, region string, persist bool,
 		awsCredentialsFile:              awsCredentialsFile,
 		awsSharedAccountCredentialsFile: awsSharedAccountCredentialsFile,
 	}
+
 	if loadFilesystem {
 		err := helper.ReadFileContentToObject(config.Test.UserDataFile, &resourcesHandler.resources)
 		if err != nil {
@@ -295,6 +296,7 @@ func (rh *resourcesHandler) DestroyResources() (errors []error) {
 func (rh *resourcesHandler) saveToFile() (err error) {
 	if !rh.persist {
 		log.Logger.Debug("Ignoring save to file as per configuration")
+		return
 	}
 	_, err = helper.CreateFileWithContent(config.Test.UserDataFile, &rh.resources)
 	if err != nil {