@ibm-cloud/cd-tools 1.15.3 → 1.15.4
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.
|
@@ -160,9 +160,24 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
|
|
|
160
160
|
|
|
161
161
|
// STEP 2/2: run terraform import and post-processing
|
|
162
162
|
setTerraformEnv(apiKey, verbosity);
|
|
163
|
-
await runTerraformPlanGenerate(dir, 'generated/draft.tf').catch((err) => { DEBUG_MODE && logger.dump(`\n[DEBUG_MODE=true] Draft errors: ${err}`) }); // temp fix for errors before post-processing
|
|
164
163
|
|
|
165
|
-
|
|
164
|
+
let draftErrors = '';
|
|
165
|
+
await runTerraformPlanGenerate(dir, 'generated/draft.tf').catch((err) => {
|
|
166
|
+
if (DEBUG_MODE) logger.dump(`\n[DEBUG_MODE=true] Draft errors: ${err}`);
|
|
167
|
+
draftErrors = err;
|
|
168
|
+
});
|
|
169
|
+
// above is a temp fix for errors before post-processing
|
|
170
|
+
// empty pipeline_id and trigger_id are expected and is a known provider bug
|
|
171
|
+
|
|
172
|
+
let generatedFile = '';
|
|
173
|
+
try {
|
|
174
|
+
generatedFile = fs.readFileSync(`${dir}/generated/draft.tf`);
|
|
175
|
+
} catch (err) {
|
|
176
|
+
// if draft file is missing, then something went wrong
|
|
177
|
+
// also, no need to log draft errors twice
|
|
178
|
+
throw new Error(err + (!DEBUG_MODE ? ('\nDraft errors: ' + draftErrors) : '\nDraft errors already logged'));
|
|
179
|
+
}
|
|
180
|
+
|
|
166
181
|
const generatedFileJson = await tfToJson('draft.tf', generatedFile.toString());
|
|
167
182
|
|
|
168
183
|
const newTfFileObj = { 'resource': {} }
|