Skip to content

Commit f7666f8

Browse files
authored
Use action groups to tidy up the output (#3)
* Group exec with labels. * refine grouping. * group login steps
1 parent afcbe93 commit f7666f8

File tree

2 files changed

+32
-16
lines changed

2 files changed

+32
-16
lines changed

dist/main/index.js

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6787,13 +6787,21 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
67876787
function run() {
67886788
return __awaiter(this, void 0, void 0, function* () {
67896789
try {
6790-
yield installNsc();
6791-
yield ensureFreshTenantToken();
6792-
const registry = yield dockerLogin();
6793-
_actions_core__WEBPACK_IMPORTED_MODULE_0__.setOutput("registry-address", registry);
6790+
yield _actions_core__WEBPACK_IMPORTED_MODULE_0__.group(`Install Namespace Cloud CLI`, () => __awaiter(this, void 0, void 0, function* () {
6791+
yield installNsc();
6792+
yield _actions_exec__WEBPACK_IMPORTED_MODULE_2__.exec("nsc version");
6793+
}));
6794+
const registry = yield _actions_core__WEBPACK_IMPORTED_MODULE_0__.group(`Log into Namespace workspace`, () => __awaiter(this, void 0, void 0, function* () {
6795+
yield ensureFreshTenantToken();
6796+
return yield dockerLogin();
6797+
}));
6798+
yield _actions_core__WEBPACK_IMPORTED_MODULE_0__.group(`Registry address`, () => __awaiter(this, void 0, void 0, function* () {
6799+
_actions_core__WEBPACK_IMPORTED_MODULE_0__.info(registry);
6800+
_actions_core__WEBPACK_IMPORTED_MODULE_0__.setOutput("registry-address", registry);
6801+
}));
67946802
}
6795-
catch (error) {
6796-
_actions_core__WEBPACK_IMPORTED_MODULE_0__.setFailed(error.message);
6803+
catch (e) {
6804+
_actions_core__WEBPACK_IMPORTED_MODULE_0__.setFailed(e.message);
67976805
}
67986806
});
67996807
}
@@ -6845,7 +6853,7 @@ function ensureFreshTenantToken() {
68456853
function dockerLogin() {
68466854
return __awaiter(this, void 0, void 0, function* () {
68476855
const out = tmpFile("registry.txt");
6848-
yield _actions_exec__WEBPACK_IMPORTED_MODULE_2__.exec(`nsc cluster docker-login --output_registry_to=${out}`);
6856+
yield _actions_exec__WEBPACK_IMPORTED_MODULE_2__.exec(`nsc cluster docker-login --output_registry_to=${out} --log_actions=false`);
68496857
return fs__WEBPACK_IMPORTED_MODULE_3__.readFileSync(out, "utf8");
68506858
});
68516859
}

main.ts

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,22 @@ import * as path from "path";
66

77
async function run(): Promise<void> {
88
try {
9-
await installNsc();
10-
11-
await ensureFreshTenantToken();
12-
13-
const registry = await dockerLogin();
14-
core.setOutput("registry-address", registry);
15-
} catch (error) {
16-
core.setFailed(error.message);
9+
await core.group(`Install Namespace Cloud CLI`, async () => {
10+
await installNsc();
11+
await exec.exec("nsc version");
12+
});
13+
14+
const registry = await core.group(`Log into Namespace workspace`, async () => {
15+
await ensureFreshTenantToken();
16+
return await dockerLogin();
17+
});
18+
19+
await core.group(`Registry address`, async () => {
20+
core.info(registry);
21+
core.setOutput("registry-address", registry);
22+
});
23+
} catch (e) {
24+
core.setFailed(e.message);
1725
}
1826
}
1927

@@ -69,7 +77,7 @@ async function ensureFreshTenantToken() {
6977

7078
async function dockerLogin() {
7179
const out = tmpFile("registry.txt");
72-
await exec.exec(`nsc cluster docker-login --output_registry_to=${out}`);
80+
await exec.exec(`nsc cluster docker-login --output_registry_to=${out} --log_actions=false`);
7381

7482
return fs.readFileSync(out, "utf8");
7583
}

0 commit comments

Comments
 (0)