npm - @osaas/cli - Versions diffs - 4.8.4 → 4.10.0 - Mend

@osaas/cli 4.8.4 → 4.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/web/cmd.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/web/cmd.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;~~AAEpC~~,wBAAgB,MAAM,~~YA6DrB~~"}
1	+ {"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/web/cmd.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC,wBAAgB,MAAM,YA4MrB"}

package/dist/web/cmd.js CHANGED Viewed

@@ -59,6 +59,94 @@ function cmdWeb() {
             console.log(err.message);
         }
     });
+    web
+        .command('config-create')
+        .description('Create a configuration service instance')
+        .argument('<name>', 'Name of the configuration service instance')
+        .action(async (name, options, command) => {
+        try {
+            const globalOpts = command.optsWithGlobals();
+            const environment = globalOpts?.env || 'prod';
+            const ctx = new client_core_1.Context({ environment });
+            const configToken = await ctx.getServiceAccessToken('eyevinn-app-config-svc');
+            let configInstance = await (0, client_core_1.getInstance)(ctx, 'eyevinn-app-config-svc', name, configToken);
+            if (!configInstance) {
+                const valkeyToken = await ctx.getServiceAccessToken('valkey-io-valkey');
+                let valkeyInstance = await (0, client_core_1.getInstance)(ctx, 'valkey-io-valkey', name, valkeyToken);
+                if (!valkeyInstance) {
+                    valkeyInstance = await (0, client_core_1.createInstance)(ctx, 'valkey-io-valkey', valkeyToken, {
+                        name
+                    });
+                    await (0, client_core_1.waitForInstanceReady)('valkey-io-valkey', name, ctx);
+                }
+                const ports = await (0, client_core_1.getPortsForInstance)(ctx, 'valkey-io-valkey', name, valkeyToken);
+                const redisPort = ports.find((port) => port.internalPort == 6379);
+                if (!redisPort) {
+                    throw new Error(`Failed to get redis port for instance ${name}`);
+                }
+                configInstance = await (0, client_core_1.createInstance)(ctx, 'eyevinn-app-config-svc', configToken, {
+                    name,
+                    RedisUrl: `redis://${redisPort.externalIp}:${redisPort.externalPort}`
+                });
+                await (0, client_core_1.waitForInstanceReady)('eyevinn-app-config-svc', name, ctx);
+            }
+            console.log(`Configuration service instance available at ${configInstance.url}`);
+        }
+        catch (err) {
+            console.log(err.message);
+        }
+    });
+    web
+        .command('config-delete')
+        .description('Delete a configuration service instance')
+        .argument('<name>', 'Name of the configuration service instance')
+        .option('--data', 'Delete config data')
+        .action(async (name, options, command) => {
+        try {
+            const globalOpts = command.optsWithGlobals();
+            const environment = globalOpts?.env || 'prod';
+            const ctx = new client_core_1.Context({ environment });
+            const configToken = await ctx.getServiceAccessToken('eyevinn-app-config-svc');
+            const configInstance = await (0, client_core_1.getInstance)(ctx, 'eyevinn-app-config-svc', name, configToken);
+            if (configInstance) {
+                await (0, client_core_1.removeInstance)(ctx, 'eyevinn-app-config-svc', name, configToken);
+                if (options.data) {
+                    console.log('Deleting config data...');
+                    const valkeyToken = await ctx.getServiceAccessToken('valkey-io-valkey');
+                    await (0, client_core_1.removeInstance)(ctx, 'valkey-io-valkey', name, valkeyToken);
+                }
+            }
+        }
+        catch (err) {
+            console.log(err.message);
+        }
+    });
+    web
+        .command('config-to-env')
+        .description('Load configuration from Application Config service and set as environment variables')
+        .argument('<configInstance>', 'Name of the application configuration service instance')
+        .action(async (configInstance, options, command) => {
+        try {
+            const globalOpts = command.optsWithGlobals();
+            const environment = globalOpts?.env || 'prod';
+            const ctx = new client_core_1.Context({ environment });
+            const token = await ctx.getServiceAccessToken('eyevinn-app-config-svc');
+            const instance = await (0, client_core_1.getInstance)(ctx, 'eyevinn-app-config-svc', configInstance, token);
+            if (instance) {
+                const url = new URL('/api/v1/config', instance.url);
+                const response = await fetch(url);
+                if (response.ok) {
+                    const data = (await response.json());
+                    data.items.map((config) => {
+                        console.log(`export ${config.key.toUpperCase()}=${config.value}`);
+                    });
+                }
+            }
+        }
+        catch (err) {
+            console.log(err.message);
+        }
+    });
     return web;
 }
 exports.cmdWeb = cmdWeb;

package/dist/web/cmd.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../src/web/cmd.ts"],"names":[],"mappings":";;;AAAA,~~oDAA6C~~;~~AAC7C~~,kDAA0E;AAC1E,yCAAoC;~~AAEpC~~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~~AA7DD~~,~~wBA6DC~~"}
1	+ {"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../src/web/cmd.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@osaas/cli",
-  "version": "4.8.4",
+  "version": "4.10.0",
   "description": "Open Source Cloud CLI",
   "author": "Eyevinn Open Source Cloud <osc@eyevinn.se>",
   "homepage": "https://www.osaas.io",
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f2fd26e785fc80d629cab4916f3fd22e77726888"
+  "gitHead": "b88a923c7df03c125540d6ad7ff145684d8a98e9"
 }

package/readme.md CHANGED Viewed

@@ -152,3 +152,34 @@ PAT_SECRET=<pat-secret> osc admin list-instances eyevinn channel-engine
 ```
 PAT_SECRET=<pat-secret> osc --env dev admin remove-instance asdasd channel-engine mychannel
 ```
