Fix build service tests after onboarding to federated tests

chandrasekarsrin · jotruon · commit 024ed7574042 · 2022-01-21T12:06:33.000-08:00
diff --git a/internal/integrationtest/devops_build_pipeline_code_repository_build_stage_test.go b/internal/integrationtest/devops_build_pipeline_code_repository_build_stage_test.go
@@ -53,6 +53,7 @@ var (
 		"primary_build_source":                        acctest.Representation{RepType: acctest.Required, Create: `primaryBuildSource`, Update: `primaryBuildSource2`},
 		"build_source_collection":                     acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineStageCodeRepoBuildSourceCollectionRepresentation},
 		"stage_execution_timeout_in_seconds":          acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
+		"lifecycle":                                   acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 	buildPipelineBuildStageBuildPipelineStageCodeRepoPredecessorCollectionRepresentation = map[string]interface{}{
 		"items": acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineStageBuildPipelineStagePredecessorCollectionItemsRepresentation},
diff --git a/internal/integrationtest/devops_build_pipeline_github_build_stage_test.go b/internal/integrationtest/devops_build_pipeline_github_build_stage_test.go
@@ -53,6 +53,7 @@ var (
 		"primary_build_source":                        acctest.Representation{RepType: acctest.Required, Create: `primaryBuildSource`, Update: `primaryBuildSource2`},
 		"build_source_collection":                     acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineStageBuildSourceCollectionRepresentation},
 		"stage_execution_timeout_in_seconds":          acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
+		"lifecycle":                                   acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 	buildPipelineBuildStageBuildPipelineStagePredecessorCollectionRepresentation = map[string]interface{}{
 		"items": acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineBuildStageBuildPipelineStagePredecessorCollectionItemsRepresentation},
diff --git a/internal/integrationtest/devops_build_pipeline_gitlab_build_stage_test.go b/internal/integrationtest/devops_build_pipeline_gitlab_build_stage_test.go
@@ -53,6 +53,7 @@ var (
 		"primary_build_source":                        acctest.Representation{RepType: acctest.Required, Create: `primaryBuildSource`, Update: `primaryBuildSource2`},
 		"build_source_collection":                     acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineStageGitlabBuildSourceCollectionRepresentation},
 		"stage_execution_timeout_in_seconds":          acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
+		"lifecycle":                                   acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 	buildPipelineBuildStageBuildPipelineStageGitlabPredecessorCollectionRepresentation = map[string]interface{}{
 		"items": acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineBuildStageGitlabBuildPipelineStagePredecessorCollectionItemsRepresentation},
