mirror of https://github.com/rancher/dashboard.git
Minor tweaks to cloud update script and GH workflow script (#14477)
* Minor tweaks to cloud update script and GH workflow script * Fixes
This commit is contained in:
parent
449803238f
commit
c4606138de
|
|
@ -26,7 +26,7 @@ BODY_FILE=$(mktemp)
|
|||
# This script returns a non-zero error code if there are changes
|
||||
set +e
|
||||
${BASE_DIR}/scripts/aws/update-data > ${BODY_FILE}
|
||||
echo "\n" >> ${BODY_FILE}
|
||||
echo "" >> ${BODY_FILE} # Add blank line
|
||||
${BASE_DIR}/scripts/azure/update-data >> ${BODY_FILE}
|
||||
|
||||
cat ${BODY_FILE}
|
||||
|
|
|
|||
|
|
@ -149,13 +149,15 @@ axios.get(ENDPOINTS_URL, { responseType: 'document' }).then((res) => {
|
|||
}
|
||||
|
||||
const regions = findRegions(res.data);
|
||||
const govRegions = existing.filter((r) => r.startsWith(US_GOV));
|
||||
const existingCount = existing.length;
|
||||
|
||||
if (regions.length === 0) {
|
||||
console.error('Could not fetch data from Azure - no regions found');
|
||||
process.exit(2);
|
||||
}
|
||||
|
||||
console.log(`Existing regions in our codebase: ${ existing.length }`);
|
||||
console.log(`Existing regions in our codebase: ${ existingCount - govRegions.length } (Excluding US Government regions)`);
|
||||
console.log(existing);
|
||||
console.log('');
|
||||
|
||||
|
|
@ -173,6 +175,10 @@ axios.get(ENDPOINTS_URL, { responseType: 'document' }).then((res) => {
|
|||
}
|
||||
});
|
||||
|
||||
console.log('');
|
||||
console.log(`US Government regions to be retained: ${ govRegions.join(', ') }`);
|
||||
console.log('');
|
||||
|
||||
if (removed.length) {
|
||||
console.log(`These region(s) have been removed: ${ removed.join(', ') }`);
|
||||
}
|
||||
|
|
@ -192,6 +198,10 @@ axios.get(ENDPOINTS_URL, { responseType: 'document' }).then((res) => {
|
|||
if (added.length || removed.length) {
|
||||
// Sort the regions (needs a resort if we added back in usgov regions)
|
||||
writeNewFile(regions.sort());
|
||||
|
||||
console.log('');
|
||||
console.log(`Regions updated from ${ existingCount } to ${ regions.length }`);
|
||||
console.log('');
|
||||
} else {
|
||||
console.log('No changes to the Azure region data');
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue