@catladder/cli 0.0.0-next-7c1dcdcf → 0.0.0-next-d1a79e22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundles/catenv/index.js +26 -35
- package/dist/bundles/cli/index.js +26 -35
- package/dist/cli/src/config/getProjectConfig.js +14 -26
- package/dist/cli/src/config/getProjectConfig.js.map +1 -1
- package/dist/pipeline/src/bash/bashEscape.d.ts +7 -5
- package/dist/pipeline/src/bash/bashEscape.js +10 -8
- package/dist/pipeline/src/bash/bashEscape.js.map +1 -1
- package/dist/pipeline/src/context/getEnvConfig.js +2 -1
- package/dist/pipeline/src/context/getEnvConfig.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/config/getProjectConfig.ts +16 -25
package/package.json
CHANGED
|
@@ -155,21 +155,17 @@ export const getEnvVarsResolved = async (
|
|
|
155
155
|
if (!componentName) {
|
|
156
156
|
return {};
|
|
157
157
|
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
} catch (e) {
|
|
170
|
-
// env is disabled
|
|
171
|
-
return {};
|
|
172
|
-
}
|
|
158
|
+
|
|
159
|
+
const envionment = await getEnvironment(env, componentName);
|
|
160
|
+
|
|
161
|
+
// in the pipeline the secrets alreadyy exists and bash will expand them
|
|
162
|
+
// but here we need to manually load them
|
|
163
|
+
return resolveSecrets(vorpal, [
|
|
164
|
+
{
|
|
165
|
+
envVars: envionment.envVars,
|
|
166
|
+
secretEnvVarKeys: envionment.secretEnvVarKeys,
|
|
167
|
+
},
|
|
168
|
+
]);
|
|
173
169
|
};
|
|
174
170
|
|
|
175
171
|
/**
|
|
@@ -181,14 +177,9 @@ export const getJobOnlyEnvVarsResolved = async (
|
|
|
181
177
|
env: string,
|
|
182
178
|
componentName: string,
|
|
183
179
|
) => {
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
]);
|
|
190
|
-
} catch (e) {
|
|
191
|
-
// env is disabled
|
|
192
|
-
return {};
|
|
193
|
-
}
|
|
180
|
+
const envionment = await getEnvironment(env, componentName);
|
|
181
|
+
return resolveSecrets(vorpal, [
|
|
182
|
+
envionment.jobOnlyVars.build,
|
|
183
|
+
envionment.jobOnlyVars.deploy,
|
|
184
|
+
]);
|
|
194
185
|
};
|