@quadnix/octo-build 0.1.0 → 0.2.0

package/dist/commands/create-app/generator-octo-app-template/generators/app/templates/src/aws-ecs-server/octo.yaml.ejs

@@ -23,7 +23,7 @@ terraform:
 
 settings:
   listeners:
-    - type: HtmlReportEventListener
+    - type: JournalEventListener
     - type: LoggingEventListener
 
   stateProvider:
@@ -35,16 +35,16 @@ imports:
     importPath: "@quadnix/octo-aws-cdk/modules/app/simple-app"
   - className: AwsIniAccountModule
     importPath: "@quadnix/octo-aws-cdk/modules/account/aws-ini-account"
-  - className: AwsEcsDeploymentModule
-    importPath: "@quadnix/octo-aws-cdk/modules/deployment/aws-ecs-deployment"
+  - className: AwsDeploymentModule
+    importPath: "@quadnix/octo-aws-cdk/modules/deployment/aws-deployment"
   - className: AwsEcsEnvironmentModule
     importPath: "@quadnix/octo-aws-cdk/modules/environment/aws-ecs-environment"
   - className: AwsEcsExecutionModule
     importPath: "@quadnix/octo-aws-cdk/modules/execution/aws-ecs-execution"
   - className: AwsMultiAzRegionModule
     importPath: "@quadnix/octo-aws-cdk/modules/region/aws-multi-az-region"
-  - className: AwsEcsServerModule
-    importPath: "@quadnix/octo-aws-cdk/modules/server/aws-ecs-server"
+  - className: AwsServerModule
+    importPath: "@quadnix/octo-aws-cdk/modules/server/aws-server"
   - className: AwsEcsAlbServiceModule
     importPath: "@quadnix/octo-aws-cdk/modules/service/aws-ecs-alb-service"
   - className: AwsSimpleSubnetModule
@@ -73,24 +73,22 @@ modules:
       vpcCidrBlock: 10.0.0.0/16
 
   - moduleId: backend-server-module
-    moduleClass: AwsEcsServerModule
+    moduleClass: AwsServerModule
     moduleInputs:
       account: "${{account-module.model.account}}"
       serverKey: backend
 
   - moduleId: backend-deployment-v1-module
-    moduleClass: AwsEcsDeploymentModule
+    moduleClass: AwsDeploymentModule
     moduleInputs:
-      deploymentContainerProperties:
-        cpu: 256
-        image:
-          command: node webserver
-          ports:
-            - containerPort: 80
-              protocol: tcp
-          uri: docker.io/ealen/echo-server:0.9.2
-        memory: 512
+      command: [node, webserver]
+      cpu: 256
       deploymentTag: v1
+      imageUri: docker.io/ealen/echo-server:0.9.2
+      memory: 512
+      ports:
+        - containerPort: 80
+          protocol: tcp
       server: "${{backend-server-module.model.server}}"
 
   - moduleId: qa-environment-module

package/dist/commands/create-app/generator-octo-app-template/generators/app/templates/src/aws-s3-website/octo.yaml.ejs

@@ -26,7 +26,7 @@ terraform:
 
 settings:
   listeners:
-    - type: HtmlReportEventListener
+    - type: JournalEventListener
     - type: LoggingEventListener
 
   stateProvider:
@@ -38,6 +38,8 @@ imports:
     importPath: "@quadnix/octo-aws-cdk/modules/app/simple-app"
   - className: AwsIniAccountModule
     importPath: "@quadnix/octo-aws-cdk/modules/account/aws-ini-account"
+  - className: AwsServerlessRegionModule
+    importPath: "@quadnix/octo-aws-cdk/modules/region/aws-serverless-region"
   - className: AwsS3StaticWebsiteServiceModule
     importPath: "@quadnix/octo-aws-cdk/modules/service/aws-s3-static-website-service"
 
@@ -53,10 +55,16 @@ modules:
       accountId: "${env.AWS_ACCOUNT_ID}"
       app: "${{app-module.model.app}}"
 
+  - moduleId: region-module
+    moduleClass: AwsServerlessRegionModule
+    moduleInputs:
+      account: "${{account-module.model.account}}"
+      name: aws-s3-website
+      regionId: aws-us-east-1
+
   - moduleId: s3-website-service-module
     moduleClass: AwsS3StaticWebsiteServiceModule
     moduleInputs:
