Revert "[DRAFT] Refactor S3 integration tests into different actions"

This reverts commit 25afb2d.

Author: jochenehret

.github/actions/s3-integration-run-aws-assume/action.yml

@@ -0,0 +1,63 @@
+name: Run AWS S3 Integration Tests
+description: Runs integration tests against to aws infrastructure.
+
+inputs:
+  access_key_id:
+    description: 'AWS Access Key ID'
+    required: true
+  secret_access_key:
+    description: 'AWS Secret Access Key'
+    required: true
+  region_name:
+    description: 'AWS Region Name'
+    required: true
+  stack_name:
+    description: 'CloudFormation Stack Name (required for aws and aws-iam tests)'
+    required: false
+    default: ''
+  test_type:
+    description: 'Type of test to run (e.g.,aws, aws-iam, aws-assume)'
+    required: true
+  label_filter:
+    description: 'Ginkgo Label Filter for tests to run'
+    required: true
+  s3_endpoint_host:
+    description: 'Custom S3 Endpoint Host'
+    required: false
+  role_arn:
+    description: 'AWS Role ARN to test assume role functionality'
+    required: false
+    default: ''
+
+runs:
+  using: 'composite'
+  steps:
+  - name: Run AWS S3 Integration Tests
+    shell: bash
+    run: |
+      set -e
+      export access_key_id="${{inputs.access_key_id}}"
+      export secret_access_key="${{inputs.secret_access_key}}"
+      export region_name="${{inputs.region_name}}"
+      export stack_name="${{inputs.stack_name}}"
+
+      if [[ "${{inputs.test_type}}" == "aws" ]]; then
+        export role_arn="${{inputs.role_arn}}"
+        export s3_endpoint_host="${{inputs.s3_endpoint_host}}"
+        export label_filter="${{inputs.label_filter}}"
+        echo "Running standard AWS integration tests..."
+        ./.github/scripts/s3/run-integration-aws.sh
+      elif [[ "${{inputs.test_type}}" == "aws-iam" ]]; then
+        export label_filter="${{inputs.label_filter}}"
+        echo "Running AWS IAM role tests..."
+        ./.github/scripts/s3/run-integration-aws-iam.sh
+      elif [[ "${{inputs.test_type}}" == "aws-assume" ]]; then
+        export assume_role_arn="${{inputs.role_arn}}"
+        export label_filter="${{inputs.label_filter}}"
+        echo "Running AWS assume role tests..."
+        ./.github/scripts/s3/run-integration-aws-assume.sh
+      else
+        echo "Error: Unknown test_type '${{inputs.test_type}}'"
+        echo "Valid options are: aws, aws-iam, aws-assume"
+        exit 1
+      fi

.github/actions/s3-integration-run-aws-iam/action.yml

@@ -46,32 +46,36 @@ jobs:
           stack_name: ${{ env.STACK_NAME }}
 
       - name: Test Static Credentials
-        uses: ./.github/actions/s3-integration-run-aws
+        uses: ./.github/actions/s3-integration-run
         with:
           access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           region_name: ${{ env.REGION_NAME }}
           stack_name: ${{ env.STACK_NAME }}
           s3_endpoint_host: ${{ env.S3_ENDPOINT_HOST }}
           label_filter: 'aws && static && (general || us-east-1)'
+          test_type: 'aws'
 
       - name: Test IAM Roles
-        uses: ./.github/actions/s3-integration-run-aws-iam
+        uses: ./.github/actions/s3-integration-run
         with:
           access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           region_name: ${{ env.REGION_NAME }}
           stack_name: ${{ env.STACK_NAME }}
           label_filter: 'aws && iam-role'
+          test_type: 'aws-iam'
 
       - name: Test Assume Roles
-        uses: ./.github/actions/s3-integration-run-aws-assume
+        uses: ./.github/actions/s3-integration-run
         with:
           access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           region_name: ${{ env.REGION_NAME }}
+          stack_name: ${{ env.STACK_NAME }}
           role_arn: ${{ secrets.AWS_ROLE_ARN }}
           label_filter: 'aws && assume-role'
+          test_type: 'aws-assume'
 
       - name: Teardown AWS infrastructure
         if: always()
@@ -129,14 +133,15 @@ jobs:
           stack_name: ${{ matrix.stack_name }}
 
       - name: Run regional tests
-        uses: ./.github/actions/s3-integration-run-aws
+        uses: ./.github/actions/s3-integration-run
         with:
           access_key_id: ${{ matrix.use_esc_credentials && secrets.AWS_ESC_ACCESS_KEY_ID || secrets.AWS_ACCESS_KEY_ID }}
           secret_access_key: ${{ matrix.use_esc_credentials && secrets.AWS_ESC_SECRET_ACCESS_KEY || secrets.AWS_SECRET_ACCESS_KEY }}
           region_name: ${{ matrix.region_name }}
           stack_name: ${{ matrix.stack_name }}
           s3_endpoint_host: ${{ matrix.s3_endpoint_host }}
           label_filter: ${{ matrix.label_filter }}
+          test_type: 'aws'
 
       - name: Teardown AWS infrastructure
         if: always()