From ad448b8f9df777ca4e25a22f34bef787378fcd7a Mon Sep 17 00:00:00 2001
From: ascopes <73482956+ascopes@users.noreply.github.com>
Date: Sun, 12 Nov 2023 13:46:42 +0000
Subject: [PATCH] Fix amd64 detection on Windows and MacOS

---
 .../resolver/MavenProtocCoordinateFactory.java                | 4 +++-
 .../resolver/MavenProtocCoordinateFactoryTest.java            | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/resolver/MavenProtocCoordinateFactory.java b/src/main/java/io/github/ascopes/protobufmavenplugin/resolver/MavenProtocCoordinateFactory.java
index 95a8e164..94ae666f 100644
--- a/src/main/java/io/github/ascopes/protobufmavenplugin/resolver/MavenProtocCoordinateFactory.java
+++ b/src/main/java/io/github/ascopes/protobufmavenplugin/resolver/MavenProtocCoordinateFactory.java
@@ -73,11 +73,12 @@ private String determineArchitectureForWindows() throws ProtocResolutionExceptio
     var arch = HostEnvironment.cpuArchitecture();
 
     switch (arch) {
+      case "amd64":
       case "x86_64":
         return "x86_64";
 
-      case "x86_32":
       case "x86":
+      case "x86_32":
         return "x86_32";
 
       default:
@@ -116,6 +117,7 @@ private String determineArchitectureForMacOs() {
       case "aarch64":
         return "aarch_64";
 
+      case "amd64":
       case "x86_64":
         return "x86_64";
 
diff --git a/src/test/java/io/github/ascopes/protobufmavenplugin/resolver/MavenProtocCoordinateFactoryTest.java b/src/test/java/io/github/ascopes/protobufmavenplugin/resolver/MavenProtocCoordinateFactoryTest.java
index 44225caa..4d44adf9 100644
--- a/src/test/java/io/github/ascopes/protobufmavenplugin/resolver/MavenProtocCoordinateFactoryTest.java
+++ b/src/test/java/io/github/ascopes/protobufmavenplugin/resolver/MavenProtocCoordinateFactoryTest.java
@@ -40,7 +40,9 @@ void setUp() {
 
   @DisplayName("Supported Windows architectures resolve correctly")
   @CsvSource({
+      " amd64, windows-x86_64",
       "x86_64, windows-x86_64",
+      "x86, windows-x86_32",
       "x86_32, windows-x86_32",
   })
   @ParameterizedTest(name = "for architecture {0}, expect classifier matching \"{1}\"")
@@ -119,6 +121,7 @@ void unsupportedLinuxArchitecturesResultInException() {
   @DisplayName("Supported Mac OS architectures resolve correctly")
   @CsvSource({
       "aarch64, osx-aarch_64",
+      "  amd64,   osx-x86_64",
       " x86_64,   osx-x86_64",
   })
   @ParameterizedTest(name = "for architecture {0}, expect classifier matching \"{1}\"")