merging

CSVD · Oct 10, 2024 · ced57e3 · ced57e3
2 parents d6e9731 + 28bd095
commit ced57e3
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 30 deletions.
diff --git a/imported-repos.tf b/imported-repos.tf
@@ -1,5 +1,6 @@
 module "netbackup_automation_platform" {
   source        = "HappyPathway/gh-actions/importer"
+  version       = "0.0.34"
   github_repo_topics = []
   vulnerability_alerts = false
   public_repo   = {
@@ -10,5 +11,9 @@ module "netbackup_automation_platform" {
     name   = "netbackup-automation-platform"
     org    = "CSVD"
     topics = ["automation-platform"]
+    collaborators = {
+      "littl381" = "admin"
+      "arnol377" = "admin"
+    }
   }
 }
diff --git a/repolist.tf b/repolist.tf
@@ -12,5 +12,7 @@ module "repo_list" {
   enforce_prs             = each.value.enforce_prs
   collaborators           = local.collaborators
   pull_request_bypassers  = local.pull_request_bypassers
+  github_is_private       = each.value.is_private
   github_org_teams        = local.github_organization_teams
 }
+
diff --git a/sandbox.tf b/sandbox.tf
@@ -46,4 +46,17 @@ module "sandbox" {
       )
     }
   ]
+  secrets = [
+    for secret in [for secret in local.secrets : secret if secret != "AWS_ACCESS_KEY_ID"] :
+    {
+      name  = replace(secret, "GITHUB", "GH")
+      value = lookup(module.env_var, secret).value
+    }
+  ]
+  vars = [
+    {
+      name  = "AWS_ACCESS_KEY_ID"
+      value = lookup(module.env_var, "AWS_ACCESS_KEY_ID").value
+    }
+  ]
 }
diff --git a/varfiles/default.tfvars b/varfiles/default.tfvars
@@ -7,6 +7,7 @@ repolist = [
       description       = "Managing AWS CSVD Secrets"
       repo_org          = "CSVD"
       name              = "aws-secrets"
+      is_private        = false
       repo_topics       = [
        "terraform-tools"
       ]
@@ -15,48 +16,28 @@ repolist = [
       description       = "Tools for managing Terraform"
       repo_org          = "CSVD"
       name              = "tf-tools"
+      is_private        = false
       repo_topics       = [
         "terraform-tools"
       ]
     },
     {
-      description       = "Composite Action for Terraform-Validate"
+      description       = "morpheus-repos"
       repo_org          = "CSVD"
-      name              = "terraform-validate"
+      name              = "morpheus-repos"
+      is_private        = false
       repo_topics       = [
-        "composite-action"
+       "morpheus"
       ]
     },
     {
-      description       = "Composite Action for Terraform-Plan"
+      description       = "supervisord-conf"
       repo_org          = "CSVD"
-      name              = "terraform-plan"
+      name              = "supervisord-conf"
+      is_private        = false
       repo_topics       = [
-        "composite-action"
-      ]
-    },
-    {
-      description       = "Composite Action for Terraform-Apply"
-      repo_org          = "CSVD"
-      name              = "terraform-apply"
-      repo_topics       = [
-        "composite-action"
-      ]
-    },
-    {
-      description       = "Composite Action for Terraform-Apply"
-      repo_org          = "CSVD"
-      name              = "terraform-init"
-      repo_topics       = [
-        "composite-action"
-      ]
-    },
-    {
-      description       = "Composite Action for AWS Auth"
-      repo_org          = "CSVD"
-      name              = "aws-auth"
-      repo_topics       = [
-        "composite-action"
+       "supervisord",
+       "automation"
       ]
     }
 ]

diff --git a/variables.tf b/variables.tf
@@ -11,6 +11,7 @@ variable "repolist" {
     create_codeowners = optional(bool, false)
     enforce_prs       = optional(bool, false)
     repo_topics       = optional(list(string), ["terraform-workspace"])
+    is_private        = optional(bool, false)
   }))
   default = []
 }