pipeline fix

Author: dilip0515

.github/workflows/pipeline.yaml

@@ -138,6 +138,7 @@ jobs:
       - name: Configure AWS Namespace
         env:
           PR_NUMBER: ${{ github.event.number }}
+          # This is the branch name, or the git tag name
           NS_BRANCH_OR_TAG: ${{ github.ref_name }}
         run: |
           echo "PR_NUMBER=${{ env.PR_NUMBER }}"
@@ -160,6 +161,8 @@ jobs:
           test $(shasum -a 256 ./dce_linux_amd64.zip | awk '{print $1}') == "${expected_sha}"
           unzip ./dce_linux_amd64.zip -d ./
 
+        # Lease a DCE account, to use for deploying our PR environment
+        # (deploy DCE in DCE)
       - name: Lease DCE Account
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -176,7 +179,8 @@ jobs:
               basepath: /api
             region: us-east-1
           " > ./dce.yml
-
+          
+          # Check to see if there's an active lease for this PR
           lease_id=$(
             ./dce --config=dce.yml leases list \
               -p ${NAMESPACE} -s Active | \
@@ -197,16 +201,18 @@ jobs:
           ./dce --config=dce.yml leases login ${lease_id}
           echo "${lease_id}" > ./lease_id.txt
 
+        # Install Terraform
       - name: Install Terraform
         uses: hashicorp/setup-terraform@v2
         with:
           terraform_version: ${{ inputs.terraform_version }}
 
+        # Configure the Terraform backend
       - name: Configure Terraform Backend
         run: |
           lease_id=$(cat lease_id.txt)
           ./scripts/create-tf-backend.sh ${lease_id}
-
+        # terraform init
       - name: Terraform Init/Apply
         env:
           NAMESPACE: ${{ env.namespace }}
@@ -391,7 +397,8 @@ jobs:
           cp ${{ github.workspace }}/backend-tf/backend.tf ./modules/
           chmod +x ./dce
 
-      - name: Install Terraform for Cleanup
+        # Cleanup the PR environment
+      - name: Terraform for Cleanup
         uses: hashicorp/setup-terraform@v2
         with:
           terraform_version: ${{ inputs.terraform_version }}
@@ -411,7 +418,8 @@ jobs:
           cd modules
           terraform init -input=false
           terraform destroy -auto-approve
-
+          
+        # End the DCE lease
       - name: End DCE Lease
         env:
           AWS_DEFAULT_REGION: us-east-1

tests/acceptance/api_test.go

@@ -60,9 +60,6 @@ func TestApi(t *testing.T) {
 	tfOut := terraform.OutputAll(t, tfOpts)
 
 	apiURL, ok := tfOut["api_url"].(string)
-	if !ok {
-		t.Fatalf("api_url should be a non-empty string, but got: %v", tfOut["api_url"])
-	}
 	if !ok || apiURL == "" {
 		t.Fatalf("api_url should be a non-empty string, but got: %v", tfOut["api_url"])
 	}

tests/acceptance/artifacts_bucket_test.go

@@ -24,11 +24,6 @@ func TestArtifactsBucket(t *testing.T) {
 	tfOpts := &terraform.Options{
 		TerraformDir: "../../modules",
 	}
-	// Initialize and apply the Terraform configuration
-	terraform.InitAndApply(t, tfOpts)
-	defer terraform.Destroy(t, tfOpts)
-
-	// Fetch the bucket name from Terraform output
 	bucketName := terraform.Output(t, tfOpts, "artifacts_bucket_name")
 
 	t.Run("should be encrypted by default", func(t *testing.T) {

tests/acceptance/credentials_web_page_test.go

@@ -19,15 +19,9 @@ func TestCredentialsWebPageLoads(t *testing.T) {
 		TerraformDir: "../../modules",
 	}
 
-	// Ensure Terraform is initialized and applied before reading outputs
-	terraform.InitAndApply(t, tfOpts)
-	defer terraform.Destroy(t, tfOpts)
+	tfOut := terraform.OutputAll(t, tfOpts)
+	apiURL := tfOut["api_url"].(string)
 
-	// Get the specific output value instead of all outputs
-	apiURL, err := terraform.OutputE(t, tfOpts, "api_url")
-	assert.NoError(t, err)
-	assert.NotEmpty(t, apiURL, "api_url should not be empty")
-
 	var chainCredentials = credentials.NewChainCredentials([]credentials.Provider{
 		&credentials.EnvProvider{},
 		&credentials.SharedCredentialsProvider{Filename: "", Profile: ""},

tests/acceptance/outputs_test.go

@@ -14,10 +14,7 @@ func TestTerraformOutputs(t *testing.T) {
 		TerraformDir: "../../modules",
 	}
 
-	tfOut, ok := terraform.OutputAll(t, tfOpts).(map[string]interface{})
-	if !ok {
-		t.Fatalf("Failed to cast terraform outputs to map[string]interface{}")
-	}
+	tfOut := terraform.OutputAll(t, tfOpts)
 
 	assert.Regexp(t,
 		regexp.MustCompile("^Accounts"),