@flowcore/cli 4.2.3 → 4.3.0

package/CHANGELOG.md

@@ -10,6 +10,19 @@
 
 * added description to start that includes week ([58687a7](https://github.com/flowcore-io/flowcore-cli/commit/58687a7bbb66aaa5d6da26af88e555cbb1e72467))
 
+## [4.3.0](https://github.com/flowcore-io/flowcore-cli/compare/v4.2.3...v4.3.0) (2024-10-18)
+
+
+### Features
+
+* **apply:** :sparkles: added flowcore apply v2 with api registry service hooks ([2115c9e](https://github.com/flowcore-io/flowcore-cli/commit/2115c9e61730c8c241578a3a76ec4d24845d969f))
+
+
+### Bug Fixes
+
+* **apply:** :sparkles: added apply v2 option ([7c60fdc](https://github.com/flowcore-io/flowcore-cli/commit/7c60fdc1cab54de142b6526e0452dff41c902aea))
+* **configuration:** :rotating_light: fixed linting errors ([fe6e4e9](https://github.com/flowcore-io/flowcore-cli/commit/fe6e4e928d37c9280d5b299afdb9403ee15becd6))
+
 ## [4.2.3](https://github.com/flowcore-io/flowcore-cli/compare/v4.2.2...v4.2.3) (2024-10-17)
 
 

package/README.md

@@ -18,7 +18,7 @@ $ npm install -g @flowcore/cli
 $ flowcore COMMAND
 running command...
 $ flowcore (--version)
-@flowcore/cli/4.2.3 linux-x64 node-v20.17.0
+@flowcore/cli/4.3.0 linux-x64 node-v20.17.0
 $ flowcore --help [COMMAND]
 USAGE
   $ flowcore COMMAND
@@ -81,12 +81,13 @@ Apply a resource manifest against the Flowcore Platform
 
 ```
 USAGE
-  $ flowcore apply -f <value> [--profile <value>] [-y]
+  $ flowcore apply -f <value> [--profile <value>] [--v2] [-y]
 
 FLAGS
   -f, --file=<value>...  (required) file to apply
   -y, --yes              skip confirmation
       --profile=<value>  Specify the configuration profile to use
+      --v2               use v2 api
 
 DESCRIPTION
   Apply a resource manifest against the Flowcore Platform
@@ -95,7 +96,7 @@ EXAMPLES
   $ flowcore apply -f ./path/to/manifest.yml
 ```
 
-_See code: [src/commands/apply.ts](https://github.com/flowcore-io/flowcore-cli/blob/v4.2.3/src/commands/apply.ts)_
+_See code: [src/commands/apply.ts](https://github.com/flowcore-io/flowcore-cli/blob/v4.3.0/src/commands/apply.ts)_
 
 ## `flowcore auth delete key API_KEY_NAME`
 
@@ -1253,7 +1254,7 @@ EXAMPLES
   $ flowcore stream "https://flowcore.io/<org>/<data core>/<flow type>/[<event type1>,<event type2>,<event type3>].stream" -s 3m
 ```
 
-_See code: [@flowcore/cli-plugin-core](https://github.com/flowcore/flowcore-cli-plugin-core/blob/v4.0.4/src/commands/stream.ts)_
+_See code: [@flowcore/cli-plugin-core](https://github.com/flowcore/flowcore-cli-plugin-core/blob/v4.2.0/src/commands/stream.ts)_
 
 ## `flowcore stream http STREAM`
 
@@ -1295,7 +1296,7 @@ EXAMPLES
   $ flowcore stream http "https://flowcore.io/<org>/<data core>/<flow type>/[<event type1>,<event type2>,<event type3>].stream" -s 3m -d http://localhost:3000/transform
 ```
 
-_See code: [@flowcore/cli-plugin-core](https://github.com/flowcore/flowcore-cli-plugin-core/blob/v4.0.4/src/commands/stream/http.ts)_
+_See code: [@flowcore/cli-plugin-core](https://github.com/flowcore/flowcore-cli-plugin-core/blob/v4.2.0/src/commands/stream/http.ts)_
 
 ## `flowcore version`
 

package/dist/commands/apply.d.ts

@@ -5,6 +5,7 @@ export default class Apply extends BaseCommand<typeof Apply> {
     static examples: string[];
     static flags: {
         file: import("@oclif/core/interfaces").OptionFlag<string[], import("@oclif/core/interfaces").CustomOptions>;
+        v2: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/apply.js

@@ -1,32 +1,67 @@
 import { BaseCommand } from "@flowcore/cli-plugin-config";
-import { Flags } from '@oclif/core';
+import { ApiRegistryService, baseResourceDto } from "@flowcore/cli-plugin-core";
+import { Flags } from "@oclif/core";
 import dayjs from "dayjs";
 import isSameOrBefore from "dayjs/plugin/isSameOrBefore.js";
 import utc from "dayjs/plugin/utc.js";
+import * as yaml from "js-yaml";
+import fs from "node:fs";
+import { join } from "node:path";
 dayjs.extend(utc);
 dayjs.extend(isSameOrBefore);
 export default class Apply extends BaseCommand {
     static args = {};
-    static description = 'Apply a resource manifest against the Flowcore Platform';
+    static description = "Apply a resource manifest against the Flowcore Platform";
     static examples = [
-        '<%= config.bin %> <%= command.id %> -f ./path/to/manifest.yml',
+        "<%= config.bin %> <%= command.id %> -f ./path/to/manifest.yml",
     ];
     static flags = {
-        file: Flags.string({ char: 'f', description: 'file to apply', multiple: true, required: true }),
-        yes: Flags.boolean({ char: 'y', description: 'skip confirmation' }),
+        file: Flags.string({
+            char: "f",
+            description: "file to apply",
+            multiple: true,
+            required: true,
+        }),
+        v2: Flags.boolean({ default: false, description: "use v2 api" }),
+        yes: Flags.boolean({ char: "y", description: "skip confirmation" }),
     };
     async run() {
         const { flags } = await this.parse(Apply);
-        const resources = [
-            "data-core",
-            "scenario",
-        ];
+        const apiRegistry = ApiRegistryService.getInstance(this.logger);
+        await this.config.runHook("register-api", {
+            apiRegistry,
+        });
+        if (flags.v2) {
+            try {
+                let documents = [];
+                if (fs.statSync(flags.file[0]).isDirectory()) {
+                    const files = fs.readdirSync(flags.file[0]);
+                    documents = files.flatMap((file) => {
+                        const content = fs.readFileSync(join(flags.file[0], file), "utf8");
+                        return yaml.loadAll(content);
+                    });
+                }
+                else {
+                    documents = flags.file.flatMap((file) => {
+                        const content = fs.readFileSync(file, "utf8");
+                        return yaml.loadAll(content);
+                    });
+                }
+                const parsedDocuments = documents.map((doc) => baseResourceDto.parse(doc));
+                await apiRegistry.apply(parsedDocuments);
+            }
+            catch (error) {
+                this.logger.fatal(`Failed to apply documents with error: ${error}`);
+            }
+            return;
+        }
+        const resources = ["data-core", "scenario"];
         for (const resource of resources) {
             // eslint-disable-next-line no-await-in-loop
             await this.config.runCommand(`${resource}:apply`, [
                 ...flags.file.map((file) => `--file=${file}`),
-                ...flags.profile ? `--profile=${flags.profile}` : [],
-                ...flags.yes ? ['--yes'] : []
+                ...(flags.profile ? `--profile=${flags.profile}` : []),
+                ...(flags.yes ? ["--yes"] : []),
             ]);
         }
     }

package/oclif.manifest.json

@@ -24,6 +24,12 @@
           "multiple": true,
           "type": "option"
         },
+        "v2": {
+          "description": "use v2 api",
+          "name": "v2",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "yes": {
           "char": "y",
           "description": "skip confirmation",
@@ -48,5 +54,5 @@
       ]
     }
   },
-  "version": "4.2.3"
+  "version": "4.3.0"
 }

package/package.json

@@ -8,7 +8,7 @@
     "@flowcore/cli-plugin-ai": "^1.1.2",
     "@flowcore/cli-plugin-auth-management": "^1.2.2",
     "@flowcore/cli-plugin-config": "^2.4.1",
-    "@flowcore/cli-plugin-core": "^4.0.4",
+    "@flowcore/cli-plugin-core": "^4.2.0",
     "@flowcore/cli-plugin-data-core": "^3.1.1",
     "@flowcore/cli-plugin-generator": "^1.6.0",
     "@flowcore/cli-plugin-scenario": "^4.1.2",
@@ -27,6 +27,7 @@
     "enquirer": "^2.4.1",
     "graphql": "^16.8.1",
     "graphql-request": "^6.1.0",
+    "js-yaml": "^4.1.0",
     "jwt-decode": "^4.0.0",
     "lodash": "^4.17.21",
     "merge": "^2.1.1",
@@ -40,6 +41,7 @@
     "@oclif/test": "^4.0.9",
     "@types/chai": "^4",
     "@types/express": "^4.17.21",
+    "@types/js-yaml": "^4.0.9",
     "@types/lodash": "^4.14.202",
     "@types/mocha": "^10",
     "@types/node": "^18",
@@ -106,7 +108,7 @@
     "prestart": "npm run build",
     "update-schema": "rover graph introspect https://graph.api.staging.flowcore.io/graphql -o schema.gql"
   },
-  "version": "4.2.3",
+  "version": "4.3.0",
   "bugs": "https://github.com/flowcore-io/flowcore-cli/issues",
   "keywords": [
     "flowcore",