test

Author: jj22ee

.github/workflows/application-signals-e2e-test.yml

@@ -7,23 +7,11 @@
 name: E2E Testing
 on:
   workflow_call:
-    inputs:
-      staging-instrumentation-name:
-        required: true
-        type: string
-      adot-image-name:
-        required: true
-        type: string
 
 permissions:
   id-token: write
   contents: read
 
-concurrency:
-  group: '${{ github.workflow }} @ ${{ inputs.aws-region }}'
-  cancel-in-progress: false
-
-
 jobs:
   upload-main-build:
     runs-on: ubuntu-latest
@@ -124,4 +112,31 @@ jobs:
     with:
       node-version: 22
       staging-instrumentation-name: ${{ inputs.staging-instrumentation-name }}
-      caller-workflow-name: 'main-build'
+      caller-workflow-name: 'main-build'
+
+  validate-all-tests-are-accounted-for:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Ruby
+        uses: ruby/[email protected]
+        with:
+          ruby-version: "3.4"
+      - name: check TESTS_USED
+        run: | 
+          git clone https://github.com/jj22ee/aws-application-signals-test-framework.git
+          cd aws-application-signals-test-framework/.github/workflows/
+          echo "TESTS_USED=$(ls | grep -E '^node-' | grep -v '\-perf-' | grep -E 'test\.ya?ml$' -c)" >> $GITHUB_ENV
+      - name: check TESTS_AVAILABLE
+        run: | 
+          git clone https://github.com/jj22ee/aws-otel-js-instrumentation.git
+          cd aws-otel-js-instrumentation/.github/workflows/
+          echo TESTS_AVAILABLE=$(ruby -ryaml -e 'puts YAML.load_file("application-signals-e2e-test.yml")["jobs"].values.map { |v| v["uses"] }.compact.uniq.count { |u| u.include?("aws-observability/aws-application-signals-test-framework/.github/workflows") }') >> $GITHUB_ENV
+      - name: compare TESTS_USED and TESTS_AVAILABLE
+        run: |
+          echo ${{ env.TESTS_USED }}
+          echo ${{ env.TESTS_AVAILABLE }}
+          if [[ "${{ env.TESTS_USED }}" != "${{ env.TESTS_AVAILABLE }}" ]]; then
+            exit 1
+          fi
+
+      

.github/workflows/main-build.yml

@@ -22,85 +22,10 @@ permissions:
   contents: read
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    outputs:
-      aws_default_region: ${{ steps.node_output.outputs.awsDefaultRegion}}
-      node_image_tag: ${{ steps.node_output.outputs.node_image_tag}}
-      staging_image: ${{ steps.node_output.outputs.stagingImage}}
-      staging_registry: ${{ steps.node_output.outputs.stagingRegistry}}
-      staging_repository: ${{ steps.node_output.outputs.stagingRepository}}
-      staging_tarball_file: ${{ steps.staging_tarball_output.outputs.STAGING_TARBALL}}
-    steps:
-      - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Get Node Distro Output
-        id: node_output
-        run: |
-          pkg_version=$(jq -r '.version' ./package.json)
-          echo "ADOT_NODE_VERSION=$pkg_version" >> $GITHUB_OUTPUT
-          shortsha="$(git rev-parse --short HEAD)"
-          echo "SHORT_SHA=$shortsha" >> $GITHUB_ENV
-          node_distro_tag=$pkg_version-$shortsha
-          echo "awsDefaultRegion=${{ env.AWS_DEFAULT_REGION }}" >> $GITHUB_OUTPUT
-          echo "node_image_tag=$node_distro_tag" >> $GITHUB_OUTPUT
-          echo "stagingRegistry=${{ env.STAGING_ECR_REGISTRY }}" >> $GITHUB_OUTPUT
-          echo "stagingRepository=${{ env.STAGING_ECR_REPOSITORY }}" >> $GITHUB_OUTPUT
-          echo "stagingImage=${{ env.STAGING_ECR_REGISTRY }}/${{ env.STAGING_ECR_REPOSITORY }}:$node_distro_tag" >> $GITHUB_OUTPUT
-
-      - name: Build and Push Tarball and Image Files
-        uses: ./.github/actions/artifacts_build
-        with:
-          aws-region: ${{ env.AWS_DEFAULT_REGION }}
-          image_uri_with_tag: ${{ steps.node_output.outputs.stagingImage }}
-          image_registry: ${{ env.STAGING_ECR_REGISTRY }}
-          snapshot-ecr-role: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
-          push_image: true
-          load_image: false
-          node_version: "20"
-          package_name: aws-distro-opentelemetry-node-autoinstrumentation
-          os: ubuntu-latest
-
-      - name: Output Tarball File Name
-        id: staging_tarball_output
-        run: |
-          staging_tarball="aws-aws-distro-opentelemetry-node-autoinstrumentation-${{ steps.node_output.outputs.ADOT_NODE_VERSION }}.tgz"
-          echo "STAGING_TARBALL=$staging_tarball" >> $GITHUB_OUTPUT
-
-      - name: Upload Tarball to S3
-        run: |
-          aws s3 cp aws-distro-opentelemetry-node-autoinstrumentation/${{ steps.staging_tarball_output.outputs.STAGING_TARBALL }} s3://${{ env.STAGING_S3_BUCKET }}
-
-      - name: Upload Tarball to GitHub Actions
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ steps.staging_tarball_output.outputs.STAGING_TARBALL}}
-          path: aws-distro-opentelemetry-node-autoinstrumentation/${{ steps.staging_tarball_output.outputs.STAGING_TARBALL}}
-
-      - name: Build and Publish Lambda Staging Layer
-        uses: ./.github/actions/lambda_artifacts_build
-        with:
-          aws-region: ${{ env.AWS_DEFAULT_REGION }}
-          node_version: "20"
-          layer_directory: lambda-layer
-          staging_s3_bucket: ${{ env.STAGING_S3_BUCKET }}
-          staging_tarball: ${{ steps.staging_tarball_output.outputs.STAGING_TARBALL}}
-      # TODO - implement contract tests in NodeJS
-      # - name: Set up and run contract tests with pytest
-      #   run: |
-      #     bash scripts/set-up-contract-tests.sh
-      #     pip install pytest
-      #     pytest contract-tests/tests
-
   application-signals-e2e-test:
     name: "Application Signals E2E Test"
-    needs: [ build ]
     uses: ./.github/workflows/application-signals-e2e-test.yml
     secrets: inherit
     permissions:
       id-token: write
-      contents: read
-    with:
-      staging-instrumentation-name: ${{ needs.build.outputs.staging_tarball_file }}
-      adot-image-name: ${{ needs.build.outputs.staging_registry }}/aws-observability/adot-autoinstrumentation-node-staging:${{ needs.build.outputs.node_image_tag }}
+      contents: read