Innersourcing cleanup workflow fixes (#250)

* Cleanup workflow fixes

* cleanup workflow fixes

* updated the if condition

* added a print statement

* added a print statement

* updated branch in preview

* updated branch in preview

* updated the delete api to not return JSON

* removed print statement

* updated the delete print statement

Author: ishaankalra

.github/workflows/cleanup.yml

@@ -1,13 +1,14 @@
-name: Cleanup Feature Branch Modules
+name: Cleanup Preview Modules
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - master
+  pull_request:
+    types: [ closed ]
+    branches: [ 'master' ]
 
 jobs:
   cleanup:
+    if: (github.event_name == 'pull_request' && github.event.pull_request.merged == true) || github.event_name == 'workflow_dispatch'
     runs-on: iac-arc
 
     steps:
@@ -29,5 +30,5 @@ jobs:
 
       - name: Execute cleanup script
         env:
-          GITHUB_REF_NAME: ${{ github.ref }}
+          GITHUB_REF_NAME: ${{ github.event_name == 'workflow_dispatch' && github.ref || github.event.pull_request.head.ref }}
         run: python .github/workflows/innersourcing/cleanup.py

.github/workflows/innersourcing/cleanup.py

@@ -37,18 +37,16 @@ def delete(url, username, password):
         if response.status_code != 200:
             print(f"Error: Received status code {response.status_code}.")
             print("Response message:", response.text)  # Print the error message from the response
-            return None
 
-        return response.json()
     except requests.exceptions.RequestException as e:
         print(f"Error during API call: {e}")
-        return None
 
 if __name__ == '__main__':
     # Load control planes and secrets
     control_planes = read_json_file('control_planes.json')
     secrets = read_json_file('secrets.json')
-    feature_branch_name = os.getenv('GITHUB_REF_NAME', 'refs/heads/develop')
+    feature_branch_name = os.getenv('GITHUB_REF_NAME')
+    print(f'Cleaning Facets preview modules for branch {feature_branch_name}')
 
     for key, value in control_planes.items():
         cp_url = value.get('URL', "")
@@ -59,7 +57,10 @@ def delete(url, username, password):
 
         for module in modules:
             version = module.get('version', '')
-            if f'-{feature_branch_name}' in version:
+            intent = module.get('intent', '')
+            flavor = module.get('flavor', '')
+            stage = module.get('stage', '')
+            if f'-{feature_branch_name}' in version and stage == "PREVIEW":
                 module_id = module.get('id', '')
                 delete(cp_url + f'/cc-ui/v1/modules/{module_id}', username, token)
-                print(f"Deleted module with ID: {module_id} from control plane {cp_url}")
+                print(f"Deleted module with ID: {module_id} Intent: {intent} Flavor: {flavor} Version: {version} from control plane {cp_url}")

.github/workflows/preview.yml

@@ -59,7 +59,7 @@ jobs:
         run: |
           set -e
           set -o pipefail
-          GITHUB_REF="${{ github.ref }}"
+          GITHUB_REF="${{ github.ref_name }}"
           FACETS_YAML_PATH="$MODULE_DIR_PATH/facets.yaml"
           # Check if facets.yaml exists
           if [ ! -f "$FACETS_YAML_PATH" ]; then