From a4a92c6cce66422350af923b345602fc719026f7 Mon Sep 17 00:00:00 2001
From: Daniel Widdis <widdis@gmail.com>
Date: Sat, 16 Jul 2022 22:27:54 -0700
Subject: [PATCH] Don't use X86 for non-x86 arhitectures

Signed-off-by: Daniel Widdis <widdis@gmail.com>
---
 .../java/org/opensearch/gradle/Architecture.java     | 12 ++++++++----
 .../org/opensearch/gradle/ArchitectureTests.java     |  7 +++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/Architecture.java b/buildSrc/src/main/java/org/opensearch/gradle/Architecture.java
index 2c70c4fbfc8de..4022362ba18a4 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/Architecture.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/Architecture.java
@@ -35,19 +35,23 @@
 public enum Architecture {
 
     X64,
-    ARM64;
+    ARM64,
+    PPC,
+    RISCV;
 
     public static Architecture current() {
         final String architecture = System.getProperty("os.arch", "");
         switch (architecture) {
             case "amd64":
             case "x86_64":
-            case "ppc64":
-            case "ppc64le":
-            case "riscv64":
                 return X64;
             case "aarch64":
                 return ARM64;
+            case "ppc64":
+            case "ppc64le":
+                return PPC;
+            case "riscv64":
+                return RISCV;
             default:
                 throw new IllegalArgumentException("can not determine architecture from [" + architecture + "]");
         }
diff --git a/buildSrc/src/test/java/org/opensearch/gradle/ArchitectureTests.java b/buildSrc/src/test/java/org/opensearch/gradle/ArchitectureTests.java
index ba4dadf0d6b6a..eae333b59457e 100644
--- a/buildSrc/src/test/java/org/opensearch/gradle/ArchitectureTests.java
+++ b/buildSrc/src/test/java/org/opensearch/gradle/ArchitectureTests.java
@@ -17,11 +17,10 @@ public class ArchitectureTests extends GradleUnitTestCase {
     public void testCurrentArchitecture() {
         assertEquals(Architecture.X64, currentArchitecture("amd64"));
         assertEquals(Architecture.X64, currentArchitecture("x86_64"));
-        assertEquals(Architecture.X64, currentArchitecture("ppc64"));
-        assertEquals(Architecture.X64, currentArchitecture("ppc64le"));
-        assertEquals(Architecture.X64, currentArchitecture("riscv64"));
-
         assertEquals(Architecture.ARM64, currentArchitecture("aarch64"));
+        assertEquals(Architecture.PPC, currentArchitecture("ppc64"));
+        assertEquals(Architecture.PPC, currentArchitecture("ppc64le"));
+        assertEquals(Architecture.RISCV, currentArchitecture("riscv64"));
     }
 
     public void testInvalidCurrentArchitecture() {