updating everything

Author: damienjburks

.github/workflows/terraform-apply-eks.yml

@@ -6,7 +6,7 @@ on:
 env:
   TF_CLOUD_ORGANIZATION: "DSB"
   TF_API_TOKEN: "${{ secrets.TF_API_TOKEN }}"
-  TF_WORKSPACE: "dsb-aws-devsecops-eks-cluster"
+  TF_WORKSPACE: "aws-devsecops-eks-cluster"
   CONFIG_DIRECTORY: "./terraform/eks-cluster"
 
 jobs:

.github/workflows/terraform-apply-pipelines.yml

@@ -6,7 +6,7 @@ on:
 env:
   TF_CLOUD_ORGANIZATION: "DSB"
   TF_API_TOKEN: "${{ secrets.TF_API_TOKEN }}"
-  TF_WORKSPACE: "dsb-aws-devsecops-pipelines"
+  TF_WORKSPACE: "aws-devsecops-pipelines"
   CONFIG_DIRECTORY: "./terraform/pipelines"
 
 jobs:

terraform/eks-cluster/provider.tf

@@ -7,7 +7,7 @@ terraform {
     organization = "DSB"
 
     workspaces {
-      name = "dsb-aws-devsecops-eks-cluster"
+      name = "aws-devsecops-eks-cluster"
     }
   }
 }

terraform/pipelines/OIDC_SETUP.md

@@ -36,7 +36,7 @@ This will create:
 7. Enter the following details:
    - Role ARN: The ARN of the role created in step 1 (output will be shown after terraform apply)
    - Session Duration: 3600 (or your preferred duration)
-   - Workspace: dsb-aws-devsecops-pipelines
+   - Workspace: aws-devsecops-pipelines
 
 ### 3. Update Workspace Variables
 

terraform/pipelines/main.tf

@@ -4,7 +4,7 @@ resource "random_id" "id" {
 }
 
 resource "aws_codestarconnections_connection" "default" {
-  name          = "dsb-github-connection-${random_id.id.hex}"
+  name          = "github-connection-${random_id.id.hex}"
   provider_type = "GitHub"
 }
 

terraform/pipelines/oidc.tf

@@ -23,7 +23,7 @@ resource "aws_iam_role" "terraform_cloud" {
             "app.terraform.io:aud" = "aws.workload.identity"
           },
           StringLike = {
-            "app.terraform.io:sub" = "organization:DSB:workspace:dsb-aws-devsecops-pipelines:run_phase:*"
+            "app.terraform.io:sub" = "organization:DSB:workspace:aws-devsecops-pipelines:run_phase:*"
           }
         }
       }

terraform/pipelines/provider.tf

@@ -9,7 +9,7 @@ terraform {
     organization = "DSB"
 
     workspaces {
-      name = "dsb-aws-devsecops-pipelines"
+      name = "aws-devsecops-pipelines"
     }
   }
 

terraform/pipelines/variables.tf

@@ -7,7 +7,7 @@ variable "resource_prefix" {
 variable "eks_cluster_name" {
   type        = string
   description = "Name of the EKS Cluster"
-  default     = "dsb-devsecops-cluster"
+  default     = "devsecops-cluster"
 }
 
 variable "region" {