Fix review app delete project checkout

Author: justin808

.github/actions/cpflow-delete-control-plane-app/action.yml

@@ -11,12 +11,17 @@ inputs:
   review_app_prefix:
     description: Prefix used for review app names
     required: true
+  working_directory:
+    description: Directory containing the downstream project's .controlplane/controlplane.yml
+    required: false
+    default: "."
 
 runs:
   using: composite
   steps:
     - name: Delete application
       shell: bash
+      working-directory: ${{ inputs.working_directory }}
       run: ${{ github.action_path }}/delete-app.sh
       env:
         APP_NAME: ${{ inputs.app_name }}

.github/workflows/cpflow-delete-review-app.yml

@@ -81,13 +81,20 @@ jobs:
             variable:REVIEW_APP_PREFIX
           pull_request_friendly: "true"
 
+      - name: Checkout repository
+        if: steps.config.outputs.ready == 'true'
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        with:
+          path: app
+          persist-credentials: false
+
       - name: Setup environment
         if: steps.config.outputs.ready == 'true'
         uses: ./.cpflow/.github/actions/cpflow-setup-environment
         with:
           token: ${{ secrets.CPLN_TOKEN_STAGING }}
           org: ${{ vars.CPLN_ORG_STAGING }}
-          working_directory: .cpflow
+          working_directory: app
           cpln_cli_version: ${{ vars.CPLN_CLI_VERSION }}
           cpflow_version: ${{ vars.CPFLOW_VERSION }}
 
@@ -130,6 +137,7 @@ jobs:
           app_name: ${{ env.APP_NAME }}
           cpln_org: ${{ vars.CPLN_ORG_STAGING }}
           review_app_prefix: ${{ vars.REVIEW_APP_PREFIX }}
+          working_directory: app
 
       # Finalizer still runs after delete failures, but only after config validation
       # created the initial PR comment and workflow link env vars it updates.

spec/command/generate_github_actions_spec.rb

@@ -346,7 +346,9 @@ def shared_workflow_path(name)
       contents = reusable_delete_review_workflow_path.read
       expect(contents).to include("concurrency:")
       expect(contents).to include('pull_request_friendly: "true"')
-      expect(contents).to include("working_directory: .cpflow")
+      expect(contents).to include("Checkout repository")
+      expect(contents).to include("path: app")
+      expect(contents).to include("working_directory: app")
       expect(delete_review_workflow_path.read).to include("pull_request_target:")
       expect(delete_review_workflow_path.read).to include("pull_request_target is intentional")
       expect(delete_review_workflow_path.read).to include("mirrors the upstream job guard")

spec/github_workflows_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "yaml"
+
+RSpec.describe "GitHub workflow definitions" do # rubocop:disable RSpec/DescribeClass
+  describe "Delete Review App workflow" do
+    let(:workflow) do
+      YAML.safe_load_file(
+        File.expand_path("../.github/workflows/cpflow-delete-review-app.yml", __dir__),
+        aliases: true
+      )
+    end
+
+    let(:steps) { workflow.fetch("jobs").fetch("delete-review-app").fetch("steps") }
+
+    def step_named(name)
+      steps.find { |step| step["name"] == name }
+    end
+
+    it "runs cpflow delete from a downstream app checkout" do
+      expect(step_named("Checkout repository")).to include(
+        "uses" => "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd",
+        "with" => include(
+          "path" => "app",
+          "persist-credentials" => false
+        )
+      )
+
+      expect(step_named("Setup environment").fetch("with")).to include(
+        "working_directory" => "app"
+      )
+      expect(step_named("Delete review app").fetch("with")).to include(
+        "working_directory" => "app"
+      )
+    end
+  end
+
+  describe "Delete Control Plane App action" do
+    let(:action) do
+      YAML.safe_load_file(
+        File.expand_path("../.github/actions/cpflow-delete-control-plane-app/action.yml", __dir__),
+        aliases: true
+      )
+    end
+
+    it "allows callers to choose the project working directory" do
+      expect(action.fetch("inputs")).to include(
+        "working_directory" => include("default" => ".")
+      )
+
+      delete_step = action.fetch("runs").fetch("steps").find { |step| step["name"] == "Delete application" }
+
+      expect(delete_step).to include(
+        "working-directory" => "${{ inputs.working_directory }}"
+      )
+    end
+  end
+end