From 5db923b426edc412ed69ae9ed0a93008bc07a472 Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Wed, 18 Dec 2024 00:32:12 -0800
Subject: [PATCH] Stop installing the js2wasm plugin

The latest Spin JS SDK no longer uses it, and the upstream spin installer
no longer installs it by default: https://github.com/fermyon/developer/pull/1357

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
(cherry picked from commit dcf46c54f0ea92418b034af6471ae47cbf8a5bed)
---
 bats/tests/utils/spin.bats                                   | 2 --
 pkg/rancher-desktop/assets/dependencies.yaml                 | 1 -
 pkg/rancher-desktop/backend/lima.ts                          | 5 ++---
 pkg/rancher-desktop/backend/wsl.ts                           | 5 ++---
 .../integrations/windowsIntegrationManager.ts                | 5 ++---
 resources/setup-spin                                         | 1 -
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/bats/tests/utils/spin.bats b/bats/tests/utils/spin.bats
index 91c5749c400..f56f7263108 100644
--- a/bats/tests/utils/spin.bats
+++ b/bats/tests/utils/spin.bats
@@ -41,8 +41,6 @@ dir_exists() {
 }
 
 @test 'plugins are installed' {
-    run dir_exists "${SPIN_DATA_DIR}/plugins/js2wasm"
-    assert_success
     run dir_exists "${SPIN_DATA_DIR}/plugins/kube"
     assert_success
 }
diff --git a/pkg/rancher-desktop/assets/dependencies.yaml b/pkg/rancher-desktop/assets/dependencies.yaml
index 121dfc7bf50..788a18f9fea 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -25,4 +25,3 @@ spinOperator: 0.4.0
 certManager: 1.16.3
 spinCLI: 3.1.2
 spinKubePlugin: 0.3.1
-js2wasmPlugin: 0.6.1
diff --git a/pkg/rancher-desktop/backend/lima.ts b/pkg/rancher-desktop/backend/lima.ts
index 8575eee887d..c852d7a4faa 100644
--- a/pkg/rancher-desktop/backend/lima.ts
+++ b/pkg/rancher-desktop/backend/lima.ts
@@ -1512,9 +1512,8 @@ export default class LimaBackend extends events.EventEmitter implements VMBacken
         const version = semver.parse(DEPENDENCY_VERSIONS.spinCLI);
         const env = {
           ...process.env,
-          KUBE_PLUGIN_VERSION:    DEPENDENCY_VERSIONS.spinKubePlugin,
-          JS2WASM_PLUGIN_VERSION: DEPENDENCY_VERSIONS.js2wasmPlugin,
-          SPIN_TEMPLATE_BRANCH:   (version ? `v${ version.major }.${ version.minor }` : 'main'),
+          KUBE_PLUGIN_VERSION:  DEPENDENCY_VERSIONS.spinKubePlugin,
+          SPIN_TEMPLATE_BRANCH: (version ? `v${ version.major }.${ version.minor }` : 'main'),
         };
 
         promises.push(this.spawnWithCapture(executable('setup-spin'), { env }));
diff --git a/pkg/rancher-desktop/backend/wsl.ts b/pkg/rancher-desktop/backend/wsl.ts
index 10515d23b4a..6706a577ed4 100644
--- a/pkg/rancher-desktop/backend/wsl.ts
+++ b/pkg/rancher-desktop/backend/wsl.ts
@@ -1345,9 +1345,8 @@ export default class WSLBackend extends events.EventEmitter implements VMBackend
                 try {
                   const version = semver.parse(DEPENDENCY_VERSIONS.spinCLI);
                   const env = {
-                    KUBE_PLUGIN_VERSION:    DEPENDENCY_VERSIONS.spinKubePlugin,
-                    JS2WASM_PLUGIN_VERSION: DEPENDENCY_VERSIONS.js2wasmPlugin,
-                    SPIN_TEMPLATE_BRANCH:   (version ? `v${ version.major }.${ version.minor }` : 'main'),
+                    KUBE_PLUGIN_VERSION:  DEPENDENCY_VERSIONS.spinKubePlugin,
+                    SPIN_TEMPLATE_BRANCH: (version ? `v${ version.major }.${ version.minor }` : 'main'),
                   };
                   const wslenv = Object.keys(env).join(':');
 
diff --git a/pkg/rancher-desktop/integrations/windowsIntegrationManager.ts b/pkg/rancher-desktop/integrations/windowsIntegrationManager.ts
index 447f948d7a5..74eb2d1ba6c 100644
--- a/pkg/rancher-desktop/integrations/windowsIntegrationManager.ts
+++ b/pkg/rancher-desktop/integrations/windowsIntegrationManager.ts
@@ -524,9 +524,8 @@ export default class WindowsIntegrationManager implements IntegrationManager {
     if (state && this.settings.experimental?.containerEngine?.webAssembly) {
       const version = semver.parse(DEPENDENCY_VERSIONS.spinCLI);
       const env = {
-        KUBE_PLUGIN_VERSION:    DEPENDENCY_VERSIONS.spinKubePlugin,
-        JS2WASM_PLUGIN_VERSION: DEPENDENCY_VERSIONS.js2wasmPlugin,
-        SPIN_TEMPLATE_BRANCH:   (version ? `v${ version.major }.${ version.minor }` : 'main'),
+        KUBE_PLUGIN_VERSION:  DEPENDENCY_VERSIONS.spinKubePlugin,
+        SPIN_TEMPLATE_BRANCH: (version ? `v${ version.major }.${ version.minor }` : 'main'),
       };
       const wslenv = Object.keys(env).join(':');
 
diff --git a/resources/setup-spin b/resources/setup-spin
index 3d6006a39d7..fb028411966 100755
--- a/resources/setup-spin
+++ b/resources/setup-spin
@@ -53,7 +53,6 @@ install_templates spin "${SPIN_TEMPLATE_BRANCH:-main}"
 install_templates spin-python-sdk main
 install_templates spin-js-sdk main
 
-install_plugin js2wasm "${JS2WASM_PLUGIN_VERSION:-0.6.1}"
 install_plugin kube "${KUBE_PLUGIN_VERSION:-0.3.1}"
 
 echo "'${spin}' setup complete"