hereya-cli 0.33.0 → 0.35.0

package/dist/infrastructure/aws.js

@@ -7,24 +7,9 @@ import { getIac } from '../iac/index.js';
 import { downloadPackage } from '../lib/package/index.js';
 import { runShell } from '../lib/shell.js';
 import { getAwsConfig, getAwsConfigKey } from './aws-config.js';
-import { getPackageDownloadPath } from './common.js';
+import { getPackageDownloadPath, } from './common.js';
 import { destroyPackage, provisionPackage } from './index.js';
 export class AwsInfrastructure {
-    // public static configKey = '/hereya-bootstrap/config'
-    // public static async getConfig(): Promise<{
-    //   backendBucket: string
-    //   terraformStateBucketName: string
-    //   terraformStateBucketRegion?: string
-    //   terraformStateLockTableName: string
-    // }> {
-    //   const ssmClient = new SSMClient({})
-    //   const ssmParameter = await ssmClient.send(
-    //     new GetParameterCommand({
-    //       Name: AwsInfrastructure.configKey,
-    //     }),
-    //   )
-    //   return JSON.parse(ssmParameter.Parameter?.Value ?? '{}')
-    // }
     async bootstrap(_) {
         const stsClient = new STSClient({});
         const { Account: accountId } = await stsClient.send(new GetCallerIdentityCommand({}));
@@ -59,7 +44,7 @@ export class AwsInfrastructure {
         const downloadPath = await downloadPackage(input.pkgUrl, destPath);
         const region = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;
         const infraConfig = {
-            ...await getAwsConfig(),
+            ...(await getAwsConfig()),
             region,
         };
         if (!infraConfig.terraformStateBucketName || !infraConfig.terraformStateLockTableName) {
@@ -192,8 +177,13 @@ export class AwsInfrastructure {
         return { success: true, value: parameter.Parameter.ARN };
     }
     async unbootstrap(_) {
+        const bootstrapPackage = 'hereya/bootstrap-aws-stack';
+        const output = await destroyPackage({ package: bootstrapPackage });
+        if (!output.success) {
+            throw new Error(output.reason);
+        }
         const ssmClient = new SSMClient({});
-        const key = '/hereya-bootstrap/config';
+        const key = getAwsConfigKey();
         try {
             await ssmClient.send(new DeleteParameterCommand({
                 Name: key,
@@ -202,11 +192,6 @@ export class AwsInfrastructure {
         catch (error) {
             console.log(`Could not delete parameter "${key}": ${error.message}. Continuing with unbootstrap...`);
         }
-        const bootstrapPackage = 'hereya/bootstrap-aws-stack';
-        const output = await destroyPackage({ package: bootstrapPackage });
-        if (!output.success) {
-            throw new Error(output.reason);
-        }
     }
     async undeploy(input) {
         input.parameters = {

package/oclif.manifest.json

@@ -313,6 +313,61 @@
         "index.js"
       ]
     },
+    "login": {
+      "aliases": [],
+      "args": {
+        "url": {
+          "description": "URL of the Hereya Cloud backend",
+          "name": "url",
+          "required": true
+        }
+      },
+      "description": "Login to the Hereya Cloud backend",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> https://cloud.hereya.dev",
+        "<%= config.bin %> <%= command.id %> http://localhost:5173"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "login",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "login",
+        "index.js"
+      ]
+    },
+    "logout": {
+      "aliases": [],
+      "args": {},
+      "description": "Logout from Hereya Cloud",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "logout",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "logout",
+        "index.js"
+      ]
+    },
     "remove": {
       "aliases": [],
       "args": {
@@ -1063,5 +1118,5 @@
       ]
     }
   },
-  "version": "0.33.0"
+  "version": "0.35.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hereya-cli",
   "description": "Infrastructure as Package",
-  "version": "0.33.0",
+  "version": "0.35.0",
   "author": "Hereya Developers",
   "bin": {
     "hereya": "./bin/run.js"
@@ -21,7 +21,10 @@
     "@oclif/plugin-plugins": "^5.4.31",
     "glob": "^11.0.1",
     "ignore": "^7.0.3",
+    "keytar": "^7.9.0",
     "listr2": "^8.2.5",
+    "node-machine-id": "^1.1.12",
+    "open": "^10.1.1",
     "simple-git": "^3.27.0",
     "unzip-stream": "^0.3.4",
     "yaml": "^2.7.0",
@@ -43,7 +46,7 @@
     "eslint-plugin-chai-friendly": "^1.0.1",
     "mocha": "^11.1.0",
     "mock-fs": "^5.5.0",
-    "nock": "^14.0.1",
+    "nock": "^14.0.3",
     "oclif": "^4.17.27",
     "shx": "^0.3.4",
     "sinon": "^19.0.2",