@hello.nrfcloud.com/nrfcloud-api-helpers 1.1.4 → 1.2.1

package/dist/settings/getAllAccountsSettings.js

@@ -1,29 +1,15 @@
 import { SSMClient } from '@aws-sdk/client-ssm';
 import { get } from '@bifravst/aws-ssm-settings-helpers';
-import { getAccountsFromAllSettings } from './getAllAccounts.js';
-import { validateSettings } from './settings.js';
 import { NRFCLOUD_ACCOUNT_SCOPE } from './scope.js';
+import { groupByAccount } from './groupByAccount.js';
+import { validateSettings } from './settings.js';
 /**
  * Returns settings for all accounts
  */
-export const getAllAccountsSettings = async ({ ssm, stackName, }) => {
-    const allSettings = await get(ssm)({
-        stackName,
-        scope: NRFCLOUD_ACCOUNT_SCOPE,
-    })();
-    const accounts = getAccountsFromAllSettings(allSettings);
-    return [...accounts].reduce((allAccountSettings, account) => ({
-        ...allAccountSettings,
-        [account]: validateSettings(Object.entries(allSettings)
-            .filter(([k]) => k.startsWith(`${account}/`))
-            .map(([k, v]) => [
-            k.replace(new RegExp(`^${account}/`), ''),
-            v,
-        ])
-            .reduce((s, [k, v]) => ({ ...s, [k]: v }), {})),
-    }), {});
-};
-console.log(await getAllAccountsSettings({
-    ssm: new SSMClient(),
-    stackName: 'hello-nrfcloud-backend',
-}));
+export const getAllAccountsSettings = async ({ ssm, stackName, }) => Object.entries(groupByAccount(await get(ssm)({
+    stackName,
+    scope: NRFCLOUD_ACCOUNT_SCOPE,
+})())).reduce((allSettings, [account, settings]) => ({
+    ...allSettings,
+    [account]: validateSettings(settings),
+}), {});

package/dist/settings/groupByAccount.d.ts

@@ -0,0 +1 @@
+export declare const groupByAccount: (allSettings: Record<string, string>) => Record<string, Record<string, string>>;

package/dist/settings/groupByAccount.js

@@ -0,0 +1,14 @@
+import { getAccountsFromAllSettings } from './getAllAccounts.js';
+export const groupByAccount = (allSettings) => {
+    const accounts = getAccountsFromAllSettings(allSettings);
+    return [...accounts].reduce((allAccountSettings, account) => ({
+        ...allAccountSettings,
+        [account]: Object.entries(allSettings)
+            .filter(([k]) => k.startsWith(`${account}/`))
+            .map(([k, v]) => [
+            k.replace(new RegExp(`^${account}/`), ''),
+            v,
+        ])
+            .reduce((s, [k, v]) => ({ ...s, [k]: v }), {}),
+    }), {});
+};

package/dist/settings/groupByAccount.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/settings/groupByAccount.spec.js

@@ -0,0 +1,20 @@
+import { it, describe } from 'node:test';
+import assert from 'node:assert/strict';
+import { groupByAccount } from './groupByAccount.js';
+void describe('groupByAccount()', () => {
+    void it('should group settings by account', () => assert.deepEqual(groupByAccount({
+        'elite/accountDeviceClientId': 'account-4db55163-7593-4d63-9679-d16fbc2d464f',
+        'elite/healthCheckModel': 'PCA20035+solar',
+        'acme/mqttEndpoint': 'mqtt.nrfcloud.com',
+        'acme/teamId': 'f4ba6ede-7867-43eb-a495-7e0de108f52e',
+    }), {
+        acme: {
+            mqttEndpoint: 'mqtt.nrfcloud.com',
+            teamId: 'f4ba6ede-7867-43eb-a495-7e0de108f52e',
+        },
+        elite: {
+            accountDeviceClientId: 'account-4db55163-7593-4d63-9679-d16fbc2d464f',
+            healthCheckModel: 'PCA20035+solar',
+        },
+    }));
+});

package/dist/settings/index.d.ts

@@ -1,5 +1,5 @@
 export * from './settings.js';
 export * from './scope.js';
-export * from './initializeAccount.js';
 export * from './getAllAccounts.js';
 export * from './getAllAccountsSettings.js';
+export * from './groupByAccount.js';

package/dist/settings/index.js

@@ -1,5 +1,5 @@
 export * from './settings.js';
 export * from './scope.js';
-export * from './initializeAccount.js';
 export * from './getAllAccounts.js';
 export * from './getAllAccountsSettings.js';
