From e169777d50c486014ebcb377f0cda7ae3bee5584 Mon Sep 17 00:00:00 2001
From: Wes Morgan <git@wesmorgan.me>
Date: Wed, 31 Aug 2022 13:05:33 -0600
Subject: [PATCH] Refactor arch mapping to distributionArchitecture method

---
 src/distributions/base-installer.ts    |  4 ++++
 src/distributions/temurin/installer.ts | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/distributions/base-installer.ts b/src/distributions/base-installer.ts
index 65e2f3b2..fe5fcdc6 100644
--- a/src/distributions/base-installer.ts
+++ b/src/distributions/base-installer.ts
@@ -149,4 +149,8 @@ export abstract class JavaBase {
     core.setOutput('path', toolPath);
     core.setOutput('version', version);
   }
+
+  protected distributionArchitecture(): string {
+    return this.architecture;
+  }
 }
diff --git a/src/distributions/temurin/installer.ts b/src/distributions/temurin/installer.ts
index ad61faee..598cdba9 100644
--- a/src/distributions/temurin/installer.ts
+++ b/src/distributions/temurin/installer.ts
@@ -20,7 +20,6 @@ export class TemurinDistribution extends JavaBase {
     private readonly jvmImpl: TemurinImplementation
   ) {
     super(`Temurin-${jvmImpl}`, installerOptions);
-    installerOptions.architecture = this.osArchToDistributionArch(installerOptions.architecture);
   }
 
   protected async findPackageForDownload(version: string): Promise<JavaDownloadRelease> {
@@ -87,7 +86,7 @@ export class TemurinDistribution extends JavaBase {
 
   private async getAvailableVersions(): Promise<ITemurinAvailableVersions[]> {
     const platform = this.getPlatformOption();
-    const arch = this.architecture;
+    const arch = this.distributionArchitecture();
     const imageType = this.packageType;
     const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
     const releaseType = this.stable ? 'ga' : 'ea';
@@ -154,8 +153,9 @@ export class TemurinDistribution extends JavaBase {
     }
   }
 
-  private osArchToDistributionArch(osArch: string): string {
-    switch (osArch) {
+  protected distributionArchitecture(): string {
+    // Temurin has own architecture names so need to map them
+    switch (this.architecture) {
       case 'amd64':
         return 'x64';
       case 'ia32':
@@ -163,7 +163,7 @@ export class TemurinDistribution extends JavaBase {
       case 'arm64':
         return 'aarch64';
       default:
-        return osArch;
+        return this.architecture;
     }
   }
 }