[Fix] Add platform "darwin-arm64" to unit test (#5290) (#5317)

* Add platform "darwin-arm64" to unit test * Update related snapshots --------- Signed-off-by: Willie Hung <[email protected]> Signed-off-by: Josh Romero <[email protected]> Co-authored-by: Josh Romero <[email protected]> (cherry picked from commit 7b3a9f6) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Nov 13, 2023 · ba20c9f · ba20c9f
1 parent fe1075b
commit ba20c9f
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 5 deletions.
diff --git a/src/dev/build/lib/config.test.ts b/src/dev/build/lib/config.test.ts
@@ -52,6 +52,7 @@ const setup = async ({
   targetAllPlatforms = true,
   targetPlatforms = {
     darwin: false,
+    darwinArm: false,
     linux: false,
     linuxArm: false,
     windows: false,
@@ -60,6 +61,7 @@ const setup = async ({
   targetAllPlatforms?: boolean;
   targetPlatforms?: {
     darwin: boolean;
+    darwinArm: boolean;
     linux: boolean;
     linuxArm: boolean;
     windows: boolean;
@@ -89,9 +91,7 @@ describe('#getNodeRange()', () => {
 describe('#getRepoRelativePath()', () => {
   it('converts an absolute path to relative path, from the root of the repo', async () => {
     const config = await setup();
-    expect(config.getRepoRelativePath(__dirname)).toMatchInlineSnapshot(
-      `"${standardize('src/dev/build/lib', false, true)}"`
-    );
+    expect(config.getRepoRelativePath(__dirname)).toMatchInlineSnapshot(`"src/dev/build/lib"`);
   });
 });
 
@@ -117,6 +117,7 @@ describe('#hasSpecifiedPlatform', () => {
       targetAllPlatforms: false,
       targetPlatforms: {
         darwin: true,
+        darwinArm: false,
         linux: false,
         linuxArm: false,
         windows: false,
@@ -130,6 +131,7 @@ describe('#hasSpecifiedPlatform', () => {
       targetAllPlatforms: false,
       targetPlatforms: {
         darwin: false,
+        darwinArm: false,
         linux: false,
         linuxArm: true,
         windows: false,
@@ -143,6 +145,7 @@ describe('#hasSpecifiedPlatform', () => {
       targetAllPlatforms: false,
       targetPlatforms: {
         darwin: false,
+        darwinArm: false,
         linux: true,
         linuxArm: false,
         windows: false,
@@ -197,6 +200,7 @@ describe('#getTargetPlatforms()', () => {
         .sort()
     ).toMatchInlineSnapshot(`
       Array [
+        "darwin-arm64",
         "darwin-x64",
         "linux-arm64",
         "linux-x64",
@@ -210,6 +214,7 @@ describe('#getTargetPlatforms()', () => {
       targetAllPlatforms: false,
       targetPlatforms: {
         darwin: true,
+        darwinArm: false,
         linux: false,
         linuxArm: false,
         windows: false,
@@ -233,6 +238,7 @@ describe('#getTargetPlatforms()', () => {
       targetAllPlatforms: false,
       targetPlatforms: {
         darwin: false,
+        darwinArm: false,
         linux: true,
         linuxArm: false,
         windows: false,
@@ -256,6 +262,7 @@ describe('#getTargetPlatforms()', () => {
       targetAllPlatforms: false,
       targetPlatforms: {
         darwin: false,
+        darwinArm: false,
         linux: false,
         linuxArm: true,
         windows: false,
@@ -279,6 +286,7 @@ describe('#getTargetPlatforms()', () => {
       targetAllPlatforms: false,
       targetPlatforms: {
         darwin: true,
+        darwinArm: false,
         linux: false,
         linuxArm: true,
         windows: false,
@@ -315,7 +323,7 @@ describe('#getNodePlatforms()', () => {
         .getTargetPlatforms()
         .map((p) => p.getNodeArch())
         .sort()
-    ).toEqual(['darwin-x64', 'linux-arm64', 'linux-x64', 'win32-x64']);
+    ).toEqual(['darwin-arm64', 'darwin-x64', 'linux-arm64', 'linux-x64', 'win32-x64']);
   });
 
   it('returns this platform and linux, when targetAllPlatforms = false', async () => {

diff --git a/src/dev/build/lib/config.ts b/src/dev/build/lib/config.ts
@@ -155,9 +155,10 @@ export class Config {
 
     const platforms: Platform[] = [];
     if (this.targetPlatforms.darwin) platforms.push(this.getPlatform('darwin', 'x64'));
+    if (this.targetPlatforms.darwinArm) platforms.push(this.getPlatform('darwin', 'arm64'));
     if (this.targetPlatforms.linux) platforms.push(this.getPlatform('linux', 'x64'));
-    if (this.targetPlatforms.windows) platforms.push(this.getPlatform('win32', 'x64'));
     if (this.targetPlatforms.linuxArm) platforms.push(this.getPlatform('linux', 'arm64'));
+    if (this.targetPlatforms.windows) platforms.push(this.getPlatform('win32', 'x64'));
 
     if (platforms.length > 0) return platforms;
 

diff --git a/src/dev/build/lib/platform.ts b/src/dev/build/lib/platform.ts
@@ -33,6 +33,7 @@ export type PlatformArchitecture = 'x64' | 'arm64';
 
 export interface TargetPlatforms {
   darwin: boolean;
+  darwinArm: boolean;
   linuxArm: boolean;
   linux: boolean;
   windows: boolean;
@@ -78,5 +79,6 @@ export const ALL_PLATFORMS = [
   new Platform('linux', 'x64', 'linux-x64'),
   new Platform('linux', 'arm64', 'linux-arm64'),
   new Platform('darwin', 'x64', 'darwin-x64'),
+  new Platform('darwin', 'arm64', 'darwin-arm64'),
   new Platform('win32', 'x64', 'windows-x64'),
 ];
diff --git a/src/dev/build/tasks/nodejs/download_node_builds_task.test.ts b/src/dev/build/tasks/nodejs/download_node_builds_task.test.ts
@@ -137,6 +137,15 @@ it('downloads node builds for each platform', async () => {
           "url": "darwin:url",
         },
       ],
+      Array [
+        Object {
+          "destination": "darwin:downloadPath",
+          "log": <ToolingLog>,
+          "retries": 3,
+          "sha256": "darwin:sha256",
+          "url": "darwin:url",
+        },
+      ],
       Array [
         Object {
           "destination": "win32:downloadPath",
@@ -173,6 +182,15 @@ it('downloads node builds for each platform', async () => {
           "url": "https://mirrors.nodejs.org/dist/v14.21.3/node-v14.21.3-darwin-x64.tar.gz",
         },
       ],
+      Array [
+        Object {
+          "destination": "/mocked/path/.node_binaries/14.21.3/node-v14.21.3-darwin-arm64.tar.gz",
+          "log": <ToolingLog>,
+          "retries": 3,
+          "sha256": undefined,
+          "url": "https://mirrors.nodejs.org/dist/v14.21.3/node-v14.21.3-darwin-arm64.tar.gz",
+        },
+      ],
       Array [
         Object {
           "destination": "/mocked/path/.node_binaries/14.21.3/node-v14.21.3-win32-x64.tar.gz",

diff --git a/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts b/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts
@@ -123,6 +123,13 @@ it('runs expected fs operations', async () => {
             "strip": 1,
           },
         ],
+        Array [
+          <absolute path>/.node_binaries/<node version>/node-v<node version>-darwin-arm64.tar.gz,
+          <absolute path>/.node_binaries/<node version>/darwin-arm64,
+          Object {
+            "strip": 1,
+          },
+        ],
         Array [
           <absolute path>/.node_binaries/14.21.3/node-v14.21.3-linux-x64.tar.gz,
           <absolute path>/.node_binaries/14.21.3/linux-x64,
@@ -144,6 +151,13 @@ it('runs expected fs operations', async () => {
             "strip": 1,
           },
         ],
+        Array [
+          <absolute path>/.node_binaries/14.21.3/node-v14.21.3-darwin-arm64.tar.gz,
+          <absolute path>/.node_binaries/14.21.3/darwin-arm64,
+          Object {
+            "strip": 1,
+          },
+        ],
       ],
       "unzip": Array [
         Array [

diff --git a/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts b/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts
@@ -120,6 +120,7 @@ it('checks shasums for each downloaded node build', async () => {
         Object {
           "type": "return",
           "value": Object {
+            "darwin:darwin-arm64:downloadName": "valid shasum",
             "darwin:darwin-x64:downloadName": "valid shasum",
             "linux:linux-arm64:downloadName": "valid shasum",
             "linux:linux-x64:downloadName": "valid shasum",
@@ -156,6 +157,14 @@ it('checks shasums for each downloaded node build', async () => {
             "name": "darwin",
           },
         ],
+        Array [
+          <Config>,
+          Platform {
+            "architecture": "arm64",
+            "buildName": "darwin-arm64",
+            "name": "darwin",
+          },
+        ],
         Array [
           <Config>,
           Platform {
@@ -190,6 +199,14 @@ it('checks shasums for each downloaded node build', async () => {
             "version": "<node version>",
           },
         },
+        Object {
+          "type": "return",
+          "value": Object {
+            "downloadName": "darwin:darwin-arm64:downloadName",
+            "downloadPath": "darwin:darwin-arm64:downloadPath",
+            "version": "<node version>",
+          },
+        },
         Object {
           "type": "return",
           "value": Object {
@@ -216,6 +233,10 @@ it('checks shasums for each downloaded node build', async () => {
           "darwin:darwin-x64:downloadPath",
           "sha256",
         ],
+        Array [
+          "darwin:darwin-arm64:downloadPath",
+          "sha256",
+        ],
         Array [
           "win32:win32-x64:downloadPath",
           "sha256",
@@ -238,6 +259,10 @@ it('checks shasums for each downloaded node build', async () => {
           "type": "return",
           "value": "valid shasum",
         },
+        Object {
+          "type": "return",
+          "value": "valid shasum",
+        },
       ],
     }
   `);