Refactor image pipeline module names and update workflows

CSVD · Aug 15, 2024 · c446131 · c446131
1 parent d250628
commit c446131
Showing 1 changed file with 4 additions and 28 deletions.
diff --git a/image-pipeline.tf b/image-pipeline.tf
@@ -7,30 +7,6 @@ locals {
   ]
 }
 
-moved {
-  from = module.linux_image_pipeline
-  to   = module.image_pipeline_repos["linux-image-pipeline"]
-}
-
-moved {
-  from = module.win_image_pipeline
-  to   = module.image_pipeline_repos["windows-image-pipeline"]
-}
-
-moved {
-  from = module.goss-testing
-  to   = module.image_pipeline_repos["image-pipeline-goss-testing"]
-}
-
-moved {
-  from = module.image_pipeline_ansible_playbooks
-  to   = module.image_pipeline_repos["image-pipeline-ansible-playbooks"]
-}
-
-moved {
-  from = module.image_pipeline
-  to   = module.aws_image_pipeline
-}
 
 module "image_pipeline_repos" {
   for_each = toset(local.pipeline_repos)
@@ -46,7 +22,6 @@ module "image_pipeline_repos" {
   create_codeowners      = false
   enforce_prs            = true
   collaborators          = merge(local.collaborators, { garri325 = "admin" })
-  admin_teams            = [github_team.team.name]
   pull_request_bypassers = local.pull_request_bypassers
   extra_files = [
     {
@@ -62,6 +37,7 @@ module "image_pipeline_repos" {
   ]
 }
 
+
 # image-pipeline-asset-releases
 module "asset_releases" {
   source = "git@github.e.it.census.gov:CSVD/terraform-github-repo"
@@ -76,10 +52,10 @@ module "asset_releases" {
   create_codeowners      = false
   enforce_prs            = false
   collaborators          = local.collaborators
-  admin_teams            = [github_team.team.name]
   pull_request_bypassers = local.pull_request_bypassers
 }
 
+
 # image-pipeline
 module "aws_image_pipeline" {
   source = "git@github.e.it.census.gov:CSVD/terraform-github-repo"
@@ -94,7 +70,6 @@ module "aws_image_pipeline" {
   create_codeowners      = false
   enforce_prs            = true
   collaborators          = local.collaborators
-  admin_teams            = [github_team.team.name]
   pull_request_bypassers = local.pull_request_bypassers
   vars = [
     {
@@ -109,6 +84,7 @@ module "aws_image_pipeline" {
         "${path.module}/workflows/terraform-plan.yaml.tpl",
         {
           repo_name = "aws-image-pipeline"
+          directory = null
         }
       )
     },
@@ -118,6 +94,7 @@ module "aws_image_pipeline" {
         "${path.module}/workflows/terraform-apply.yaml.tpl",
         {
           repo_name = "aws-image-pipeline"
+          directory = null
         }
       )
     }
@@ -139,7 +116,6 @@ module "terraform_aws_image_pipeline" {
   create_codeowners      = false
   enforce_prs            = true
   collaborators          = local.collaborators
-  admin_teams            = [github_team.team.name]
   pull_request_bypassers = local.pull_request_bypassers
   vars = [
     {