-      account: "${{account-module.model.account}}"
-      awsRegionId: us-east-1
       bucketName: "${env.AWS_S3_WEBSITE_BUCKET_NAME}"
       directoryPath: website
+      region: "${{region-module.model.region}}"

package/dist/commands/create-model/generator-octo-model-template/generators/app/templates/models/model/model.ts.ejs

@@ -1,3 +1,40 @@
+<%# A service is built with its parents, type and label, and carries them through synth() and unSynth(). -%>
+<% if (modelType === 'service') { -%>
+import { type AModel, Model, Service, ServiceType } from '@quadnix/octo';
+import { <%= moduleNamePascal %>Schema } from './<%= moduleName %>.schema.js';
+
+@Model<<%= moduleNamePascal %>>('<%= packageName %>', 'service', <%= moduleNamePascal %>Schema)
+export class <%= moduleNamePascal %> extends Service {
+  // Fix me: Add properties specific to your module.
+  private readonly customProperty: string;
+
+  // Fix me: Update constructor to take properties as inputs.
+  constructor(customProperty: string, parents: AModel<any, any>[]) {
+    // Fix me: Initialize model with the correct ID, the nodes it sits under, its type and its label.
+    super(customProperty, parents, ServiceType.OTHER, '<%= moduleName %>');
+
+    // Fix me: Initialize module-specific properties.
+    this.customProperty = customProperty;
+  }
+
+  override synth(): <%= moduleNamePascal %>Schema {
+    // Fix me: Return serialized schema.
+    return {
+      ...super.synth(),
+      customProperty: this.customProperty,
+    };
+  }
+
+  static override async unSynth(
+    service: <%= moduleNamePascal %>Schema,
+    deReferenceContext: (context: string) => Promise<AModel<any, any>>,
+  ): Promise<<%= moduleNamePascal %>> {
+    // Fix me: Return unserialized instance of <%= moduleNamePascal %>.
+    const parents = await Promise.all(service.parents.map((p) => deReferenceContext(p.context)));
+    return new <%= moduleNamePascal %>(service.customProperty, parents);
+  }
+}
+<% } else { -%>
 <%# Sorted for the same reason as the schema's imports: `App` sorts before `Model`, `Service` after. -%>
 <% const modelImports = ['Model', modelTypePascal].sort().join(', '); -%>
 import { <%= modelImports %> } from '@quadnix/octo';
@@ -29,3 +66,4 @@ export class <%= moduleNamePascal %> extends <%= modelTypePascal %> {
     return new <%= moduleNamePascal %>(<%= modelType %>.customProperty);
   }
 }
+<% } -%>

package/dist/commands/generate/generate.command.d.ts

