From 5cd249bb59570b409a12fc59193faf6d2d0682ab Mon Sep 17 00:00:00 2001
From: Lei Wang <66336933+wangzlei@users.noreply.github.com>
Date: Tue, 8 Oct 2024 15:19:38 -0700
Subject: [PATCH] Update release-lambda.yml

---
 .github/workflows/release-lambda.yml | 42 +++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release-lambda.yml b/.github/workflows/release-lambda.yml
index 554696a8..5dbcd82f 100644
--- a/.github/workflows/release-lambda.yml
+++ b/.github/workflows/release-lambda.yml
@@ -186,16 +186,6 @@ jobs:
         with:
           name: layer.tf
           path: layer.tf
-  update-layer:
-    runs-on: ubuntu-latest
-    needs: generate-release-note
-    steps:
-      - name: Checkout Repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-      - name: download layer.tf
-        uses: actions/download-artifact@v3
-        with:
-          name: layer.tf
       - name: Commit changes
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -206,3 +196,35 @@ jobs:
           git add lambda-layer/terraform/lambda/layer.tf
           git commit -m "Update Lambda layer ARNs for releasing" || echo "No changes to commit"
           git push
+  create-release:
+    runs-on: ubuntu-latest
+    needs: generate-release-note
+    steps:
+      - name: Checkout Repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+      - name: Get latest commit SHA
+        run: |
+          echo "COMMIT_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
+          SHORT_SHA=$(echo $GITHUB_SHA | cut -c1-7)
+          echo "SHORT_SHA=${SHORT_SHA}" >> $GITHUB_ENV
+      - name: Create Tag
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          TAG_NAME="lambda-${SHORT_SHA}"
+          git tag -a "$TAG_NAME" -m "Release Lambda layer based on commit $TAG_NAME"
+          git push origin "$TAG_NAME"
+          echo "TAG_NAME=${TAG_NAME}" >> $GITHUB_ENV
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.TAG_NAME }}
+          release_name: "Release AWSOpenTelemetryDistroPython Lambda Layer"
+          body_path: lambda-layer/terraform/lambda/layer.tf
+          draft: true
+          prerelease: false