From cd20be2a6a9be684749354daef942f240759d39d Mon Sep 17 00:00:00 2001
From: Davy MELINA <davy.melina@gmail.com>
Date: Fri, 21 Jun 2024 10:34:08 +0200
Subject: [PATCH] Fix AMI description for GraalVM and Add GA for Graal latest

---
 .github/workflows/aws-arm-graal-latest.yml | 38 ++++++++++++++++++++++
 .github/workflows/aws-x86-graal-latest.yml | 38 ++++++++++++++++++++++
 .github/workflows/aws-x86-graal22.yml      |  2 +-
 build-aws-arm-graal.sh                     |  4 +--
 build-aws-x86-graal.sh                     |  4 +--
 5 files changed, 81 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/aws-arm-graal-latest.yml
 create mode 100644 .github/workflows/aws-x86-graal-latest.yml

diff --git a/.github/workflows/aws-arm-graal-latest.yml b/.github/workflows/aws-arm-graal-latest.yml
new file mode 100644
index 0000000..3e92900
--- /dev/null
+++ b/.github/workflows/aws-arm-graal-latest.yml
@@ -0,0 +1,38 @@
+name: AWS arm graalvm latest
+on:
+  workflow_dispatch:
+
+permissions:
+      id-token: write
+      contents: read
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Packer
+        uses: hashicorp-contrib/setup-packer@v1
+        with:
+          packer-version: '1.7.8'
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_SELLER }}
+          aws-region: eu-west-3
+
+
+      - name: Build image from template
+        run: cd packer; packer init aws-arm-graal.pkr.hcl
+
+
+      - name: Build image from template
+        run: ./build-aws-arm-graal.sh --java-major 22 --copy-regions true --profile default --latest true
diff --git a/.github/workflows/aws-x86-graal-latest.yml b/.github/workflows/aws-x86-graal-latest.yml
new file mode 100644
index 0000000..01f9aac
--- /dev/null
+++ b/.github/workflows/aws-x86-graal-latest.yml
@@ -0,0 +1,38 @@
+name: AWS x86 graalvm latest
+on:
+  workflow_dispatch:
+
+permissions:
+      id-token: write
+      contents: read
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Packer
+        uses: hashicorp-contrib/setup-packer@v1
+        with:
+          packer-version: '1.7.8'
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_SELLER }}
+          aws-region: eu-west-3
+
+
+      - name: Build image from template
+        run: cd packer; packer init aws-x86-graal.pkr.hcl
+
+
+      - name: Build image from template
+        run: ./build-aws-x86-graal.sh --java-major 22 --copy-regions true --profile default --latest true
diff --git a/.github/workflows/aws-x86-graal22.yml b/.github/workflows/aws-x86-graal22.yml
index c326101..d0e2b35 100644
--- a/.github/workflows/aws-x86-graal22.yml
+++ b/.github/workflows/aws-x86-graal22.yml
@@ -1,4 +1,4 @@
-name: AWS x86 graal 22
+name: AWS x86 graalvm 22
 on:
   workflow_dispatch:
 
diff --git a/build-aws-arm-graal.sh b/build-aws-arm-graal.sh
index 31b5fac..caa6664 100755
--- a/build-aws-arm-graal.sh
+++ b/build-aws-arm-graal.sh
@@ -69,10 +69,10 @@ function run
 		unset AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_DEFAULT_REGION
 	fi
 
-	ami_description="classic-graalvm-$java_major"
+	ami_description="graalvm-openjdk-$java_major"
 	if [ $latest == "true" ]
 	then
-	    ami_description="classic-graalvm-latest"
+	    ami_description="graalvm-openjdk-latest"
 	fi
 
 	log info "AMI description: $ami_description"
diff --git a/build-aws-x86-graal.sh b/build-aws-x86-graal.sh
index 774e600..11c39f9 100755
--- a/build-aws-x86-graal.sh
+++ b/build-aws-x86-graal.sh
@@ -69,10 +69,10 @@ function run
 		unset AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_DEFAULT_REGION
 	fi
 
-	ami_description="classic-graalvm-$java_major"
+	ami_description="graalvm-openjdk-$java_major"
 	if [ $latest == "true" ]
 	then
-	    ami_description="classic-graalvm-latest"
+	    ami_description="graalvm-openjdk-latest"
 	fi
 
 	log info "AMI description: $ami_description"