@@ -3,7 +3,9 @@ type GenerateCommandArguments = {
     outputDir: string;
 };
 /**
- * Step 1 of the octo lifecycle. See {@link Octo.generate}.
+ * Step 1 of the octo lifecycle. See `Octo.generate()`.
+ *
+ * The state is refreshed before octo boots, because booting is what reads it.
  */
 export declare const generateCommand: {
     builder: (yargs: Argv) => Argv;

package/dist/commands/generate/generate.command.js

@@ -1,7 +1,10 @@
 import { resolve } from 'path';
-import { bootOcto, reportError } from '../../utilities/octo/octo.utility.js';
+import { Container, StateManagementService } from '@quadnix/octo';
+import { OctoUtility } from '../../utilities/octo/octo.utility.js';
 /**
- * Step 1 of the octo lifecycle. See {@link Octo.generate}.
+ * Step 1 of the octo lifecycle. See `Octo.generate()`.
+ *
+ * The state is refreshed before octo boots, because booting is what reads it.
  */
 export const generateCommand = {
     builder: (yargs) => {
@@ -17,19 +20,16 @@ export const generateCommand = {
     describe: 'Step 1: generate Terragrunt module folders representing the full desired infrastructure.',
     handler: async (argv) => {
         const { outputDir } = argv;
-        try {
-            const { app, octo } = await bootOcto();
+        await OctoUtility.runCommand('generate', async () => {
+            await OctoUtility.bootStateProvider();
+            await (await Container.getInstance().get(StateManagementService)).refreshState();
+            const { app, octo } = await OctoUtility.bootOcto();
             const resolvedOutputDir = resolve(process.cwd(), outputDir);
             await octo.generate(app, { outputDir: resolvedOutputDir });
             // Nothing is printed here. The listeners report what was written and that the mode finished,
-            // and they are the only writer on stdout - a `console.log` alongside them lands out of order,
-            // because pino's stream and this one flush independently. Failures still reach stderr via
-            // `reportError`, so a silent run is a successful one.
-        }
-        catch (error) {
-            reportError(error);
-            process.exit(1);
-        }
+            // on stderr, and failures reach stderr via `reportError`. Generate has no output of its own, so
+            // stdout stays empty.
+        });
     },
 };
 //# sourceMappingURL=generate.command.js.map

package/dist/commands/generate/generate.command.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.command.js","sourceRoot":"","sources":["../../../src/commands/generate/generate.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAM7E;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE;YAC/B,KAAK,EAAE,GAAG;YACV,YAAY,EAAE,IAAI;YAClB,WAAW,EACT,2GAA2G;gBAC3G,2FAA2F;YAC7F,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,UAAU;IACnB,QAAQ,EAAE,0FAA0F;IACpG,OAAO,EAAE,KAAK,EAAE,IAAkD,EAAiB,EAAE;QACnF,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAE3B,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,QAAQ,EAAE,CAAC;YAEvC,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;YAC5D,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;YAE3D,6FAA6F;YAC7F,8FAA8F;YAC9F,0FAA0F;YAC1F,sDAAsD;QACxD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF,CAAC"}
+{"version":3,"file":"generate.command.js","sourceRoot":"","sources":["../../../src/commands/generate/generate.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAMnE;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE;YAC/B,KAAK,EAAE,GAAG;YACV,YAAY,EAAE,IAAI;YAClB,WAAW,EACT,2GAA2G;gBAC3G,2FAA2F;YAC7F,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,UAAU;IACnB,QAAQ,EAAE,0FAA0F;IACpG,OAAO,EAAE,KAAK,EAAE,IAAkD,EAAiB,EAAE;QACnF,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAE3B,MAAM,WAAW,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;YAClD,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACtC,MAAM,CAAC,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;YAEjF,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;YAEnD,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;YAC5D,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;YAE3D,6FAA6F;YAC7F,gGAAgG;YAChG,sBAAsB;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}

package/dist/commands/get-response/get-response.command.js

@@ -1,5 +1,5 @@
 import { Container, StateManagementService } from '@quadnix/octo';
-import { bootStateProvider, reportError } from '../../utilities/octo/octo.utility.js';
+import { OctoUtility } from '../../utilities/octo/octo.utility.js';
 /**
  * Prints a resource's recorded response as JSON.
  *
@@ -20,7 +20,7 @@ export const getResponseCommand = {
     handler: async (argv) => {
         const { resourceId } = argv;
         try {
-            await bootStateProvider();
+            await OctoUtility.bootStateProvider();
             const stateManagementService = await Container.getInstance().get(StateManagementService);
             const response = await stateManagementService.getResourceResponse(resourceId);
             if (!response) {
@@ -31,7 +31,7 @@ export const getResponseCommand = {
             process.stdout.write(JSON.stringify(response));
         }
         catch (error) {
-            reportError(error);
+            OctoUtility.reportError(error);
             process.exit(1);
         }
     },

package/dist/commands/get-response/get-response.command.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-response.command.js","sourceRoot":"","sources":["../../../src/commands/get-response/get-response.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAMtF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE;YAChC,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,0DAA0D;YACvE,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,cAAc;IACvB,QAAQ,EAAE,sFAAsF;IAChG,OAAO,EAAE,KAAK,EAAE,IAAqD,EAAiB,EAAE;QACtF,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAE5B,IAAI,CAAC;YACH,MAAM,iBAAiB,EAAE,CAAC;YAC1B,MAAM,sBAAsB,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;YAEzF,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;YAC9E,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CACb,sCAAsC,UAAU,KAAK;oBACnD,yFAAyF,CAC5F,CAAC;YACJ,CAAC;YAED,qFAAqF;YACrF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF,CAAC"}
+{"version":3,"file":"get-response.command.js","sourceRoot":"","sources":["../../../src/commands/get-response/get-response.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAMnE;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE;YAChC,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,0DAA0D;YACvE,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,cAAc;IACvB,QAAQ,EAAE,sFAAsF;IAChG,OAAO,EAAE,KAAK,EAAE,IAAqD,EAAiB,EAAE;QACtF,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAE5B,IAAI,CAAC;YACH,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACtC,MAAM,sBAAsB,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;YAEzF,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;YAC9E,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CACb,sCAAsC,UAAU,KAAK;oBACnD,yFAAyF,CAC5F,CAAC;YACJ,CAAC;YAED,qFAAqF;YACrF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF,CAAC"}

package/dist/commands/lock/lock.command.d.ts

@@ -1,6 +1,10 @@
-import type { Argv } from 'yargs';
+import type { ArgumentsCamelCase, Argv } from 'yargs';
+type LockCommandArguments = {
+    lockId?: string;
+};
 /**
- * Takes the app lock, which `apply` and `commit` both require.
+ * Takes the app lock, which `apply` and `commit` both require. With `--lockId`, resumes the run
+ * already holding that lock, which is how a run that died is finished.
  *
  * The lock id is the only thing printed on stdout, so a shell can capture it:
  * `LOCK_ID=$(octo lock)`. Everything else goes to stderr.
@@ -9,5 +13,6 @@ export declare const lockCommand: {
     builder: (yargs: Argv) => Argv;
     command: string;
     describe: string;
-    handler: () => Promise<void>;
+    handler: (argv: ArgumentsCamelCase<LockCommandArguments>) => Promise<void>;
 };
+export {};

package/dist/commands/lock/lock.command.js

@@ -1,28 +1,31 @@
 import { Container, StateManagementService } from '@quadnix/octo';
 import chalk from 'chalk';
-import { bootStateProvider, reportError } from '../../utilities/octo/octo.utility.js';
+import { OctoUtility } from '../../utilities/octo/octo.utility.js';
 /**
- * Takes the app lock, which `apply` and `commit` both require.
+ * Takes the app lock, which `apply` and `commit` both require. With `--lockId`, resumes the run
+ * already holding that lock, which is how a run that died is finished.
  *
  * The lock id is the only thing printed on stdout, so a shell can capture it:
  * `LOCK_ID=$(octo lock)`. Everything else goes to stderr.
  */
 export const lockCommand = {
-    builder: (yargs) => yargs,
+    builder: (yargs) => {
+        return yargs.option('lockId', {
+            demandOption: false,
+            description: 'Resume the run holding this lock ID instead of taking a new lock. Stop that run first.',
+            type: 'string',
+        });
+    },
     command: 'lock',
     describe: 'Take the app state lock, printing its ID. Required before apply and commit.',
-    handler: async () => {
-        try {
-            await bootStateProvider();
+    handler: async (argv) => {
+        await OctoUtility.runCommand('lock', async () => {
+            await OctoUtility.bootStateProvider();
             const stateManagementService = await Container.getInstance().get(StateManagementService);
-            const { lockId } = await stateManagementService.lockApp();
-            console.error(chalk.green('App is locked.'));
+            const { lockId } = await stateManagementService.lockApp(argv.lockId);
+            console.error(chalk.green(argv.lockId ? 'App lock is resumed.' : 'App is locked.'));
             console.log(lockId);
-        }
-        catch (error) {
-            reportError(error);
-            process.exit(1);
-        }
+        });
     },
 };
 //# sourceMappingURL=lock.command.js.map

package/dist/commands/lock/lock.command.js.map

@@ -1 +1 @@
-{"version":3,"file":"lock.command.js","sourceRoot":"","sources":["../../../src/commands/lock/lock.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAEtF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE,CAAC,KAAK;IACrC,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,6EAA6E;IACvF,OAAO,EAAE,KAAK,IAAmB,EAAE;QACjC,IAAI,CAAC;YACH,MAAM,iBAAiB,EAAE,CAAC;YAC1B,MAAM,sBAAsB,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;YAEzF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,sBAAsB,CAAC,OAAO,EAAE,CAAC;YAE1D,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF,CAAC"}
+{"version":3,"file":"lock.command.js","sourceRoot":"","sources":["../../../src/commands/lock/lock.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAMnE;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC5B,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,wFAAwF;YACrG,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,6EAA6E;IACvF,OAAO,EAAE,KAAK,EAAE,IAA8C,EAAiB,EAAE;QAC/E,MAAM,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACtC,MAAM,sBAAsB,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;YAEzF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAErE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACpF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}

package/dist/commands/run-action/run-action.command.js

@@ -1,4 +1,4 @@
-import { bootOcto, reportError } from '../../utilities/octo/octo.utility.js';
+import { OctoUtility } from '../../utilities/octo/octo.utility.js';
 export const runActionCommand = {
     builder: (yargs) => {
         return yargs
@@ -18,7 +18,7 @@ export const runActionCommand = {
     describe: 'Run a single resource action. Invoked by Terraform mid-apply for an external resource.',
     handler: async (argv) => {
         const { input, resourceId } = argv;
-        try {
+        await OctoUtility.runCommand('run-action', async () => {
             const inputs = {};
             for (const entry of input ?? []) {
                 const separatorIndex = entry.indexOf('=');
@@ -27,20 +27,14 @@ export const runActionCommand = {
                 }
                 inputs[entry.slice(0, separatorIndex)] = entry.slice(separatorIndex + 1);
             }
-            // stdout carries ONLY the response JSON (terraform's `data "external"` consumes it), so suppress
-            // boot output and route this command's own diagnostics to stderr.
-            const { app, octo } = await bootOcto({ quietStdout: true });
+            const { app, octo } = await OctoUtility.bootOcto();
             const result = await octo.runAction(app, {
                 inputs,
                 resourceId,
             });
             // stdout carries ONLY the response JSON — terraform's `data "external"` consumes it.
             process.stdout.write(JSON.stringify(result.response));
-        }
-        catch (error) {
-            reportError(error);
-            process.exit(1);
-        }
+        });
     },
 };
 //# sourceMappingURL=run-action.command.js.map

package/dist/commands/run-action/run-action.command.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-action.command.js","sourceRoot":"","sources":["../../../src/commands/run-action/run-action.command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAO7E,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK;aACT,MAAM,CAAC,YAAY,EAAE;YACpB,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,iDAAiD;YAC9D,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,OAAO,EAAE;YACf,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,iFAAiF;YAC9F,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,wFAAwF;IAClG,OAAO,EAAE,KAAK,EAAE,IAAmD,EAAiB,EAAE;QACpF,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAEnC,IAAI,CAAC;YACH,MAAM,MAAM,GAA2B,EAAE,CAAC;YAC1C,KAAK,MAAM,KAAK,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;gBAChC,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC1C,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,uDAAuD,CAAC,CAAC;gBACpG,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;YAC3E,CAAC;YAED,iGAAiG;YACjG,kEAAkE;YAClE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,QAAQ,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;YAE5D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE;gBACvC,MAAM;gBACN,UAAU;aACX,CAAC,CAAC;YAEH,qFAAqF;YACrF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF,CAAC"}
+{"version":3,"file":"run-action.command.js","sourceRoot":"","sources":["../../../src/commands/run-action/run-action.command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAOnE,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK;aACT,MAAM,CAAC,YAAY,EAAE;YACpB,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,iDAAiD;YAC9D,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,OAAO,EAAE;YACf,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,iFAAiF;YAC9F,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,wFAAwF;IAClG,OAAO,EAAE,KAAK,EAAE,IAAmD,EAAiB,EAAE;QACpF,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAEnC,MAAM,WAAW,CAAC,UAAU,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;YACpD,MAAM,MAAM,GAA2B,EAAE,CAAC;YAC1C,KAAK,MAAM,KAAK,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;gBAChC,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC1C,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,uDAAuD,CAAC,CAAC;gBACpG,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;YAC3E,CAAC;YAED,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;YAEnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE;gBACvC,MAAM;gBACN,UAAU;aACX,CAAC,CAAC;YAEH,qFAAqF;YACrF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}

package/dist/commands/unlock/unlock.command.d.ts

@@ -1,13 +1,13 @@
 import type { ArgumentsCamelCase, Argv } from 'yargs';
 type UnlockCommandArguments = {
-    force?: boolean;
-    lockId?: string;
+    lockId: string;
 };
 /**
- * Releases the app lock.
+ * Finishes a run as it stands and releases its lock.
  *
- * A run that finishes releases its own lock - `commit` always does, however it ends - so this is
- * either for a run that never reached its commit, or for `--force` after one died holding the lock.
+ * A successful `commit` releases its own lock, so this is for a run that will not reach one - a run
+ * that never applied, or one somebody finished by hand. With a remote state provider, releasing
+ * seals what the run wrote.
  */
 export declare const unlockCommand: {
     builder: (yargs: Argv) => Argv;

package/dist/commands/unlock/unlock.command.js

@@ -1,51 +1,35 @@
 import { Container, StateManagementService } from '@quadnix/octo';
 import chalk from 'chalk';
-import { bootStateProvider, reportError } from '../../utilities/octo/octo.utility.js';
+import { OctoUtility } from '../../utilities/octo/octo.utility.js';
 /**
- * Releases the app lock.
+ * Finishes a run as it stands and releases its lock.
  *
- * A run that finishes releases its own lock - `commit` always does, however it ends - so this is
- * either for a run that never reached its commit, or for `--force` after one died holding the lock.
+ * A successful `commit` releases its own lock, so this is for a run that will not reach one - a run
+ * that never applied, or one somebody finished by hand. With a remote state provider, releasing
+ * seals what the run wrote.
  */
 export const unlockCommand = {
     builder: (yargs) => {
-        return yargs
-            .option('lockId', {
-            demandOption: false,
+        return yargs.option('lockId', {
+            demandOption: true,
             description: 'The lock ID to release, as printed by `octo lock`.',
             type: 'string',
-        })
-            .option('force', {
-            default: false,
-            demandOption: false,
-            description: 'Release whatever lock is held, without knowing its ID. For a run that died holding one.',
-            type: 'boolean',
         });
     },
     command: 'unlock',
-    describe: 'Release the app state lock.',
+    describe: 'Finish a run as it stands, releasing its app state lock.',
     handler: async (argv) => {
-        const { force, lockId } = argv;
-        try {
-            if (!force && !lockId) {
-                throw new Error('Either --lockId or --force is required to unlock!');
-            }
-            await bootStateProvider();
+        const { lockId } = argv;
+        await OctoUtility.runCommand('unlock', async () => {
+            await OctoUtility.bootStateProvider();
             const stateManagementService = await Container.getInstance().get(StateManagementService);
-            // Force reads the held lock and releases that, which is the only way through when the ID was
-            // lost with the run that took it.
-            const existingLockId = await stateManagementService.getAppLock();
-            if (!existingLockId) {
+            if (!(await stateManagementService.getAppLock())) {
                 console.error(chalk.green('App is already unlocked.'));
                 return;
             }
-            await stateManagementService.unlockApp(force ? existingLockId : lockId);
-            console.error(chalk.green(`App was unlocked, releasing lock ID "${existingLockId}".`));
-        }
-        catch (error) {
-            reportError(error);
-            process.exit(1);
-        }
+            await stateManagementService.unlockApp(lockId);
+            console.error(chalk.green(`App was unlocked, releasing lock ID "${lockId}".`));
+        });
     },
 };
 //# sourceMappingURL=unlock.command.js.map

package/dist/commands/unlock/unlock.command.js.map

@@ -1 +1 @@
-{"version":3,"file":"unlock.command.js","sourceRoot":"","sources":["../../../src/commands/unlock/unlock.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAOtF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK;aACT,MAAM,CAAC,QAAQ,EAAE;YAChB,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,oDAAoD;YACjE,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,OAAO,EAAE;YACf,OAAO,EAAE,KAAK;YACd,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,yFAAyF;YACtG,IAAI,EAAE,SAAS;SAChB,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,6BAA6B;IACvC,OAAO,EAAE,KAAK,EAAE,IAAgD,EAAiB,EAAE;QACjF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAE/B,IAAI,CAAC;YACH,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;YACvE,CAAC;YAED,MAAM,iBAAiB,EAAE,CAAC;YAC1B,MAAM,sBAAsB,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;YAEzF,6FAA6F;YAC7F,kCAAkC;YAClC,MAAM,cAAc,GAAG,MAAM,sBAAsB,CAAC,UAAU,EAAE,CAAC;YACjE,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC;gBACvD,OAAO;YACT,CAAC;YAED,MAAM,sBAAsB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAO,CAAC,CAAC;YACzE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,wCAAwC,cAAc,IAAI,CAAC,CAAC,CAAC;QACzF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF,CAAC"}
+{"version":3,"file":"unlock.command.js","sourceRoot":"","sources":["../../../src/commands/unlock/unlock.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAMnE;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC5B,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,oDAAoD;YACjE,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,0DAA0D;IACpE,OAAO,EAAE,KAAK,EAAE,IAAgD,EAAiB,EAAE;QACjF,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAExB,MAAM,WAAW,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAChD,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACtC,MAAM,sBAAsB,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;YAEzF,IAAI,CAAC,CAAC,MAAM,sBAAsB,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;gBACjD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC;gBACvD,OAAO;YACT,CAAC;YAED,MAAM,sBAAsB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAC/C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,wCAAwC,MAAM,IAAI,CAAC,CAAC,CAAC;QACjF,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}

package/dist/commands/validate/validate.command.d.ts

@@ -6,7 +6,7 @@ type ValidateCommandArguments = {
     timeoutInMs?: number;
 };
 /**
- * Step 2 of the octo lifecycle. See {@link Octo.validate}.
+ * Step 2 of the octo lifecycle. See `Octo.validate()`.
  */
 export declare const validateCommand: {
     builder: (yargs: Argv) => Argv;

package/dist/commands/validate/validate.command.js

@@ -1,9 +1,8 @@
 import { resolve } from 'path';
 import { Container, TerraformUtility } from '@quadnix/octo';
-import chalk from 'chalk';
-import { bootOcto, prepareCallbackEnvironment, reportError } from '../../utilities/octo/octo.utility.js';
+import { OctoUtility } from '../../utilities/octo/octo.utility.js';
 /**
- * Step 2 of the octo lifecycle. See {@link Octo.validate}.
+ * Step 2 of the octo lifecycle. See `Octo.validate()`.
  */
 export const validateCommand = {
     builder: (yargs) => {
@@ -34,10 +33,10 @@ export const validateCommand = {
     handler: async (argv) => {
         const { terraformBinary, terragruntBinary, terragruntDir, timeoutInMs } = argv;
         const resolvedDir = resolve(process.cwd(), terragruntDir);
-        try {
+        await OctoUtility.runCommand('validate', async () => {
             // A plan reads every `data "external"`, and each one shells back out to `octo get-response`.
-            prepareCallbackEnvironment();
-            const { app, octo } = await bootOcto();
+            OctoUtility.prepareCallbackEnvironment();
+            const { app, octo } = await OctoUtility.bootOcto();
             const terraformUtility = await Container.getInstance().get(TerraformUtility, {
                 args: [{ terraformBinary, terragruntBinary, timeoutInMs }, true],
             });
@@ -52,17 +51,12 @@ export const validateCommand = {
             // findings to act on, not exit codes.
             //
             // The verdict itself is not printed here - the listeners render the report, drift included,
-            // on stdout, and a `console.log` alongside pino lands out of order. What is left is the exit
-            // code, which is the CLI's own job, and the failure line on stderr.
+            // on stderr. What is left is the exit code, which is the CLI's own job, and the failure line on
+            // stderr.
             if (report.failures.length > 0) {
-                console.error(chalk.red('\nValidation could not complete!'));
-                process.exit(1);
+                throw new Error('Validation could not complete!');
             }
-        }
-        catch (error) {
-            reportError(error);
-            process.exit(1);
-        }
+        });
     },
 };
 //# sourceMappingURL=validate.command.js.map

package/dist/commands/validate/validate.command.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.command.js","sourceRoot":"","sources":["../../../src/commands/validate/validate.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,QAAQ,EAAE,0BAA0B,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AASzG;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK;aACT,MAAM,CAAC,eAAe,EAAE;YACvB,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,0DAA0D;YACvE,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,iBAAiB,EAAE;YACzB,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,gFAAgF;YAC7F,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,kBAAkB,EAAE;YAC1B,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,gDAAgD;YAC7D,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,aAAa,EAAE;YACrB,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,oDAAoD;YACjE,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,UAAU;IACnB,QAAQ,EAAE,8EAA8E;IACxF,OAAO,EAAE,KAAK,EAAE,IAAkD,EAAiB,EAAE;QACnF,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC/E,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC;QAE1D,IAAI,CAAC;YACH,6FAA6F;YAC7F,0BAA0B,EAAE,CAAC;YAE7B,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,QAAQ,EAAE,CAAC;YACvC,MAAM,gBAAgB,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAwB,gBAAgB,EAAE;gBAClG,IAAI,EAAE,CAAC,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,EAAE,IAAI,CAAC;aACjE,CAAC,CAAC;YAEH,+FAA+F;YAC/F,iGAAiG;YACjG,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAE5E,0FAA0F;YAC1F,6FAA6F;YAC7F,6CAA6C;YAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAEpD,wFAAwF;YACxF,sCAAsC;YACtC,EAAE;YACF,4FAA4F;YAC5F,6FAA6F;YAC7F,oEAAoE;YACpE,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC,CAAC;gBAC7D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF,CAAC"}
+{"version":3,"file":"validate.command.js","sourceRoot":"","sources":["../../../src/commands/validate/validate.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AASnE;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,OAAO,EAAE,CAAC,KAAW,EAAQ,EAAE;QAC7B,OAAO,KAAK;aACT,MAAM,CAAC,eAAe,EAAE;YACvB,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,0DAA0D;YACvE,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,iBAAiB,EAAE;YACzB,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,gFAAgF;YAC7F,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,kBAAkB,EAAE;YAC1B,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,gDAAgD;YAC7D,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,aAAa,EAAE;YACrB,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,oDAAoD;YACjE,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,UAAU;IACnB,QAAQ,EAAE,8EAA8E;IACxF,OAAO,EAAE,KAAK,EAAE,IAAkD,EAAiB,EAAE;QACnF,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC/E,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC;QAE1D,MAAM,WAAW,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;YAClD,6FAA6F;YAC7F,WAAW,CAAC,0BAA0B,EAAE,CAAC;YAEzC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;YACnD,MAAM,gBAAgB,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAwB,gBAAgB,EAAE;gBAClG,IAAI,EAAE,CAAC,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,EAAE,IAAI,CAAC;aACjE,CAAC,CAAC;YAEH,+FAA+F;YAC/F,iGAAiG;YACjG,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAE5E,0FAA0F;YAC1F,6FAA6F;YAC7F,6CAA6C;YAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAEpD,wFAAwF;YACxF,sCAAsC;YACtC,EAAE;YACF,4FAA4F;YAC5F,gGAAgG;YAChG,UAAU;YACV,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}

package/dist/resources/octo-v1.schema.json

@@ -81,11 +81,8 @@
               {
                 "additionalProperties": false,
                 "properties": {
-                  "reportDir": {
-                    "type": "string"
-                  },
                   "type": {
-                    "const": "HtmlReportEventListener",
+                    "const": "JournalEventListener",
                     "type": "string"
                   }
                 },
@@ -119,32 +116,49 @@
             {
               "additionalProperties": false,
               "properties": {
-                "encryptionKey": {
-                  "type": "string"
-                },
                 "statePath": {
                   "type": "string"
                 },
                 "type": {
-                  "const": "LocalEncryptionStateProvider",
+                  "const": "LocalStateProvider",
                   "type": "string"
                 }
               },
-              "required": ["encryptionKey", "type", "statePath"],
+              "required": ["type", "statePath"],
               "type": "object"
             },
             {
               "additionalProperties": false,
               "properties": {
+                "appId": {
+                  "type": "string"
+                },
+                "checkInIntervalInSeconds": {
+                  "maximum": 60,
+                  "minimum": 5,
+                  "type": "integer"
+                },
+                "lockContext": {
+                  "type": "string"
+                },
+                "organizationId": {
+                  "type": "string"
+                },
+                "sessionId": {
+                  "type": "string"
+                },
+                "stateManagementServiceUrl": {
+                  "type": "string"
+                },
                 "statePath": {
                   "type": "string"
                 },
                 "type": {
-                  "const": "LocalStateProvider",
+                  "const": "RemoteStateProvider",
                   "type": "string"
                 }
               },
-              "required": ["type", "statePath"],
+              "required": ["appId", "organizationId", "sessionId", "stateManagementServiceUrl", "statePath", "type"],
               "type": "object"
             },
             {