@rockcarver/frodo-lib 0.17.6 → 0.17.7

package/esm/api/{StartupApi.test.mjs → cloud/StartupApi.test.mjs}

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import { StartupRaw, state } from '../index';
+import { StartupRaw, state } from '../../index';
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
@@ -12,14 +12,14 @@ state.setCookieName('cookieName');
 state.setCookieValue('cookieValue');
 describe('StartupApi - getStatus()', () => {
   test('getStatus() 1: Get restart status - expect "ready"', async () => {
-    const response = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../test/mocks/StartupApi/getStatus/ready.json'), 'utf8'));
+    const response = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../test/mocks/StartupApi/getStatus/ready.json'), 'utf8'));
     mock.onGet('https://openam-frodo-dev.forgeblocks.com/environment/startup').reply(200, response);
     const status = await StartupRaw.getStatus();
     expect(status in StartupRaw.RestartStatus).toBeTruthy();
     expect(status).toBe(StartupRaw.RestartStatus.ready);
   });
   test('getStatus() 2: Get restart status - expect "restarting"', async () => {
-    const response = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../test/mocks/StartupApi/getStatus/restarting.json'), 'utf8'));
+    const response = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../test/mocks/StartupApi/getStatus/restarting.json'), 'utf8'));
     mock.onGet('https://openam-frodo-dev.forgeblocks.com/environment/startup').reply(200, response);
     const status = await StartupRaw.getStatus();
     expect(status in StartupRaw.RestartStatus).toBeTruthy();
@@ -28,18 +28,18 @@ describe('StartupApi - getStatus()', () => {
 });
 describe('StartupApi - initiateRestart()', () => {
   test('initiateRestart() 1: Initiate restart - expect "ready" -> "restarting"', async () => {
-    const response1 = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../test/mocks/StartupApi/getStatus/ready.json'), 'utf8'));
+    const response1 = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../test/mocks/StartupApi/getStatus/ready.json'), 'utf8'));
     mock.onGet('https://openam-frodo-dev.forgeblocks.com/environment/startup').reply(200, response1);
-    const response2 = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../test/mocks/StartupApi/initiateRestart/restarting.json'), 'utf8'));
+    const response2 = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../test/mocks/StartupApi/initiateRestart/restarting.json'), 'utf8'));
     mock.onPost('https://openam-frodo-dev.forgeblocks.com/environment/startup?_action=restart').reply(200, response2);
     const status = await StartupRaw.initiateRestart();
     expect(status in StartupRaw.RestartStatus).toBeTruthy();
     expect(status).toBe(StartupRaw.RestartStatus.restarting);
   });
   test('initiateRestart() 2: Initiate restart - expect "restarting" -> exception', async () => {
-    const response1 = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../test/mocks/StartupApi/getStatus/restarting.json'), 'utf8'));
+    const response1 = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../test/mocks/StartupApi/getStatus/restarting.json'), 'utf8'));
     mock.onGet('https://openam-frodo-dev.forgeblocks.com/environment/startup').reply(200, response1);
-    const response2 = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../test/mocks/StartupApi/initiateRestart/restarting.json'), 'utf8'));
+    const response2 = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../test/mocks/StartupApi/initiateRestart/restarting.json'), 'utf8'));
     mock.onPost('https://openam-frodo-dev.forgeblocks.com/environment/startup?_action=restart').reply(200, response2);
     expect.assertions(2);
     try {

package/esm/api/{VariablesApi.mjs → cloud/VariablesApi.mjs}

@@ -1,8 +1,8 @@
 import util from 'util';
-import { encode } from './utils/Base64';
-import { getTenantURL, getCurrentRealmPath } from './utils/ApiUtils';
-import { generateESVApi } from './BaseApi';
-import * as state from '../shared/State';
+import { encode } from '../utils/Base64';
+import { getTenantURL, getCurrentRealmPath } from '../utils/ApiUtils';
+import { generateEnvApi } from '../BaseApi';
+import * as state from '../../shared/State';
 const variablesListURLTemplate = '%s/environment/variables';
 const variableURLTemplate = '%s/environment/variables/%s';
 const variableSetDescriptionURLTemplate = `${variableURLTemplate}?_action=setDescription`;
@@ -23,7 +23,7 @@ export async function getVariables() {
   const urlString = util.format(variablesListURLTemplate, getTenantURL(state.getHost()));
   const {
     data
-  } = await generateESVApi(getApiConfig()).get(urlString, {
+  } = await generateEnvApi(getApiConfig()).get(urlString, {
     withCredentials: true
   });
   return data;
@@ -38,7 +38,7 @@ export async function getVariable(variableId) {
   const urlString = util.format(variableURLTemplate, getTenantURL(state.getHost()), variableId);
   const {
     data
-  } = await generateESVApi(getApiConfig()).get(urlString, {
+  } = await generateEnvApi(getApiConfig()).get(urlString, {
     withCredentials: true
   });
   return data;
@@ -58,7 +58,7 @@ export async function putVariable(variableId, value, description) {
   const urlString = util.format(variableURLTemplate, getTenantURL(state.getHost()), variableId);
   const {
     data
-  } = await generateESVApi(getApiConfig()).put(urlString, variableData, {
+  } = await generateEnvApi(getApiConfig()).put(urlString, variableData, {
     withCredentials: true
   });
   return data;
@@ -74,7 +74,7 @@ export async function setVariableDescription(variableId, description) {
   const urlString = util.format(variableSetDescriptionURLTemplate, getTenantURL(state.getHost()), variableId);
   const {
     data
-  } = await generateESVApi(getApiConfig()).post(urlString, {
+  } = await generateEnvApi(getApiConfig()).post(urlString, {
     description
   }, {
     withCredentials: true
@@ -91,7 +91,7 @@ export async function deleteVariable(variableId) {
   const urlString = util.format(variableURLTemplate, getTenantURL(state.getHost()), variableId);
   const {
     data
-  } = await generateESVApi(getApiConfig()).delete(urlString, {
+  } = await generateEnvApi(getApiConfig()).delete(urlString, {
     withCredentials: true
   });
   return data;

package/esm/api/{VariablesApi.test.mjs → cloud/VariablesApi.test.mjs}

@@ -29,13 +29,8 @@
  * Note: FRODO_DEBUG=1 is optional and enables debug logging for some output
  * in case things don't function as expected
  */
-import { jest } from '@jest/globals';
-import { VariablesRaw } from '../index';
-import { autoSetupPolly } from '../utils/AutoSetupPolly';
-
-// Increase timeout for this test as pipeline keeps failing with error:
-// Timeout - Async callback was not invoked within the 5000 ms timeout specified by jest.setTimeout.
-jest.setTimeout(30000);
+import { VariablesRaw } from '../../index';
+import { autoSetupPolly } from '../../utils/AutoSetupPolly';
 autoSetupPolly();
 describe('VariablesApi', () => {
   const var1 = {

package/esm/index.mjs

@@ -9,12 +9,12 @@ export * as NodeRaw from './api/NodeApi';
 // use a public oauth2/oidc library. might be ok for now since there is only
 // one place where the cli needs to execute an oauth flow.
 export * as OAuth2OIDCApi from './api/OAuth2OIDCApi';
-export * as SecretsRaw from './api/SecretsApi';
+export * as SecretsRaw from './api/cloud/SecretsApi';
 export * as SocialIdentityProvidersRaw from './api/SocialIdentityProvidersApi';
-export * as StartupRaw from './api/StartupApi';
+export * as StartupRaw from './api/cloud/StartupApi';
 export * as TreeRaw from './api/TreeApi';
 export * as TypesRaw from './api/ApiTypes';
-export * as VariablesRaw from './api/VariablesApi';
+export * as VariablesRaw from './api/cloud/VariablesApi';
 export * as IdmConfigRaw from './api/IdmConfigApi';
 
 // Ops Layer
@@ -26,9 +26,10 @@ export * as ConnectionProfile from './ops/ConnectionProfileOps';
 export * as EmailTemplate from './ops/EmailTemplateOps';
 export * as Idp from './ops/IdpOps';
 export * as Idm from './ops/IdmOps';
+export * as Info from './ops/InfoOps';
 export * as Journey from './ops/JourneyOps';
 export * as Jose from './ops/JoseOps';
-export * as Log from './ops/LogOps';
+export * as Log from './ops/cloud/LogOps';
 export * as ManagedObject from './ops/ManagedObjectOps';
 export * as Node from './ops/NodeOps';
 export * as OAuth2Client from './ops/OAuth2ClientOps';
@@ -37,12 +38,12 @@ export * as Realm from './ops/RealmOps';
 export * as Saml2 from './ops/Saml2Ops';
 export * as Script from './ops/ScriptOps';
 export * as Service from './ops/ServiceOps';
-export * as Secrets from './ops/SecretsOps';
-export * as ServiceAccount from './ops/ServiceAccountOps';
-export * as Startup from './ops/StartupOps';
+export * as Secrets from './ops/cloud/SecretsOps';
+export * as ServiceAccount from './ops/cloud/ServiceAccountOps';
+export * as Startup from './ops/cloud/StartupOps';
 export * as Theme from './ops/ThemeOps';
 export * as Types from './ops/OpsTypes';
-export * as Variables from './ops/VariablesOps';
+export * as Variables from './ops/cloud/VariablesOps';
 // TODO: revisit if there are better ways
 export * as Utils from './ops/utils/OpsUtils';
 export * as ValidationUtils from './ops/utils/ValidationUtils';
@@ -52,8 +53,4 @@ export * as ExportImportUtils from './ops/utils/ExportImportUtils';
 // lib should be stateless, an aplication should own its state
 export * as state from './shared/State';
 export * as constants from './storage/StaticStorage';
-
-// Mock Engine
-export * as ForgeRockApiMockEngine from './test/mocks/ForgeRockApiMockEngine';
-export { FrodoMockAdapter } from './api/BaseApi';
 //# sourceMappingURL=index.js.map

package/esm/ops/AdminOps.mjs

@@ -5,7 +5,7 @@ import { getConfigEntity, putConfigEntity } from '../api/IdmConfigApi';
 import { isEqualJson, getRealmManagedUser } from './utils/OpsUtils';
 import { getRealmManagedOrganization } from './OrganizationOps';
 import { getOAuth2Provider } from '../api/OAuth2ProviderApi';
-import { putSecret } from '../api/SecretsApi';
+import { putSecret } from '../api/cloud/SecretsApi';
 import { clientCredentialsGrant } from '../api/OAuth2OIDCApi';
 import { printMessage } from './utils/Console';
 import path from 'path';

package/esm/ops/AgentOps.test.mjs

@@ -46,14 +46,9 @@
  * Note: FRODO_DEBUG=1 is optional and enables debug logging for some output
  * in case things don't function as expected
  */
-import { jest } from '@jest/globals';
 import { Agent, AgentRaw } from '../index';
 import { getAgent } from '../test/mocks/ForgeRockApiMockEngine';
 import { autoSetupPolly } from '../utils/AutoSetupPolly';
-
-// Increase timeout for this test as pipeline keeps failing with error:
-// Timeout - Async callback was not invoked within the 5000 ms timeout specified by jest.setTimeout.
-jest.setTimeout(30000);
 autoSetupPolly();
 async function stageAgent(agent, create = true) {
   // delete if exists, then create

package/esm/ops/AuthenticateOps.mjs

@@ -15,7 +15,7 @@ import { createSignedJwtToken } from './JoseOps';
 import { getManagedObject } from '../api/ManagedObjectApi';
 const adminClientPassword = 'doesnotmatter';
 const redirectUrlTemplate = '/platform/appAuthHelperRedirect.html';
-const idmAdminScopes = 'fr:idm:* openid';
+const idmAdminScopes = 'fr:idm:* fr:idc:esv:*';
 const serviceAccountScopes = 'fr:am:* fr:idm:* fr:idc:esv:*';
 let adminClientId = 'idmAdminClient';
 
@@ -25,9 +25,7 @@ let adminClientId = 'idmAdminClient';
  */
 async function determineCookieName() {
   try {
-    const {
-      data
-    } = await getServerInfo();
+    const data = await getServerInfo();
     debugMessage(`AuthenticateOps.getCookieName: cookieName=${data.cookieName}`);
     return data.cookieName;
   } catch (error) {
@@ -332,7 +330,7 @@ async function determineDeploymentTypeAndDefaultRealmAndVersion() {
   }
   determineDefaultRealm(state.getDeploymentType());
   debugMessage(`AuthenticateOps.determineDeploymentTypeAndDefaultRealmAndVersion: realm=${state.getRealm()}, type=${state.getDeploymentType()}`);
-  const versionInfo = (await getServerVersionInfo()).data;
+  const versionInfo = await getServerVersionInfo();
 
   // https://github.com/rockcarver/frodo-cli/issues/109
   debugMessage(`Full version: ${versionInfo.fullVersion}`);

package/esm/ops/AuthenticateOps.test.mjs

@@ -28,7 +28,6 @@
  * Note: FRODO_DEBUG=1 is optional and enables debug logging for some output
  * in case things don't function as expected
  */
-import { jest } from '@jest/globals';
 import { Authenticate, state } from '../index';
 import { autoSetupPolly, defaultMatchRequestsBy } from '../utils/AutoSetupPolly';
 
@@ -38,10 +37,6 @@ matchConfig.body = false; // oauth flows are tricky because of the PKCE challeng
 matchConfig.order = true; // since we instruct Polly not to match the body, we need to enable ordering of the requests
 
 autoSetupPolly(matchConfig);
-
-// Increase timeout for this test as pipeline keeps failing with error:
-// Timeout - Async callback was not invoked within the 5000 ms timeout specified by jest.setTimeout.
-jest.setTimeout(30000);
 describe('AuthenticateOps', () => {
   describe('getTokens()', () => {
     test('0: Method is implemented', async () => {

package/esm/ops/ConnectionProfileOps.mjs

@@ -6,7 +6,7 @@ import DataProtection from './utils/DataProtection';
 import { createObjectTable, createTable, debugMessage, printMessage, verboseMessage } from './utils/Console';
 import { FRODO_CONNECTION_PROFILES_PATH_KEY } from '../storage/StaticStorage';
 import { createJwkRsa, createJwks, getJwkRsaPublic } from './JoseOps';
-import { createServiceAccount } from './ServiceAccountOps';
+import { createServiceAccount } from './cloud/ServiceAccountOps';
 import { saveJsonToFile } from './utils/ExportImportUtils';
 import { isValidUrl } from './utils/OpsUtils';
 const crypto = new DataProtection();

package/esm/ops/InfoOps.mjs

@@ -0,0 +1,58 @@
+import { getEnvInfo } from '../api/cloud/EnvInfoApi';
+import * as state from '../shared/State';
+import * as globalConfig from '../storage/StaticStorage';
+import { getServerVersionInfo } from '../api/ServerInfoApi';
+import { getManagedObject } from '../api/ManagedObjectApi';
+import { printMessage } from './utils/Console';
+async function getCloudInfo() {
+  let info = {};
+  try {
+    info = await getEnvInfo();
+    delete info.message_box_html;
+    delete info.message_box_title;
+    delete info.message_variant;
+    delete info.warning_message_html;
+    if (!info.placeholder_management_migration_date) delete info.placeholder_management_migration_date;
+  } catch (error) {
+    var _error$response;
+    printMessage((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, 'error');
+    printMessage(`Error getting env info: ${error.message}`, 'error');
+  }
+  return info;
+}
+async function getAmVersion() {
+  const versionObj = await getServerVersionInfo();
+  const amVersion = `${versionObj['version']} Build ${versionObj['revision']} (${versionObj['date']})`;
+  return amVersion;
+}
+async function getAuthenticatedSubject() {
+  let subjectString = `${state.getUsername()} (User)`;
+  if (state.getUseBearerTokenForAmApis()) {
+    const name = (await getManagedObject('svcacct', state.getServiceAccountId(), ['name'])).data.name;
+    subjectString = `${name} [${state.getServiceAccountId()}] (Service Account)`;
+  }
+  return subjectString;
+}
+
+/**
+ * Get info about the platform instance
+ * @returns {Promise<PlatformInfo>} a promise that resolves to a json blob with information about the instance and tokens
+ */
+export async function getInfo() {
+  const info = {
+    host: state.getHost(),
+    amVersion: await getAmVersion(),
+    authenticatedSubject: await getAuthenticatedSubject(),
+    deploymentType: state.getDeploymentType(),
+    cookieName: state.getCookieName(),
+    sessionToken: state.getCookieValue(),
+    // only add bearerToken if we have it
+    ...(state.getBearerToken() && {
+      bearerToken: state.getBearerToken()
+    }),
+    // only add cloud env info if deployment type is cloud
+    ...(state.getDeploymentType() === globalConfig.CLOUD_DEPLOYMENT_TYPE_KEY && (await getCloudInfo()))
+  };
+  return info;
+}
+//# sourceMappingURL=InfoOps.js.map

package/esm/ops/JoseOps.test.mjs

@@ -1,13 +1,8 @@
-import { jest } from '@jest/globals';
 import * as Jose from './JoseOps';
 import { parseUrl } from '../api/utils/ApiUtils';
 import { v4 } from 'uuid';
 import { isEqualJson } from './utils/OpsUtils';
 import { decode } from '../api/utils/Base64';
-
-// Increase timeout for this test as pipeline keeps failing with error:
-// Timeout - Async callback was not invoked within the 5000 ms timeout specified by jest.setTimeout.
-jest.setTimeout(30000);
 describe('JoseOps - createJWK()', () => {
   test('createJWK() 0: Method is implemented', async () => {
     expect(Jose.createJwkRsa).toBeDefined();

package/esm/ops/JourneyOps.test.mjs

@@ -46,15 +46,10 @@
  * Note: FRODO_DEBUG=1 is optional and enables debug logging for some output
  * in case things don't function as expected
  */
-import { jest } from '@jest/globals';
 import { Journey, state } from '../index';
 import { getJourney } from '../test/mocks/ForgeRockApiMockEngine';
 import { autoSetupPolly } from '../utils/AutoSetupPolly';
 import * as globalConfig from '../storage/StaticStorage';
-
-// Increase timeout for this test as pipeline keeps failing with error:
-// Timeout - Async callback was not invoked within the 5000 ms timeout specified by jest.setTimeout.
-jest.setTimeout(30000);
 autoSetupPolly();
 state.setDeploymentType(globalConfig.CLOUD_DEPLOYMENT_TYPE_KEY);
 async function stageJourney(journey, create = true) {

package/esm/ops/Saml2Ops.test.mjs

@@ -48,17 +48,12 @@
  * Note: FRODO_DEBUG=1 is optional and enables debug logging for some output
  * in case things don't function as expected
  */
-import { jest } from '@jest/globals';
 import { Saml2, state } from '../index';
 import * as globalConfig from '../storage/StaticStorage';
 import { Saml2ProiderLocation } from '../api/ApiTypes';
 import { getSaml2ProviderImportData, getSaml2ProvidersImportData } from '../test/mocks/ForgeRockApiMockEngine';
 import { encodeBase64Url } from '../api/utils/Base64';
 import { autoSetupPolly } from '../utils/AutoSetupPolly';
-
-// Increase timeout for this test as pipeline keeps failing with error:
-// Timeout - Async callback was not invoked within the 5000 ms timeout specified by jest.setTimeout.
-jest.setTimeout(30000);
 autoSetupPolly();
 state.setDeploymentType(globalConfig.CLOUD_DEPLOYMENT_TYPE_KEY);
 async function stageProvider(provider, create = true) {

package/esm/ops/ScriptOps.test.mjs

@@ -29,12 +29,8 @@
  * Note: FRODO_DEBUG=1 is optional and enables debug logging for some output
  * in case things don't function as expected
  */
-import { jest } from '@jest/globals';
 import { Script } from '../index';
 import { autoSetupPolly } from '../utils/AutoSetupPolly';
-// Increase timeout for this test as pipeline keeps failing with error:
-// Timeout - Async callback was not invoked within the 5000 ms timeout specified by jest.setTimeout.
-jest.setTimeout(30000);
 autoSetupPolly();
 async function stageScript(script, create = true) {
   // delete if exists, then create

package/esm/ops/cloud/FeatureOps.mjs

@@ -0,0 +1,34 @@
+import { getFeatures as _getFeatures } from '../../api/cloud/FeatureApi';
+import { debugMessage } from '../utils/Console';
+let _features = undefined;
+
+/**
+ * Get all features
+ * @returns {Promise<FeatureInterface[]>} a promise that resolves to an array of feature objects
+ */
+export async function getFeatures() {
+  if (typeof _features !== 'undefined') return _features;
+  try {
+    const {
+      result
+    } = await _getFeatures();
+    _features = JSON.parse(JSON.stringify(result));
+  } catch (error) {
+    var _error$response;
+    debugMessage((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data);
+    _features = [];
+  }
+  return _features;
+}
+
+/**
+ * Check if feature is available
+ * @param {string} featureId feature id (e.g. 'service-accounts')
+ * @returns {Promise<boolean>} a promise that resolves to true if the feature is available and to false otherwise
+ */
+export async function hasFeature(featureId) {
+  if (typeof _features === 'undefined') await getFeatures();
+  const featureIds = _features.map(feature => feature._id);
+  return featureIds.includes(featureId);
+}
+//# sourceMappingURL=FeatureOps.js.map

package/esm/ops/{LogOps.mjs → cloud/LogOps.mjs}

@@ -1,8 +1,8 @@
-import { printMessage } from './utils/Console';
-import { getCurrentTimestamp } from './utils/ExportImportUtils';
-import { createAPIKeyAndSecret, getAPIKeys, getSources } from '../api/LogApi';
-import * as state from '../shared/State';
-import * as LogApi from '../api/LogApi';
+import { printMessage } from '../utils/Console';
+import { getCurrentTimestamp } from '../utils/ExportImportUtils';
+import { createAPIKeyAndSecret, getAPIKeys, getSources } from '../../api/cloud/LogApi';
+import * as state from '../../shared/State';
+import * as LogApi from '../../api/cloud/LogApi';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const unfilterableNoise = ['text/plain' // Unfortunately, it is impossible to filter out those without excluding IDM script logging as well

package/esm/ops/{SecretsOps.mjs → cloud/SecretsOps.mjs}

@@ -1,7 +1,7 @@
-import { createKeyValueTable, createProgressIndicator, createTable, printMessage, stopProgressIndicator, updateProgressIndicator } from './utils/Console';
-import { createNewVersionOfSecret, deleteSecret, deleteVersionOfSecret, getSecret, getSecrets, getSecretVersions, putSecret, setSecretDescription, setStatusOfVersionOfSecret, VersionOfSecretStatus } from '../api/SecretsApi';
-import wordwrap from './utils/Wordwrap';
-import { resolveUserName } from './ManagedObjectOps';
+import { createKeyValueTable, createProgressIndicator, createTable, printMessage, stopProgressIndicator, updateProgressIndicator } from '../utils/Console';
+import { createNewVersionOfSecret, deleteSecret, deleteVersionOfSecret, getSecret, getSecrets, getSecretVersions, putSecret, setSecretDescription, setStatusOfVersionOfSecret, VersionOfSecretStatus } from '../../api/cloud/SecretsApi';
+import wordwrap from '../utils/Wordwrap';
+import { resolveUserName } from '../ManagedObjectOps';
 
 /**
  * List secrets

package/esm/ops/{ServiceAccountOps.mjs → cloud/ServiceAccountOps.mjs}

@@ -1,11 +1,11 @@
-import { createManagedObject } from '../api/ManagedObjectApi';
-import { debugMessage } from './utils/Console';
-import { step } from '../api/AuthenticateApi';
+import { createManagedObject } from '../../api/ManagedObjectApi';
+import { debugMessage } from '../utils/Console';
+import { hasFeature } from './FeatureOps';
 const moType = 'svcacct';
 /**
  * Global flag indicating if service accounts are available
  */
-let serviceAccountsFeatureAvailable = undefined;
+let _featureAvailable = undefined;
 
 /**
  * Check if service accounts are available
@@ -14,19 +14,10 @@ let serviceAccountsFeatureAvailable = undefined;
 export async function isServiceAccountsFeatureAvailable() {
   debugMessage(`ServiceAccountOps.isServiceAccountsFeatureAvailable: start`);
   // only perform check once
-  if (typeof serviceAccountsFeatureAvailable !== 'undefined') return serviceAccountsFeatureAvailable;
-  serviceAccountsFeatureAvailable = true;
-  try {
-    await step({}, {}, '/', 'FRServiceAccountInternal');
-  } catch (error) {
-    var _error$response, _error$response2, _error$response3, _error$response3$data;
-    debugMessage((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data);
-    if (((_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.status) === 400 && ((_error$response3 = error.response) === null || _error$response3 === void 0 ? void 0 : (_error$response3$data = _error$response3.data) === null || _error$response3$data === void 0 ? void 0 : _error$response3$data.message) === 'No Configuration found') {
-      serviceAccountsFeatureAvailable = false;
-    }
-  }
-  debugMessage(`ServiceAccountOps.isServiceAccountsFeatureAvailable: end, available=${serviceAccountsFeatureAvailable}`);
-  return serviceAccountsFeatureAvailable;
+  if (typeof _featureAvailable !== 'undefined') return _featureAvailable;
+  _featureAvailable = await hasFeature('service-accounts');
+  debugMessage(`ServiceAccountOps.isServiceAccountsFeatureAvailable: end, available=${_featureAvailable}`);
+  return _featureAvailable;
 }
 
 /**

package/esm/ops/{ServiceAccountOps.test.mjs → cloud/ServiceAccountOps.test.mjs}

@@ -7,6 +7,9 @@
  *    override all the connection state variables required to connect to the
  *    env to record from:
  *
+ *    ATTENTION: For the recording to succeed, you MUST make sure to use a
+ *               user account, not a service account.
+ *
  *        FRODO_DEBUG=1 FRODO_HOST=frodo-dev npm run test:record ServiceAccountOps
  *
  *    The above command assumes that you have a connection profile for
@@ -29,14 +32,9 @@
  * Note: FRODO_DEBUG=1 is optional and enables debug logging for some output
  * in case things don't function as expected
  */
-import { jest } from '@jest/globals';
-import { createJwkRsa, createJwks, getJwkRsaPublic } from './JoseOps';
+import { createJwkRsa, createJwks, getJwkRsaPublic } from '../JoseOps';
 import * as ServiceAccount from './ServiceAccountOps';
-import { autoSetupPolly, defaultMatchRequestsBy } from '../utils/AutoSetupPolly';
-
-// Increase timeout for this test as pipeline keeps failing with error:
-// Timeout - Async callback was not invoked within the 5000 ms timeout specified by jest.setTimeout.
-jest.setTimeout(30000);
+import { autoSetupPolly, defaultMatchRequestsBy } from '../../utils/AutoSetupPolly';
 
 // need to modify the default matching rules to allow the mocking to work for service account tests.
 const matchConfig = defaultMatchRequestsBy();

package/esm/ops/{StartupOps.mjs → cloud/StartupOps.mjs}

@@ -1,7 +1,7 @@
-import { createProgressIndicator, updateProgressIndicator, stopProgressIndicator } from './utils/Console';
-import { getSecrets } from '../api/SecretsApi';
-import { getStatus, initiateRestart, RestartStatus } from '../api/StartupApi';
-import { getVariables } from '../api/VariablesApi';
+import { createProgressIndicator, updateProgressIndicator, stopProgressIndicator } from '../utils/Console';
+import { getSecrets } from '../../api/cloud/SecretsApi';
+import { getStatus, initiateRestart, RestartStatus } from '../../api/cloud/StartupApi';
+import { getVariables } from '../../api/cloud/VariablesApi';
 
 /**
  * Updates that need to be applied.

package/esm/ops/{VariablesOps.mjs → cloud/VariablesOps.mjs}

@@ -1,8 +1,8 @@
-import { createKeyValueTable, createProgressIndicator, createTable, printMessage, stopProgressIndicator, updateProgressIndicator } from './utils/Console';
-import { deleteVariable, getVariable, getVariables, putVariable, setVariableDescription } from '../api/VariablesApi';
-import wordwrap from './utils/Wordwrap';
-import { resolveUserName } from './ManagedObjectOps';
-import { decode } from '../api/utils/Base64';
+import { createKeyValueTable, createProgressIndicator, createTable, printMessage, stopProgressIndicator, updateProgressIndicator } from '../utils/Console';
+import { deleteVariable, getVariable, getVariables, putVariable, setVariableDescription } from '../../api/cloud/VariablesApi';
+import wordwrap from '../utils/Wordwrap';
+import { resolveUserName } from '../ManagedObjectOps';
+import { decode } from '../../api/utils/Base64';
 
 /**
  * List variables