+export * from './groupByAccount.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hello.nrfcloud.com/nrfcloud-api-helpers",
-  "version": "1.1.4",
+  "version": "1.2.1",
   "description": "Helper functions for integrating nRF Cloud APIs in AWS lambdas written in TypeScript.",
   "exports": {
     "./*": {

package/dist/settings/initializeAccount.d.ts

@@ -1,10 +0,0 @@
-import { SSMClient } from '@aws-sdk/client-ssm';
-/**
- * Initializes the nRF Cloud Account
- */
-export declare const initializeAccount: ({ ssm, stackName, account, iotEndpoint, }: {
-    ssm: SSMClient;
-    stackName: string;
-    account: string;
-    iotEndpoint: string;
-}) => (reset?: boolean) => Promise<void>;

package/dist/settings/initializeAccount.js

@@ -1,73 +0,0 @@
-import { SSMClient } from '@aws-sdk/client-ssm';
-import chalk from 'chalk';
-import { NRFCLOUD_ACCOUNT_SCOPE, nrfCloudAccount } from './scope.js';
-import { get } from '@bifravst/aws-ssm-settings-helpers';
-import { createAccountDevice } from '../api/createAccountDevice.js';
-import { deleteAccountDevice } from '../api/deleteAccountDevice.js';
-import { getAccountInfo } from '../api/getAccountInfo.js';
-import { defaultApiEndpoint, getSettings as getNRFCloudSettings, putSettings as putNRFCloudSettings, } from './settings.js';
-/**
- * Initializes the nRF Cloud Account
- */
-export const initializeAccount = ({ ssm, stackName, account, iotEndpoint, }) => async (reset = false) => {
-    const settingsReader = get(ssm)({
-        stackName,
-        scope: NRFCLOUD_ACCOUNT_SCOPE,
-        context: nrfCloudAccount(account),
-    });
-    const { apiKey, apiEndpoint } = await settingsReader();
-    if (apiKey === undefined)
-        throw new Error(`nRF Cloud API key not configured.`);
-    let settingsWithAccountDevice = undefined;
-    try {
-        settingsWithAccountDevice = await getNRFCloudSettings({
-            ssm,
-            stackName,
-            account,
-        })();
-        console.log(chalk.white('Stack settings'));
-        Object.entries(settingsWithAccountDevice).forEach(([k, v]) => console.log(chalk.yellow(`${k}:`), chalk.blue(v)));
-        console.log();
-    }
-    catch (err) {
-        console.log(chalk.magenta(`Stack not configured.`));
-    }
-    const effectiveEndpoint = apiEndpoint === undefined ? defaultApiEndpoint : new URL(apiEndpoint);
-    const accountInfo = await getAccountInfo({
-        endpoint: effectiveEndpoint,
-        apiKey,
-    });
-    if ('error' in accountInfo) {
-        console.error(chalk.red('⚠️'), '', chalk.red(accountInfo.error.message));
-        process.exit(1);
-    }
-    console.log(chalk.yellow('AWS IoT endpoint:'), chalk.blue(iotEndpoint));
-    console.log();
-    console.log(chalk.white('nRF Cloud account info:'));
-    Object.entries(accountInfo).forEach(([k, v]) => console.log(chalk.yellow(`${k}:`), chalk.blue(v)));
-    console.log();
-    if (reset === true) {
-        console.debug(chalk.magenta(`Deleting account device ...`));
-        await deleteAccountDevice({ apiKey, endpoint: effectiveEndpoint });
-        console.log(chalk.green(`Account device deleted.`));
-    }
-    if (settingsWithAccountDevice === undefined || reset === true) {
-        console.debug(chalk.magenta(`Generating new account device credentials ...`));
-        const { clientCert, privateKey } = await createAccountDevice({
-            apiKey,
-            endpoint: effectiveEndpoint,
-        });
-        if (privateKey === undefined) {
-            console.error(chalk.red('⚠️'), chalk.red('Account device exists'));
-            throw new Error(`Account device exists in account ${accountInfo.team.tenantId}`);
-        }
-        console.log(chalk.green(`Account device created.`));
-        await putNRFCloudSettings({ ssm, stackName, account })({
-            accountDeviceClientCert: clientCert,
-            accountDevicePrivateKey: privateKey,
-            accountDeviceClientId: `account-${accountInfo.team.tenantId}`,
-            mqttEndpoint: accountInfo.mqttEndpoint,
-            mqttTopicPrefix: accountInfo.mqttTopicPrefix,
-        });
-    }
-};