diff --git a/internal/integrationtest/devops_build_pipeline_ocir_deliver_artifact_stage_test.go b/internal/integrationtest/devops_build_pipeline_ocir_deliver_artifact_stage_test.go
@@ -50,6 +50,7 @@ var (
 		"description":                                 acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
 		"display_name":                                acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"freeform_tags":                               acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
+		"lifecycle":                                   acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 
 	buildPipelineWaitStageRepresentationForDeliverArtifactOCIR = map[string]interface{}{
diff --git a/internal/integrationtest/devops_build_pipeline_stage_test.go b/internal/integrationtest/devops_build_pipeline_stage_test.go
@@ -58,6 +58,7 @@ var (
 		"display_name":                                acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"freeform_tags":                               acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
 		"is_pass_all_parameters_enabled":              acctest.Representation{RepType: acctest.Required, Create: `false`, Update: `true`},
+		"lifecycle":                                   acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 	buildPipelineStageBuildPipelineStagePredecessorCollectionRepresentation = map[string]interface{}{
 		"items": acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineStageBuildPipelineStagePredecessorCollectionItemsRepresentation},
diff --git a/internal/integrationtest/devops_build_pipeline_test.go b/internal/integrationtest/devops_build_pipeline_test.go
@@ -55,6 +55,7 @@ var (
 		"description":               acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
 		"display_name":              acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"freeform_tags":             acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
+		"lifecycle":                 acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 	buildPipelineBuildPipelineParametersRepresentation = map[string]interface{}{
 		"items": acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineBuildPipelineParametersItemsRepresentation},
diff --git a/internal/integrationtest/devops_build_pipeline_uim_deliver_artifact_stage_test.go b/internal/integrationtest/devops_build_pipeline_uim_deliver_artifact_stage_test.go
@@ -51,6 +51,7 @@ var (
 		"description":                                 acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
 		"display_name":                                acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"freeform_tags":                               acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
+		"lifecycle":                                   acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 
 	buildPipelineWaitStageRepresentationForDeliverArtifact = map[string]interface{}{
diff --git a/internal/integrationtest/devops_build_pipeline_wait_stage_test.go b/internal/integrationtest/devops_build_pipeline_wait_stage_test.go
@@ -50,6 +50,7 @@ var (
 		"display_name":                                acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"freeform_tags":                               acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
 		"wait_criteria":                               acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineStageWaitCriteriaRepresentation},
+		"lifecycle":                                   acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 	buildPipelineWaitStageBuildPipelineStagePredecessorCollectionRepresentation = map[string]interface{}{
 		"items": acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineStageBuildPipelineStagePredecessorCollectionItemsRepresentation},
diff --git a/internal/integrationtest/devops_build_run_test.go b/internal/integrationtest/devops_build_run_test.go
@@ -49,6 +49,7 @@ var (
 		"defined_tags":        acctest.Representation{RepType: acctest.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")}`},
 		"display_name":        acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"freeform_tags":       acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
+		"lifecycle":           acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 	buildRunBuildRunArgumentsRepresentation = map[string]interface{}{
 		"items": acctest.RepresentationGroup{RepType: acctest.Required, Group: buildRunBuildRunArgumentsItemsRepresentation},
diff --git a/internal/integrationtest/devops_connection_gitlab_test.go b/internal/integrationtest/devops_connection_gitlab_test.go
@@ -50,6 +50,7 @@ var (
 		"description":     acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
 		"display_name":    acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"freeform_tags":   acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
+		"lifecycle":       acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 
 	DevopsGitlabConnectionResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_devops_project", "test_project", acctest.Required, acctest.Create, devopsProjectRepresentation) +
diff --git a/internal/integrationtest/devops_connection_test.go b/internal/integrationtest/devops_connection_test.go
@@ -52,6 +52,7 @@ var (
 		"description":     acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
 		"display_name":    acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"freeform_tags":   acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
+		"lifecycle":       acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 
 	DevopsConnectionResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_devops_project", "test_project", acctest.Required, acctest.Create, devopsProjectRepresentation) +
diff --git a/internal/integrationtest/devops_trigger_devops_repo_test.go b/internal/integrationtest/devops_trigger_devops_repo_test.go
@@ -51,6 +51,7 @@ var (
 		"display_name":   acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"freeform_tags":  acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
 		"repository_id":  acctest.Representation{RepType: acctest.Required, Create: `${oci_devops_repository.test_repository.id}`},
+		"lifecycle":      acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 	devopsCodeRepositoryTriggerActionsRepresentation = map[string]interface{}{
 		"build_pipeline_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_devops_build_pipeline.test_build_pipeline.id}`},
diff --git a/internal/integrationtest/devops_trigger_gitlab_test.go b/internal/integrationtest/devops_trigger_gitlab_test.go
@@ -50,6 +50,7 @@ var (
 		"description":    acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
 		"display_name":   acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"freeform_tags":  acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
+		"lifecycle":      acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 	gitlabTriggerActionsRepresentation = map[string]interface{}{
 		"build_pipeline_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_devops_build_pipeline.test_build_pipeline.id}`},
diff --git a/internal/integrationtest/devops_trigger_test.go b/internal/integrationtest/devops_trigger_test.go
@@ -52,6 +52,7 @@ var (
 		"description":    acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
 		"display_name":   acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"freeform_tags":  acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
+		"lifecycle":      acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},
 	}
 	triggerActionsRepresentation = map[string]interface{}{
 		"build_pipeline_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_devops_build_pipeline.test_build_pipeline.id}`},

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ var (`
`53`	`53`	"primary_build_source": acctest.Representation{RepType: acctest.Required, Create: `primaryBuildSource`, Update: `primaryBuildSource2`},
`54`	`54`	`"build_source_collection": acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineStageCodeRepoBuildSourceCollectionRepresentation},`
`55`	`55`	"stage_execution_timeout_in_seconds": acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
	`56`	`+ "lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},`
`56`	`57`	`}`
`57`	`58`	`buildPipelineBuildStageBuildPipelineStageCodeRepoPredecessorCollectionRepresentation = map[string]interface{}{`
`58`	`59`	`"items": acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineStageBuildPipelineStagePredecessorCollectionItemsRepresentation},`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ var (`
`50`	`50`	"description": acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
`51`	`51`	"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
`52`	`52`	`"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},`
	`53`	`+ "lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`buildPipelineWaitStageRepresentationForDeliverArtifactOCIR = map[string]interface{}{`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ var (`
`58`	`58`	"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
`59`	`59`	`"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},`
`60`	`60`	"is_pass_all_parameters_enabled": acctest.Representation{RepType: acctest.Required, Create: `false`, Update: `true`},
	`61`	`+ "lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},`
`61`	`62`	`}`
`62`	`63`	`buildPipelineStageBuildPipelineStagePredecessorCollectionRepresentation = map[string]interface{}{`
`63`	`64`	`"items": acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineStageBuildPipelineStagePredecessorCollectionItemsRepresentation},`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ var (`
`55`	`55`	"description": acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
`56`	`56`	"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
`57`	`57`	`"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},`
	`58`	`+ "lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},`
`58`	`59`	`}`
`59`	`60`	`buildPipelineBuildPipelineParametersRepresentation = map[string]interface{}{`
`60`	`61`	`"items": acctest.RepresentationGroup{RepType: acctest.Required, Group: buildPipelineBuildPipelineParametersItemsRepresentation},`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ var (`
`51`	`51`	"description": acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
`52`	`52`	"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
`53`	`53`	`"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},`
	`54`	`+ "lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`buildPipelineWaitStageRepresentationForDeliverArtifact = map[string]interface{}{`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ var (`
`49`	`49`	"defined_tags": acctest.Representation{RepType: acctest.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")}`},
`50`	`50`	"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
`51`	`51`	`"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},`
	`52`	`+ "lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsDifferencesRepresentation},`
`52`	`53`	`}`
`53`	`54`	`buildRunBuildRunArgumentsRepresentation = map[string]interface{}{`
`54`	`55`	`"items": acctest.RepresentationGroup{RepType: acctest.Required, Group: buildRunBuildRunArgumentsItemsRepresentation},`