fixes
parent
daf733d898
commit
3be46f0967
|
|
@ -603,11 +603,23 @@ class CLI {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
static garbageCollectAws() {
|
static garbageCollectAws() {
|
||||||
|
var _a;
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
process.env.AWS_REGION = __1.Input.region;
|
process.env.AWS_REGION = __1.Input.region;
|
||||||
const CF = new SDK.CloudFormation();
|
const CF = new SDK.CloudFormation();
|
||||||
const stacks = yield CF.listStacks().promise();
|
const stacks = (_a = (yield CF.listStacks().promise()).StackSummaries) === null || _a === void 0 ? void 0 : _a.filter((_x) => _x.StackStatus !== 'DELETE_COMPLETE');
|
||||||
cloud_runner_logger_1.default.log(JSON.stringify(stacks, undefined, 4));
|
if (stacks === undefined) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
cloud_runner_logger_1.default.log(`Cloud Formation stacks`);
|
||||||
|
for (const element of stacks) {
|
||||||
|
cloud_runner_logger_1.default.log(JSON.stringify(element, undefined, 4));
|
||||||
|
yield CF.deleteStack({ StackName: element.StackName }).promise();
|
||||||
|
}
|
||||||
|
cloud_runner_logger_1.default.log(`ECS Clusters`);
|
||||||
|
const ecs = new SDK.ECS();
|
||||||
|
cloud_runner_logger_1.default.log(JSON.stringify(yield ecs.listClusters().promise(), undefined, 4));
|
||||||
|
cloud_runner_logger_1.default.log(JSON.stringify(yield ecs.describeClusters().promise(), undefined, 4));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1858,10 +1870,11 @@ class CloudRunner {
|
||||||
CloudRunner.defaultSecrets = task_parameter_serializer_1.TaskParameterSerializer.readDefaultSecrets();
|
CloudRunner.defaultSecrets = task_parameter_serializer_1.TaskParameterSerializer.readDefaultSecrets();
|
||||||
CloudRunner.cloudRunnerEnvironmentVariables = task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables();
|
CloudRunner.cloudRunnerEnvironmentVariables = task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables();
|
||||||
if (!buildParameters.cliMode) {
|
if (!buildParameters.cliMode) {
|
||||||
|
const buildParameterPropertyNames = Object.getOwnPropertyNames(buildParameters);
|
||||||
for (const element of CloudRunner.cloudRunnerEnvironmentVariables) {
|
for (const element of CloudRunner.cloudRunnerEnvironmentVariables) {
|
||||||
core.setOutput(__1.Input.ToEnvVarFormat(element.name), element.value);
|
core.setOutput(__1.Input.ToEnvVarFormat(element.name), element.value);
|
||||||
}
|
}
|
||||||
for (const element in buildParameters) {
|
for (const element of buildParameterPropertyNames) {
|
||||||
core.setOutput(__1.Input.ToEnvVarFormat(element), buildParameters[element]);
|
core.setOutput(__1.Input.ToEnvVarFormat(element), buildParameters[element]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -127,7 +127,21 @@ export class CLI {
|
||||||
process.env.AWS_REGION = Input.region;
|
process.env.AWS_REGION = Input.region;
|
||||||
const CF = new SDK.CloudFormation();
|
const CF = new SDK.CloudFormation();
|
||||||
|
|
||||||
const stacks = await CF.listStacks().promise();
|
const stacks = (await CF.listStacks().promise()).StackSummaries?.filter(
|
||||||
CloudRunnerLogger.log(JSON.stringify(stacks, undefined, 4));
|
(_x) => _x.StackStatus !== 'DELETE_COMPLETE',
|
||||||
|
);
|
||||||
|
if (stacks === undefined) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
CloudRunnerLogger.log(`Cloud Formation stacks`);
|
||||||
|
for (const element of stacks) {
|
||||||
|
CloudRunnerLogger.log(JSON.stringify(element, undefined, 4));
|
||||||
|
await CF.deleteStack({ StackName: element.StackName }).promise();
|
||||||
|
}
|
||||||
|
|
||||||
|
CloudRunnerLogger.log(`ECS Clusters`);
|
||||||
|
const ecs = new SDK.ECS();
|
||||||
|
CloudRunnerLogger.log(JSON.stringify(await ecs.listClusters().promise(), undefined, 4));
|
||||||
|
CloudRunnerLogger.log(JSON.stringify(await ecs.describeClusters().promise(), undefined, 4));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,11 @@ class CloudRunner {
|
||||||
CloudRunner.defaultSecrets = TaskParameterSerializer.readDefaultSecrets();
|
CloudRunner.defaultSecrets = TaskParameterSerializer.readDefaultSecrets();
|
||||||
CloudRunner.cloudRunnerEnvironmentVariables = TaskParameterSerializer.readBuildEnvironmentVariables();
|
CloudRunner.cloudRunnerEnvironmentVariables = TaskParameterSerializer.readBuildEnvironmentVariables();
|
||||||
if (!buildParameters.cliMode) {
|
if (!buildParameters.cliMode) {
|
||||||
|
const buildParameterPropertyNames = Object.getOwnPropertyNames(buildParameters);
|
||||||
for (const element of CloudRunner.cloudRunnerEnvironmentVariables) {
|
for (const element of CloudRunner.cloudRunnerEnvironmentVariables) {
|
||||||
core.setOutput(Input.ToEnvVarFormat(element.name), element.value);
|
core.setOutput(Input.ToEnvVarFormat(element.name), element.value);
|
||||||
}
|
}
|
||||||
for (const element in buildParameters) {
|
for (const element of buildParameterPropertyNames) {
|
||||||
core.setOutput(Input.ToEnvVarFormat(element), buildParameters[element]);
|
core.setOutput(Input.ToEnvVarFormat(element), buildParameters[element]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue