Moved from curl to direct approach

Installing the script and executing it
rs-workspace · Oct 13, 2024 · 27349f8 · 27349f8
1 parent 612787e
commit 27349f8
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 35 deletions.
diff --git a/__tests__/toolchain_install.test.ts b/__tests__/toolchain_install.test.ts
@@ -45,11 +45,16 @@ describe('install_toolchain', () => {
       'rustup-init.exe'
     )
 
-    expect(mockedExec).toHaveBeenCalledWith(
-      './rustup-init.exe -v --default-toolchain stable --profile minimal -y'
-    )
-
-    expect(mockedExec).toHaveBeenCalledWith('rm rustup-init.exe')
+    expect(mockedExec).toHaveBeenCalledWith('./rustup-init.exe', [
+      '-v',
+      '--default-toolchain',
+      'stable',
+      '--profile',
+      'minimal',
+      '-y'
+    ])
+
+    expect(mockedExec).toHaveBeenCalledWith('rm ./rustup-init.exe')
   })
 
   test('should install Rust on Windows ia32', async () => {
@@ -65,19 +70,24 @@ describe('install_toolchain', () => {
       'rustup-init.exe'
     )
 
-    expect(mockedExec).toHaveBeenCalledWith(
-      './rustup-init.exe -v --default-toolchain stable --profile minimal -y'
-    )
+    expect(mockedExec).toHaveBeenCalledWith('./rustup-init.exe', [
+      '-v',
+      '--default-toolchain',
+      'stable',
+      '--profile',
+      'minimal',
+      '-y'
+    ])
 
-    expect(mockedExec).toHaveBeenCalledWith('rm rustup-init.exe')
+    expect(mockedExec).toHaveBeenCalledWith('rm ./rustup-init.exe')
   })
 
   test('should throw an error for unsupported architecture on Windows', async () => {
     platform.isWindows = true
     platform.arch = 'unsupported_arch'
 
     await expect(install_toolchain(properties, platform)).rejects.toThrow(
-      "Unsupported Platform Architecture unsupported_arch. Supported Architecture are 'x64' and 'ia32' for windows OS."
+      "Unsupported Platform Architecture 'unsupported_arch'. Supported Architecture are 'x64' and 'ia32' for windows OS."
     )
 
     expect(mockedDownloadFile).not.toHaveBeenCalled()
@@ -89,10 +99,23 @@ describe('install_toolchain', () => {
 
     await install_toolchain(properties, platform)
 
-    expect(mockedDownloadFile).not.toHaveBeenCalled()
-    expect(mockedExec).toHaveBeenCalledWith(
-      'curl --proto https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -v --default-toolchain stable --profile minimal -y'
+    expect(mockedDownloadFile).toHaveBeenCalledWith(
+      new URL('https://sh.rustup.rs'),
+      'rustup.sh'
     )
+
+    expect(mockedExec).toHaveBeenCalledWith('chmod a+x ./rustup.sh')
+
+    expect(mockedExec).toHaveBeenCalledWith('./rustup.sh', [
+      '-v',
+      '--default-toolchain',
+      'stable',
+      '--profile',
+      'minimal',
+      '-y'
+    ])
+
+    expect(mockedExec).toHaveBeenCalledWith('rm ./rustup.sh')
   })
 
   test('should handle errors thrown by download_rust', async () => {
@@ -106,5 +129,6 @@ describe('install_toolchain', () => {
     )
 
     expect(mockedDownloadFile).toHaveBeenCalledTimes(1)
+    expect(mockedExec).not.toHaveBeenCalled()
   })
 })
diff --git a/badges/coverage.svg b/badges/coverage.svg
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/toolchain.ts b/src/toolchain.ts
@@ -53,23 +53,34 @@ async function download_rust(
         )
       } else {
         throw new Error(
-          `Unsupported Platform Architecture ${platform.arch}. Supported Architecture are 'x64' and 'ia32' for windows OS.`
+          `Unsupported Platform Architecture '${platform.arch}'. Supported Architecture are 'x64' and 'ia32' for windows OS.`
         )
       }
-
-      // install rust via installer
-      await exec.exec(
-        `./rustup-init.exe -v --default-toolchain ${properties.rust_toolchain} --profile ${properties.profile} -y`
-      )
-
-      // uninstall the installer
-      await exec.exec('rm rustup-init.exe')
     } else {
-      // Install installer via direct script and download rust
-      await exec.exec(
-        `curl --proto https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -v --default-toolchain ${properties.rust_toolchain} --profile ${properties.profile} -y`
-      )
+      // Download rust installation script
+      await download_file(new URL('https://sh.rustup.rs'), 'rustup.sh')
+
+      // Give Execute Permission to script
+      await exec.exec('chmod a+x ./rustup.sh')
     }
+
+    // Install rust
+    await exec.exec(
+      `${platform.isWindows ? './rustup-init.exe' : './rustup.sh'}`,
+      [
+        '-v',
+        '--default-toolchain',
+        properties.rust_toolchain,
+        '--profile',
+        properties.profile,
+        '-y'
+      ]
+    )
+
+    // Uninstall script or installer
+    await exec.exec(
+      `rm ${platform.isWindows ? './rustup-init.exe' : './rustup.sh'}`
+    )
   } catch (error) {
     if (error instanceof Error) throw error
   }