From e72303a94bcf3a27dcdaeb1055d2448329b10ca8 Mon Sep 17 00:00:00 2001
From: Luca Prete <preteluca@gmail.com>
Date: Tue, 17 Dec 2024 17:26:02 +0100
Subject: [PATCH] [FAST] Remove unused stage 1 CICD variables (#2774)

---
 fast/stages/1-resman/README.md           |  4 ++--
 fast/stages/1-resman/variables-stages.tf | 14 ++++++--------
 tests/fast/stages/s1_resman/simple.yaml  |  1 -
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/fast/stages/1-resman/README.md b/fast/stages/1-resman/README.md
index c77e56f7a2..339b951700 100644
--- a/fast/stages/1-resman/README.md
+++ b/fast/stages/1-resman/README.md
@@ -273,8 +273,8 @@ terraform apply
 | [prefix](variables-fast.tf#L147) | Prefix used for resources that need unique names. Use 9 characters or less. | <code>string</code> | ✓ |  | <code>0-bootstrap</code> |
 | [custom_roles](variables-fast.tf#L53) | Custom roles defined at the org level, in key => id format. | <code title="object&#40;&#123;&#10;  billing_viewer                  &#61; string&#10;  organization_admin_viewer       &#61; string&#10;  project_iam_viewer              &#61; string&#10;  service_project_network_admin   &#61; string&#10;  storage_viewer                  &#61; string&#10;  gcve_network_admin              &#61; optional&#40;string&#41;&#10;  gcve_network_viewer             &#61; optional&#40;string&#41;&#10;  network_firewall_policies_admin &#61; optional&#40;string&#41;&#10;  ngfw_enterprise_admin           &#61; optional&#40;string&#41;&#10;  ngfw_enterprise_viewer          &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> | <code>0-bootstrap</code> |
 | [factories_config](variables.tf#L20) | Configuration for the resource factories or external data. | <code title="object&#40;&#123;&#10;  org_policies      &#61; optional&#40;string, &#34;data&#47;org-policies&#34;&#41;&#10;  stage_3           &#61; optional&#40;string, &#34;data&#47;stage-3&#34;&#41;&#10;  top_level_folders &#61; optional&#40;string, &#34;data&#47;top-level-folders&#34;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> |  |
-| [fast_stage_2](variables-stages.tf#L17) | FAST stages 2 configurations. | <code title="object&#40;&#123;&#10;  networking &#61; optional&#40;object&#40;&#123;&#10;    enabled    &#61; optional&#40;bool, true&#41;&#10;    short_name &#61; optional&#40;string, &#34;net&#34;&#41;&#10;    cicd_config &#61; optional&#40;object&#40;&#123;&#10;      identity_provider &#61; string&#10;      repository &#61; object&#40;&#123;&#10;        name      &#61; string&#10;        branch    &#61; optional&#40;string&#41;&#10;        parent_id &#61; optional&#40;string&#41;&#10;        type      &#61; optional&#40;string, &#34;github&#34;&#41;&#10;      &#125;&#41;&#10;    &#125;&#41;&#41;&#10;    folder_config &#61; optional&#40;object&#40;&#123;&#10;      create_env_folders &#61; optional&#40;bool, true&#41;&#10;      iam_by_principals  &#61; optional&#40;map&#40;list&#40;string&#41;&#41;, &#123;&#125;&#41;&#10;      name               &#61; optional&#40;string, &#34;Networking&#34;&#41;&#10;      parent_id          &#61; optional&#40;string&#41;&#10;    &#125;&#41;, &#123;&#125;&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;  network_security &#61; optional&#40;object&#40;&#123;&#10;    enabled    &#61; optional&#40;bool, false&#41;&#10;    short_name &#61; optional&#40;string, &#34;nsec&#34;&#41;&#10;    cicd_config &#61; optional&#40;object&#40;&#123;&#10;      identity_provider &#61; string&#10;      repository &#61; object&#40;&#123;&#10;        name      &#61; string&#10;        branch    &#61; optional&#40;string&#41;&#10;        parent_id &#61; optional&#40;string&#41;&#10;        type      &#61; optional&#40;string, &#34;github&#34;&#41;&#10;      &#125;&#41;&#10;    &#125;&#41;&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;  project_factory &#61; optional&#40;object&#40;&#123;&#10;    enabled    &#61; optional&#40;bool, true&#41;&#10;    short_name &#61; optional&#40;string, &#34;pf&#34;&#41;&#10;    cicd_config &#61; optional&#40;object&#40;&#123;&#10;      identity_provider &#61; string&#10;      repository &#61; object&#40;&#123;&#10;        name   &#61; string&#10;        branch &#61; optional&#40;string&#41;&#10;        type   &#61; optional&#40;string, &#34;github&#34;&#41;&#10;      &#125;&#41;&#10;    &#125;&#41;&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;  security &#61; optional&#40;object&#40;&#123;&#10;    enabled    &#61; optional&#40;bool, true&#41;&#10;    short_name &#61; optional&#40;string, &#34;sec&#34;&#41;&#10;    cicd_config &#61; optional&#40;object&#40;&#123;&#10;      identity_provider &#61; string&#10;      repository &#61; object&#40;&#123;&#10;        name   &#61; string&#10;        branch &#61; optional&#40;string&#41;&#10;        type   &#61; optional&#40;string, &#34;github&#34;&#41;&#10;      &#125;&#41;&#10;    &#125;&#41;&#41;&#10;    folder_config &#61; optional&#40;object&#40;&#123;&#10;      create_env_folders &#61; optional&#40;bool, false&#41;&#10;      iam_by_principals  &#61; optional&#40;map&#40;list&#40;string&#41;&#41;, &#123;&#125;&#41;&#10;      name               &#61; optional&#40;string, &#34;Security&#34;&#41;&#10;      parent_id          &#61; optional&#40;string&#41;&#10;    &#125;&#41;, &#123;&#125;&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> |  |
-| [fast_stage_3](variables-stages.tf#L97) | FAST stages 3 configurations. | <code title="map&#40;object&#40;&#123;&#10;  short_name  &#61; string&#10;  environment &#61; optional&#40;string, &#34;dev&#34;&#41;&#10;  cicd_config &#61; optional&#40;object&#40;&#123;&#10;    identity_provider &#61; string&#10;    repository &#61; object&#40;&#123;&#10;      name   &#61; string&#10;      branch &#61; optional&#40;string&#41;&#10;      type   &#61; optional&#40;string, &#34;github&#34;&#41;&#10;    &#125;&#41;&#10;  &#125;&#41;&#41;&#10;  folder_config &#61; optional&#40;object&#40;&#123;&#10;    name              &#61; string&#10;    iam_by_principals &#61; optional&#40;map&#40;list&#40;string&#41;&#41;, &#123;&#125;&#41;&#10;    parent_id         &#61; optional&#40;string&#41;&#10;    tag_bindings      &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  &#125;&#41;&#41;&#10;  organization_iam &#61; optional&#40;object&#40;&#123;&#10;    context_tag_value &#61; string&#10;    sa_roles &#61; object&#40;&#123;&#10;      ro &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;      rw &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;    &#125;&#41;&#10;  &#125;&#41;&#41;&#10;  stage2_iam &#61; optional&#40;object&#40;&#123;&#10;    networking &#61; optional&#40;object&#40;&#123;&#10;      iam_admin_delegated &#61; optional&#40;bool, false&#41;&#10;      sa_roles &#61; optional&#40;object&#40;&#123;&#10;        ro &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;        rw &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;      &#125;&#41;, &#123;&#125;&#41;&#10;    &#125;&#41;, &#123;&#125;&#41;&#10;    security &#61; optional&#40;object&#40;&#123;&#10;      iam_admin_delegated &#61; optional&#40;bool, false&#41;&#10;      sa_roles &#61; optional&#40;object&#40;&#123;&#10;        ro &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;        rw &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;      &#125;&#41;, &#123;&#125;&#41;&#10;    &#125;&#41;, &#123;&#125;&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
+| [fast_stage_2](variables-stages.tf#L17) | FAST stages 2 configurations. | <code title="object&#40;&#123;&#10;  networking &#61; optional&#40;object&#40;&#123;&#10;    enabled    &#61; optional&#40;bool, true&#41;&#10;    short_name &#61; optional&#40;string, &#34;net&#34;&#41;&#10;    cicd_config &#61; optional&#40;object&#40;&#123;&#10;      identity_provider &#61; string&#10;      repository &#61; object&#40;&#123;&#10;        name   &#61; string&#10;        branch &#61; optional&#40;string&#41;&#10;        type   &#61; optional&#40;string, &#34;github&#34;&#41;&#10;      &#125;&#41;&#10;    &#125;&#41;&#41;&#10;    folder_config &#61; optional&#40;object&#40;&#123;&#10;      create_env_folders &#61; optional&#40;bool, true&#41;&#10;      iam_by_principals  &#61; optional&#40;map&#40;list&#40;string&#41;&#41;, &#123;&#125;&#41;&#10;      name               &#61; optional&#40;string, &#34;Networking&#34;&#41;&#10;      parent_id          &#61; optional&#40;string&#41;&#10;    &#125;&#41;, &#123;&#125;&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;  network_security &#61; optional&#40;object&#40;&#123;&#10;    enabled    &#61; optional&#40;bool, false&#41;&#10;    short_name &#61; optional&#40;string, &#34;nsec&#34;&#41;&#10;    cicd_config &#61; optional&#40;object&#40;&#123;&#10;      identity_provider &#61; string&#10;      repository &#61; object&#40;&#123;&#10;        name   &#61; string&#10;        branch &#61; optional&#40;string&#41;&#10;        type   &#61; optional&#40;string, &#34;github&#34;&#41;&#10;      &#125;&#41;&#10;    &#125;&#41;&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;  project_factory &#61; optional&#40;object&#40;&#123;&#10;    enabled    &#61; optional&#40;bool, true&#41;&#10;    short_name &#61; optional&#40;string, &#34;pf&#34;&#41;&#10;    cicd_config &#61; optional&#40;object&#40;&#123;&#10;      identity_provider &#61; string&#10;      repository &#61; object&#40;&#123;&#10;        name   &#61; string&#10;        branch &#61; optional&#40;string&#41;&#10;        type   &#61; optional&#40;string, &#34;github&#34;&#41;&#10;      &#125;&#41;&#10;    &#125;&#41;&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;  security &#61; optional&#40;object&#40;&#123;&#10;    enabled    &#61; optional&#40;bool, true&#41;&#10;    short_name &#61; optional&#40;string, &#34;sec&#34;&#41;&#10;    cicd_config &#61; optional&#40;object&#40;&#123;&#10;      identity_provider &#61; string&#10;      repository &#61; object&#40;&#123;&#10;        name   &#61; string&#10;        branch &#61; optional&#40;string&#41;&#10;        type   &#61; optional&#40;string, &#34;github&#34;&#41;&#10;      &#125;&#41;&#10;    &#125;&#41;&#41;&#10;    folder_config &#61; optional&#40;object&#40;&#123;&#10;      create_env_folders &#61; optional&#40;bool, false&#41;&#10;      iam_by_principals  &#61; optional&#40;map&#40;list&#40;string&#41;&#41;, &#123;&#125;&#41;&#10;      name               &#61; optional&#40;string, &#34;Security&#34;&#41;&#10;      parent_id          &#61; optional&#40;string&#41;&#10;    &#125;&#41;, &#123;&#125;&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> |  |
+| [fast_stage_3](variables-stages.tf#L95) | FAST stages 3 configurations. | <code title="map&#40;object&#40;&#123;&#10;  short_name  &#61; string&#10;  environment &#61; optional&#40;string, &#34;dev&#34;&#41;&#10;  cicd_config &#61; optional&#40;object&#40;&#123;&#10;    identity_provider &#61; string&#10;    repository &#61; object&#40;&#123;&#10;      name   &#61; string&#10;      branch &#61; optional&#40;string&#41;&#10;      type   &#61; optional&#40;string, &#34;github&#34;&#41;&#10;    &#125;&#41;&#10;  &#125;&#41;&#41;&#10;  folder_config &#61; optional&#40;object&#40;&#123;&#10;    name              &#61; string&#10;    iam_by_principals &#61; optional&#40;map&#40;list&#40;string&#41;&#41;, &#123;&#125;&#41;&#10;    parent_id         &#61; optional&#40;string&#41;&#10;    tag_bindings      &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  &#125;&#41;&#41;&#10;  organization_iam &#61; optional&#40;object&#40;&#123;&#10;    context_tag_value &#61; string&#10;    sa_roles &#61; object&#40;&#123;&#10;      ro &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;      rw &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;    &#125;&#41;&#10;  &#125;&#41;&#41;&#10;  stage2_iam &#61; optional&#40;object&#40;&#123;&#10;    networking &#61; optional&#40;object&#40;&#123;&#10;      iam_admin_delegated &#61; optional&#40;bool, false&#41;&#10;      sa_roles &#61; optional&#40;object&#40;&#123;&#10;        ro &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;        rw &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;      &#125;&#41;, &#123;&#125;&#41;&#10;    &#125;&#41;, &#123;&#125;&#41;&#10;    security &#61; optional&#40;object&#40;&#123;&#10;      iam_admin_delegated &#61; optional&#40;bool, false&#41;&#10;      sa_roles &#61; optional&#40;object&#40;&#123;&#10;        ro &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;        rw &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;      &#125;&#41;, &#123;&#125;&#41;&#10;    &#125;&#41;, &#123;&#125;&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
 | [groups](variables-fast.tf#L88) | Group names or IAM-format principals to grant organization-level permissions. If just the name is provided, the 'group:' principal and organization domain are interpolated. | <code title="object&#40;&#123;&#10;  gcp-billing-admins      &#61; optional&#40;string, &#34;gcp-billing-admins&#34;&#41;&#10;  gcp-devops              &#61; optional&#40;string, &#34;gcp-devops&#34;&#41;&#10;  gcp-network-admins      &#61; optional&#40;string, &#34;gcp-vpc-network-admins&#34;&#41;&#10;  gcp-organization-admins &#61; optional&#40;string, &#34;gcp-organization-admins&#34;&#41;&#10;  gcp-security-admins     &#61; optional&#40;string, &#34;gcp-security-admins&#34;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> | <code>0-bootstrap</code> |
 | [locations](variables-fast.tf#L103) | Optional locations for GCS, BigQuery, and logging buckets created here. | <code title="object&#40;&#123;&#10;  bq      &#61; optional&#40;string, &#34;EU&#34;&#41;&#10;  gcs     &#61; optional&#40;string, &#34;EU&#34;&#41;&#10;  logging &#61; optional&#40;string, &#34;global&#34;&#41;&#10;  pubsub  &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> | <code>0-bootstrap</code> |
 | [outputs_location](variables.tf#L31) | Enable writing provider, tfvars and CI/CD workflow files to local filesystem. Leave null to disable. | <code>string</code> |  | <code>null</code> |  |
diff --git a/fast/stages/1-resman/variables-stages.tf b/fast/stages/1-resman/variables-stages.tf
index d3d244a8ef..c46bdb9776 100644
--- a/fast/stages/1-resman/variables-stages.tf
+++ b/fast/stages/1-resman/variables-stages.tf
@@ -23,10 +23,9 @@ variable "fast_stage_2" {
       cicd_config = optional(object({
         identity_provider = string
         repository = object({
-          name      = string
-          branch    = optional(string)
-          parent_id = optional(string)
-          type      = optional(string, "github")
+          name   = string
+          branch = optional(string)
+          type   = optional(string, "github")
         })
       }))
       folder_config = optional(object({
@@ -42,10 +41,9 @@ variable "fast_stage_2" {
       cicd_config = optional(object({
         identity_provider = string
         repository = object({
-          name      = string
-          branch    = optional(string)
-          parent_id = optional(string)
-          type      = optional(string, "github")
+          name   = string
+          branch = optional(string)
+          type   = optional(string, "github")
         })
       }))
     }), {})
diff --git a/tests/fast/stages/s1_resman/simple.yaml b/tests/fast/stages/s1_resman/simple.yaml
index 0a4b782fad..0f7d2058d3 100644
--- a/tests/fast/stages/s1_resman/simple.yaml
+++ b/tests/fast/stages/s1_resman/simple.yaml
@@ -1802,7 +1802,6 @@ outputs:
       repository:
         branch: main
         name: test/00-networking
-        parent_id: null
         type: github
     security:
       provider: projects/1234567890/locations/global/workloadIdentityPools/ldj-bootstrap/providers/ldj-bootstrap-gitlab-ludomagno