+### Create application configuration service instance
+To manage configuration values for an application we can create an instance of an Application Config Service.
+```bash
+% osc web config-create jonastest
+Configuration service instance available at https://eyevinnlab-jonastest.eyevinn-app-config-svc.auto.prod.osaas.io
+```
+And to remove it (with the data)
+```bash
+% osc web config-delete --data jonastest
+```
+### Store application configuration values as environment variables
+Configuration values managed by the Application Config Service can be stored as environment variable using this commmand.
+```bash
+% osc web config-to-env <config-instance-name>
+export AWS_ACCESS_KEY_ID=admin
+export CHANNELURL=https://eyevinnlab.ce.prod.osaas.io/channels/mychannel/master.m3u8
+```
+And storing it in the shell.
+```bash
+% eval `osc web config-to-env <config-instance-name>`
+```

package/src/web/cmd.ts CHANGED Viewed

@@ -1,7 +1,21 @@
-import { Context } from '@osaas/client-core';
+import {
+  Context,
+  createInstance,
+  getInstance,
+  getPortsForInstance,
+  removeInstance,
+  waitForInstanceReady
+} from '@osaas/client-core';
 import { createCloudfrontDistribution, publish } from '@osaas/client-web';
 import { Command } from 'commander';
+interface ConfigList {
+  offset: number;
+  limit: number;
+  total: number;
+  items: [{ key: string; value: string }];
+}
 export function cmdWeb() {
   const web = new Command('web');
@@ -62,5 +76,148 @@ export function cmdWeb() {
         console.log((err as Error).message);
       }
     });
+  web
+    .command('config-create')
+    .description('Create a configuration service instance')
+    .argument('<name>', 'Name of the configuration service instance')
+    .action(async (name, options, command) => {
+      try {
+        const globalOpts = command.optsWithGlobals();
+        const environment = globalOpts?.env || 'prod';
+        const ctx = new Context({ environment });
+        const configToken = await ctx.getServiceAccessToken(
+          'eyevinn-app-config-svc'
+        );
+        let configInstance = await getInstance(
+          ctx,
+          'eyevinn-app-config-svc',
+          name,
+          configToken
+        );
+        if (!configInstance) {
+          const valkeyToken = await ctx.getServiceAccessToken(
+            'valkey-io-valkey'
+          );
+          let valkeyInstance = await getInstance(
+            ctx,
+            'valkey-io-valkey',
+            name,
+            valkeyToken
+          );
+          if (!valkeyInstance) {
+            valkeyInstance = await createInstance(
+              ctx,
+              'valkey-io-valkey',
+              valkeyToken,
+              {
+                name
+              }
+            );
+            await waitForInstanceReady('valkey-io-valkey', name, ctx);
+          }
+          const ports = await getPortsForInstance(
+            ctx,
+            'valkey-io-valkey',
+            name,
+            valkeyToken
+          );
+          const redisPort = ports.find((port) => port.internalPort == 6379);
+          if (!redisPort) {
+            throw new Error(`Failed to get redis port for instance ${name}`);
+          }
+          configInstance = await createInstance(
+            ctx,
+            'eyevinn-app-config-svc',
+            configToken,
+            {
+              name,
+              RedisUrl: `redis://${redisPort.externalIp}:${redisPort.externalPort}`
+            }
+          );
+          await waitForInstanceReady('eyevinn-app-config-svc', name, ctx);
+        }
+        console.log(
+          `Configuration service instance available at ${configInstance.url}`
+        );
+      } catch (err) {
+        console.log((err as Error).message);
+      }
+    });
+  web
+    .command('config-delete')
+    .description('Delete a configuration service instance')
+    .argument('<name>', 'Name of the configuration service instance')
+    .option('--data', 'Delete config data')
+    .action(async (name, options, command) => {
+      try {
+        const globalOpts = command.optsWithGlobals();
+        const environment = globalOpts?.env || 'prod';
+        const ctx = new Context({ environment });
+        const configToken = await ctx.getServiceAccessToken(
+          'eyevinn-app-config-svc'
+        );
+        const configInstance = await getInstance(
+          ctx,
+          'eyevinn-app-config-svc',
+          name,
+          configToken
+        );
+        if (configInstance) {
+          await removeInstance(
+            ctx,
+            'eyevinn-app-config-svc',
+            name,
+            configToken
+          );
+          if (options.data) {
+            console.log('Deleting config data...');
+            const valkeyToken = await ctx.getServiceAccessToken(
+              'valkey-io-valkey'
+            );
+            await removeInstance(ctx, 'valkey-io-valkey', name, valkeyToken);
+          }
+        }
+      } catch (err) {
+        console.log((err as Error).message);
+      }
+    });
+  web
+    .command('config-to-env')
+    .description(
+      'Load configuration from Application Config service and set as environment variables'
+    )
+    .argument(
+      '<configInstance>',
+      'Name of the application configuration service instance'
+    )
+    .action(async (configInstance, options, command) => {
+      try {
+        const globalOpts = command.optsWithGlobals();
+        const environment = globalOpts?.env || 'prod';
+        const ctx = new Context({ environment });
+        const token = await ctx.getServiceAccessToken('eyevinn-app-config-svc');
+        const instance = await getInstance(
+          ctx,
+          'eyevinn-app-config-svc',
+          configInstance,
+          token
+        );
+        if (instance) {
+          const url = new URL('/api/v1/config', instance.url);
+          const response = await fetch(url);
+          if (response.ok) {
+            const data: ConfigList = (await response.json()) as ConfigList;
+            data.items.map((config) => {
+              console.log(`export ${config.key.toUpperCase()}=${config.value}`);
+            });
+          }
+        }
+      } catch (err) {
+        console.log((err as Error).message);
+      }
+    });
   return web;
 }