Revert "Fix: replace of podspec variables in podfile (apache#1126)"

This reverts commit 70d128a.
viviedu · Apr 24, 2024 · 127162e · 127162e
1 parent f4b4b86
commit 127162e
Showing 1 changed file with 8 additions and 17 deletions.
diff --git a/lib/Api.js b/lib/Api.js
@@ -49,19 +49,6 @@ function getVariableSpec (spec, options) {
     return spec.includes('$') ? options.cli_variables[spec.replace('$', '')] : spec;
 }
 
-// Replaces all pod specs available
-function replacePodSpecVariables (pod, options) {
-    const podSpecs = ['spec', 'tag', 'git', 'commit', 'branch'];
-
-    podSpecs.filter(e => pod[e])
-        .forEach(obj => {
-            const value = pod[obj];
-            pod[obj] = getVariableSpec(value, options);
-        });
-
-    return pod;
-}
-
 class Api {
     /**
      * Creates a new PlatformApi instance.
@@ -395,8 +382,10 @@ class Api {
                 // libraries
                 if (obj.libraries) {
                     Object.keys(obj.libraries).forEach(key => {
-                        let podJson = Object.assign({}, obj.libraries[key]);
-                        podJson = replacePodSpecVariables(podJson, installOptions);
+                        const podJson = Object.assign({}, obj.libraries[key]);
+                        if (podJson.spec) {
+                            podJson.spec = getVariableSpec(podJson.spec, installOptions);
+                        }
                         const val = podsjsonFile.getLibrary(key);
                         if (val) {
                             events.emit('warn', `${plugin.id} depends on ${podJson.name}, which may conflict with another plugin. ${podJson.name}@${val.spec} is already installed and was not overwritten.`);
@@ -516,8 +505,10 @@ class Api {
                 });
                 // libraries
                 Object.keys(obj.libraries).forEach(key => {
-                    let podJson = Object.assign({}, obj.libraries[key]);
-                    podJson = replacePodSpecVariables(podJson, uninstallOptions);
+                    const podJson = Object.assign({}, obj.libraries[key]);
+                    if (podJson.spec) {
+                        podJson.spec = getVariableSpec(podJson.spec, uninstallOptions);
+                    }
                     const val = podsjsonFile.getLibrary(key);
                     if (val) {
                         podsjsonFile.decrementLibrary(key);