[WIP] Pure python for reference; Don't merge

.github/actions/package_lambda_solarwinds_apm_x86_64/action.yaml → .github/actions/package_lambda_solarwinds_apm/action.yaml

@@ -4,15 +4,13 @@
 #
 # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
-name: package_lambda_solarwinds_apm_x86_64
+name: package_lambda_solarwinds_apm
 
-description: Package solarwinds_apm lambda layer for x86_64
+description: Package solarwinds_apm lambda layer
 
 runs:
   using: 'docker'
   image: quay.io/pypa/manylinux_2_28_x86_64:latest
   entrypoint: 'make'
   args:
     - 'aws-lambda'
-  env:
-    PLATFORM: x86_64

.github/actions/package_solarwinds_apm_x86_64/action.yaml → .github/actions/package_solarwinds_apm/action.yaml

@@ -4,9 +4,9 @@
 #
 # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
-name: package_solarwinds_apm_x86_64
+name: package_solarwinds_apm
 
-description: Package solarwinds_apm for x86_64
+description: Package solarwinds_apm
 
 runs:
   using: 'docker'

.github/workflows/build_publish_lambda_layer.yaml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-minor: ["8", "9", "10", "11"]
+        python-minor: ["8", "9", "10", "11", "12"]
         apm-env: ["lambda"]
     steps:
     - uses: actions/checkout@v4
@@ -37,21 +37,49 @@ jobs:
           'lambda/tests/requirements.txt'
     - name: Install tox
       run: pip install tox
-    - name: Build extension
-      run: make wrapper
     - name: Run tox
       run: tox -e py3${{ matrix.python-minor }}-${{ matrix.apm-env }}
 
-  build_publish_layer_x86_64:
-    needs: run_tox_tests
-    uses: ./.github/workflows/build_publish_lambda_layer_x86_64.yaml
+  get_apm_python_version:
+    name: Get APM Python version
+    # Outputs sw-apm-version
+    uses: ./.github/workflows/get_apm_python_version.yaml
+
+  build_layer:
+    runs-on: ubuntu-latest
+    outputs:
+      artifact-name: solarwinds_apm_lambda.zip
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ./.github/actions/package_lambda_solarwinds_apm
+    - uses: actions/upload-artifact@v4
+      name: Save assembled layer to build
+      with:
+        name: solarwinds_apm_lambda.zip
+        path: dist/solarwinds_apm_lambda.zip
+
+  scan_layer:
+    name: RL scan layer
+    needs:
+      - get_apm_python_version
+      - build_layer
+    uses: ./.github/workflows/reversinglabs_scan.yaml
     with:
-      publish-dest: ${{ inputs.publish-dest }}
+      artifact-name: ${{ needs.build_layer.outputs.artifact-name }}
+      package-name: apm-python-lambda
+      version: ${{ needs.get_apm_python_version.outputs.sw-apm-version }}
+      rl-submit-only: true
     secrets: inherit
 
-  build_publish_layer_aarch64:
-    needs: run_tox_tests
-    uses: ./.github/workflows/build_publish_lambda_layer_aarch64.yaml
+  publish-layer:
+    uses: ./.github/workflows/publish_lambda_layer.yaml
+    needs:
+      - get_apm_python_version
+      - build_layer
+      - scan_layer
     with:
+      artifact-name: solarwinds_apm_lambda.zip
+      component-version: ${{ needs.get_apm_python_version.outputs.sw-apm-version }}
+      runtimes: "python3.8 python3.9 python3.10 python3.11 python3.12"
       publish-dest: ${{ inputs.publish-dest }}
-    secrets: inherit
+    secrets: inherit

.github/workflows/build_publish_pypi_and_draft_release.yaml

@@ -39,12 +39,12 @@ jobs:
     name: Build sdist and x86_64
     needs: get_apm_python_version
     # Outputs artifact-name
-    uses: ./.github/workflows/build_x86_64.yaml
+    uses: ./.github/workflows/build_sdist_and_wheel.yaml
     with:
       version: ${{ needs.get_apm_python_version.outputs.sw-apm-version }}
 
   scan_sdist_and_x86_64:
-    name: RL scan aarch64 build
+    name: RL scan sdist and wheel
     needs:
       - get_apm_python_version
       - build_sdist_and_x86_64
@@ -61,47 +61,15 @@ jobs:
     needs:
       - build_sdist_and_x86_64
       - scan_sdist_and_x86_64
-    uses: ./.github/workflows/publish_x86_64.yaml
+    uses: ./.github/workflows/publish_sdist_and_wheel.yaml
     with:
       artifact-name: ${{ needs.build_sdist_and_x86_64.outputs.artifact-name }}
       repository-name: pypi
     secrets: inherit
 
-  build_aarch64:
-    name: Build aarch64
-    needs: get_apm_python_version
-    # Outputs artifact-name
-    uses: ./.github/workflows/build_aarch64.yaml
-    with:
-      version: ${{ needs.get_apm_python_version.outputs.sw-apm-version }}
-
-  scan_aarch64:
-    name: RL scan aarch64 build
-    needs:
-      - get_apm_python_version
-      - build_aarch64
-    uses: ./.github/workflows/reversinglabs_scan.yaml
-    with:
-      artifact-name: ${{ needs.build_aarch64.outputs.artifact-name }}
-      package-name: apm-python-pypi-aarch64
-      version: ${{ needs.get_apm_python_version.outputs.sw-apm-version }}
-      rl-submit-only: false
-    secrets: inherit
-
-  publish_aarch64:
-    name: Publish aarch64 to PyPI
-    needs:
-      - build_aarch64
-      - scan_aarch64
-    uses: ./.github/workflows/publish_aarch64.yaml
-    with:
-      artifact-name: ${{ needs.build_aarch64.outputs.artifact-name }}
-      repository-name: pypi
-    secrets: inherit
-
   create_release:
     name: Create draft release
-    needs: [publish_sdist_and_x86_64, publish_aarch64]
+    needs: publish_sdist_and_x86_64
     runs-on: ubuntu-latest
     permissions:
       contents: write