@bifos/nhncloud-cli 0.10.0 → 0.10.1

package/README.md

@@ -1,5 +1,10 @@
 # nhncloud-cli
 
+[![npm version](https://img.shields.io/npm/v/@bifos/nhncloud-cli.svg)](https://www.npmjs.com/package/@bifos/nhncloud-cli)
+[![npm downloads](https://img.shields.io/npm/dm/@bifos/nhncloud-cli.svg)](https://www.npmjs.com/package/@bifos/nhncloud-cli)
+[![CI](https://github.com/jon890/nhncloud-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/jon890/nhncloud-cli/actions/workflows/ci.yml)
+[![license](https://img.shields.io/npm/l/@bifos/nhncloud-cli.svg)](https://github.com/jon890/nhncloud-cli/blob/main/LICENSE)
+
 NHN Cloud 서비스를 AWS CLI 방식으로 호출하는 통합 CLI.
 현재 106개 command catalog 항목을 지원한다.
 `configure`, `commands`, `logncrash search/send/export`, `deploy`, `instance`, `network`, `volume`, `floatingip`, `ncr`, `nks`, `ncs` 명령으로 NHN Cloud 서비스를 조회·운영할 수 있다.

package/dist/index.js

@@ -315,15 +315,18 @@ var import_node_path2 = require("path");
 var import_node_os2 = require("os");
 var import_node_crypto = require("crypto");
 var CACHE_DIR = (0, import_node_path2.join)((0, import_node_os2.homedir)(), ".nhncloud", "cache");
+function credentialFingerprint(material) {
+  return (0, import_node_crypto.createHash)("sha256").update(material).digest("hex");
+}
 function iaasCachePath(profile, region) {
   return (0, import_node_path2.join)(CACHE_DIR, `iaas-token-${profile}-${region}.json`);
 }
 function isIaasTokenCache(val) {
   if (typeof val !== "object" || val === null) return false;
   const obj = val;
-  return typeof obj["tokenId"] === "string" && typeof obj["expiresAt"] === "string" && typeof obj["computeEndpoint"] === "string" && typeof obj["imageEndpoint"] === "string" && typeof obj["networkEndpoint"] === "string" && typeof obj["blockStorageEndpoint"] === "string" && typeof obj["nksEndpoint"] === "string";
+  return typeof obj["tokenId"] === "string" && typeof obj["expiresAt"] === "string" && typeof obj["credentialHash"] === "string" && typeof obj["computeEndpoint"] === "string" && typeof obj["imageEndpoint"] === "string" && typeof obj["networkEndpoint"] === "string" && typeof obj["blockStorageEndpoint"] === "string" && typeof obj["nksEndpoint"] === "string";
 }
-async function readIaasToken(profile, region) {
+async function readIaasToken(profile, region, credentialHash) {
   const filePath = iaasCachePath(profile, region);
   try {
     const raw = await (0, import_promises2.readFile)(filePath, "utf-8");
@@ -332,6 +335,7 @@ async function readIaasToken(profile, region) {
     const expiresAt = new Date(parsed.expiresAt).getTime();
     const BUFFER_MS = 6e4;
     if (expiresAt - Date.now() < BUFFER_MS) return null;
+    if (parsed.credentialHash !== credentialHash) return null;
     return {
       tokenId: parsed.tokenId,
       expiresAt: parsed.expiresAt,
@@ -351,6 +355,7 @@ async function writeIaasToken(profile, region, data) {
   const cache = {
     tokenId: data.tokenId,
     expiresAt: data.expiresAt,
+    credentialHash: data.credentialHash,
     computeEndpoint: data.computeEndpoint,
     imageEndpoint: data.imageEndpoint,
     networkEndpoint: data.networkEndpoint,
@@ -362,14 +367,14 @@ async function writeIaasToken(profile, region, data) {
   await (0, import_promises2.rename)(tmp, filePath);
 }
 function tokenCachePath(profile) {
-  return (0, import_node_path2.join)(CACHE_DIR, `deploy-token-${profile}.json`);
+  return (0, import_node_path2.join)(CACHE_DIR, `user-access-token-${profile}.json`);
 }
 function isTokenCache(val) {
   if (typeof val !== "object" || val === null) return false;
   const obj = val;
-  return typeof obj["accessToken"] === "string" && typeof obj["expiresAt"] === "string";
+  return typeof obj["accessToken"] === "string" && typeof obj["expiresAt"] === "string" && typeof obj["credentialHash"] === "string";
 }
-async function readToken(profile) {
+async function readToken(profile, credentialHash) {
   const filePath = tokenCachePath(profile);
   try {
     const raw = await (0, import_promises2.readFile)(filePath, "utf-8");
@@ -379,17 +384,19 @@ async function readToken(profile) {
     const now = Date.now();
     const BUFFER_MS = 6e4;
     if (expiresAt - now < BUFFER_MS) return null;
+    if (parsed.credentialHash !== credentialHash) return null;
     return { accessToken: parsed.accessToken, expiresAt: parsed.expiresAt };
   } catch {
     return null;
   }
 }
-async function writeToken(profile, accessToken, expiresAt) {
+async function writeToken(profile, accessToken, expiresAt, credentialHash) {
   const filePath = tokenCachePath(profile);
   await (0, import_promises2.mkdir)((0, import_node_path2.dirname)(filePath), { recursive: true });
   const data = {
     accessToken,
-    expiresAt: expiresAt.toISOString()
+    expiresAt: expiresAt.toISOString(),
+    credentialHash
   };
   const tmp = filePath + "." + (0, import_node_crypto.randomBytes)(4).toString("hex") + ".tmp";
   await (0, import_promises2.writeFile)(tmp, JSON.stringify(data, null, 2), { encoding: "utf-8", mode: 384 });
@@ -424,8 +431,9 @@ function isTokenResponse(val) {
   return typeof obj["access_token"] === "string" && typeof obj["expires_in"] === "number";
 }
 async function getAccessToken(profile, uakId, uakSecret, forceRefresh = false) {
+  const credentialHash = credentialFingerprint(JSON.stringify([uakId, uakSecret]));
   if (!forceRefresh) {
-    const cached = await readToken(profile);
+    const cached = await readToken(profile, credentialHash);
     if (cached !== null) {
       return cached.accessToken;
     }
@@ -449,7 +457,7 @@ async function getAccessToken(profile, uakId, uakSecret, forceRefresh = false) {
   }
   if (!forceRefresh) {
     const expiresAt = new Date(Date.now() + raw.expires_in * 1e3);
-    await writeToken(profile, raw.access_token, expiresAt);
+    await writeToken(profile, raw.access_token, expiresAt, credentialHash);
   }
   return raw.access_token;
 }
@@ -597,8 +605,11 @@ function isKeystoneTokenResponse(val) {
   return typeof token["id"] === "string" && typeof token["expires"] === "string";
 }
 async function getIaasToken(profile, iaas, forceRefresh = false) {
+  const credentialHash = credentialFingerprint(
+    JSON.stringify([iaas.tenantId, iaas.username, iaas.password])
+  );
   if (!forceRefresh) {
-    const cached = await readIaasToken(profile, iaas.region);
+    const cached = await readIaasToken(profile, iaas.region, credentialHash);
     if (cached !== null) {
       return {
         tokenId: cached.tokenId,
@@ -642,7 +653,7 @@ async function getIaasToken(profile, iaas, forceRefresh = false) {
   const tokenId = raw.access.token.id;
   const expiresAt = raw.access.token.expires;
   if (!forceRefresh) {
-    await writeIaasToken(profile, iaas.region, { tokenId, expiresAt, computeEndpoint, imageEndpoint, networkEndpoint, blockStorageEndpoint, nksEndpoint });
+    await writeIaasToken(profile, iaas.region, { tokenId, expiresAt, credentialHash, computeEndpoint, imageEndpoint, networkEndpoint, blockStorageEndpoint, nksEndpoint });
   }
   return { tokenId, computeEndpoint, imageEndpoint, networkEndpoint, blockStorageEndpoint, nksEndpoint };
 }
@@ -3887,11 +3898,6 @@ function isVolume(val) {
   return typeof obj["id"] === "string" && // Cinder 는 --name 미지정 시 null — null 인 볼륨 하나가 list 전체를 거부하지 않게 허용 (isImage 선례).
   (typeof obj["name"] === "string" || obj["name"] === null) && typeof obj["size"] === "number" && typeof obj["status"] === "string" && (obj["availability_zone"] === void 0 || typeof obj["availability_zone"] === "string") && Array.isArray(obj["attachments"]);
 }
-function isVolumesResponse(val) {
-  if (typeof val !== "object" || val === null) return false;
-  const obj = val;
-  return Array.isArray(obj["volumes"]) && obj["volumes"].every(isVolume);
-}
 function isVolumeResponse(val) {
   if (typeof val !== "object" || val === null) return false;
   const obj = val;
@@ -3909,7 +3915,7 @@ var BlockStorageClient = class {
     return { "X-Auth-Token": this.tokenId };
   }
   async list(params) {
-    const url = `${this.endpoint}/volumes`;
+    const url = `${this.endpoint}/volumes/detail`;
     const searchParams = {};
     if (params?.sort !== void 0) searchParams["sort"] = params.sort;
     if (params?.limit !== void 0) searchParams["limit"] = params.limit;
@@ -3917,13 +3923,26 @@ var BlockStorageClient = class {
     if (params?.marker !== void 0) searchParams["marker"] = params.marker;
     try {
       const raw = await import_ky9.default.get(url, { headers: this.authHeaders(), searchParams, retry: 0, timeout: DEFAULT_TIMEOUT_MS5 }).json();
-      if (!isVolumesResponse(raw)) {
+      if (typeof raw !== "object" || raw === null) {
         throw new NhnCloudCliError(
           "volume list \uC751\uB2F5 \uD615\uC2DD\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4 \u2014 volumes \uBC30\uC5F4\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.",
           EXIT_API_ERROR
         );
       }
-      return raw.volumes;
+      const obj = raw;
+      if (!Array.isArray(obj["volumes"])) {
+        throw new NhnCloudCliError(
+          "volume list \uC751\uB2F5 \uD615\uC2DD\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4 \u2014 volumes \uBC30\uC5F4\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.",
+          EXIT_API_ERROR
+        );
+      }
+      if (!obj["volumes"].every(isVolume)) {
+        throw new NhnCloudCliError(
+          "volume list \uC751\uB2F5\uC758 \uBCFC\uB968 \uD56D\uBAA9 \uD615\uC2DD\uC774 \uC608\uC0C1\uACFC \uB2E4\uB985\uB2C8\uB2E4 \u2014 API \uC751\uB2F5 \uD544\uB4DC\uB97C \uD655\uC778\uD558\uC138\uC694.",
+          EXIT_API_ERROR
+        );
+      }
+      return obj["volumes"];
     } catch (err) {
       throw toNhnCloudCliError(err);
     }
@@ -7592,7 +7611,7 @@ Agent workflow:
   3. nhncloud ncs workload get <id> --json
 `;
 var program = new import_commander48.Command();
-program.name("nhncloud").description("NHN Cloud CLI \u2014 AI agent & terminal friendly").version("0.10.0").option("--json", "JSON \uD615\uC2DD\uC73C\uB85C \uCD9C\uB825").option("--quiet", "\uCD5C\uC18C \uCD9C\uB825 (\uC790\uB3D9\uD654\uC6A9)").option("--no-color", "\uC0C9\uC0C1 \uBE44\uD65C\uC131\uD654").addHelpText("after", rootAgentHints);
+program.name("nhncloud").description("NHN Cloud CLI \u2014 AI agent & terminal friendly").version("0.10.1").option("--json", "JSON \uD615\uC2DD\uC73C\uB85C \uCD9C\uB825").option("--quiet", "\uCD5C\uC18C \uCD9C\uB825 (\uC790\uB3D9\uD654\uC6A9)").option("--no-color", "\uC0C9\uC0C1 \uBE44\uD65C\uC131\uD654").addHelpText("after", rootAgentHints);
 program.hook("preAction", () => {
   const opts = program.opts();
   if (!opts.color || process.env["NO_COLOR"]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bifos/nhncloud-cli",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "CLI tool for NHN Cloud services — AI agent & terminal friendly",
   "keywords": [
     "nhncloud",