@alwaysai/device-agent 1.4.0 → 2.0.0

package/src/subcommands/config.ts

@@ -0,0 +1,42 @@
+import { CliBranch, CliLeaf, CliOneOfInput } from '@alwaysai/alwayscli';
+import { SYSTEM_IDS } from 'alwaysai/lib/constants';
+import { ALWAYSAI_SYSTEM_ID } from 'alwaysai/lib/environment';
+import { getSystemId, setSystemId } from 'alwaysai/lib/infrastructure';
+import { echo } from 'alwaysai/lib/util';
+import { ALWAYSAI_SHOW_HIDDEN } from '../environment';
+
+const show = CliLeaf({
+  name: 'show',
+  description: `Show your current configuration`,
+  action() {
+    if (ALWAYSAI_SYSTEM_ID) {
+      echo(
+        '[WARNING] System ID is overridden by environment variable "ALWAYSAI_SYSTEM_ID"'
+      );
+    }
+    return { systemId: getSystemId() };
+  }
+});
+
+const set = CliLeaf({
+  name: 'set',
+  description: 'Set an configuration value',
+  namedInputs: {
+    systemId: CliOneOfInput({ values: SYSTEM_IDS, required: true })
+  },
+  action(_, { systemId }) {
+    if (ALWAYSAI_SYSTEM_ID) {
+      echo(
+        'WARNING] System ID is overridden by environment variable "ALWAYSAI_SYSTEM_ID"'
+      );
+    }
+    return setSystemId(systemId);
+  }
+});
+
+export const configBranch = CliBranch({
+  name: 'config',
+  hidden: !ALWAYSAI_SHOW_HIDDEN,
+  description: `Show or set  configuration values`,
+  subcommands: [show, set]
+});

package/src/subcommands/device/clean.ts

@@ -1,20 +1,25 @@
 import { CliLeaf } from '@alwaysai/alwayscli';
-import { logger } from '../../util/logger';
-import { AgentConfigFile } from '../../infrastructure/agent-config';
 import { DeviceConfigFile } from 'alwaysai/lib/core/device';
 import {
-  APP_ROOT,
-  CREDENTIALS_FILE_PATH,
-  DEVICE_AGENT_CFG_PATH,
-  DEVICE_AGENT_DOCKER_COMPOSE_PATH
-} from '../../util/directories';
+  LOCAL_CERT_AND_KEY_DIR,
+  LocalLegacyDeviceCertificates
+} from 'alwaysai/lib/infrastructure';
+import { stringifyError } from 'alwaysai/lib/util';
+import { readdir } from 'fs/promises';
+import { uninstallApp } from '../../application-control';
+import { AgentConfigFile } from '../../infrastructure/agent-config';
 import {
   checkRabbitMQContainerRunning,
   stopRabbitMQContainer
 } from '../../local-connection/rabbitmq-connection';
-import { stopApp } from '../../application-control';
-import { LOCAL_CERT_AND_KEY_DIR } from 'alwaysai/lib/paths';
-import safeRimraf from '../../util/safe-rimraf';
+import {
+  APP_ROOT,
+  CREDENTIALS_FILE_PATH,
+  getDeviceAgentConfigPath,
+  getDeviceAgentDockerComposePath
+} from '../../util/directories';
+import { safeRimraf } from '../../util/file';
+import { logger } from '../../util/logger';
 
 export const cleanCliLeaf = CliLeaf({
   name: 'clean',
@@ -27,23 +32,27 @@ export const cleanCliLeaf = CliLeaf({
       }
     } catch (e) {
       logger.error(
-        `You may need to manually stop the container by running docker-compose down in the following directory: ${DEVICE_AGENT_DOCKER_COMPOSE_PATH}`
+        `You may need to manually stop the container by running docker-compose down in the following directory: ${getDeviceAgentDockerComposePath()}`
+      );
+      logger.debug(
+        `Error in checking / stopping RabbitMQ container!\n${stringifyError(e)}`
       );
-      logger.debug(`Error in checking / stopping RabbitMQ container: ${e}`);
     }
 
-    await safeRimraf(DEVICE_AGENT_CFG_PATH);
+    await safeRimraf(getDeviceAgentConfigPath());
 
     logger.debug('Checking for alwaysAI applications still running');
     const apps = await AgentConfigFile().getApps();
-    const stopAppPromises: Promise<void>[] = [];
+    const uninstallAppPromises: Promise<void>[] = [];
     for (const app of apps) {
       const { projectId } = app;
-      stopAppPromises.push(stopApp({ projectId }));
+      uninstallAppPromises.push(uninstallApp({ projectId }));
     }
-    await Promise.all(stopAppPromises);
+    await Promise.all(uninstallAppPromises);
 
     await safeRimraf(LOCAL_CERT_AND_KEY_DIR);
+    const legacyCertificates = new LocalLegacyDeviceCertificates();
+    await safeRimraf(legacyCertificates.getCertificateDirectoryPath());
 
     logger.debug(`Removing ${AgentConfigFile().path}`);
     AgentConfigFile().remove();
@@ -51,8 +60,13 @@ export const cleanCliLeaf = CliLeaf({
     DeviceConfigFile().remove();
 
     await safeRimraf(CREDENTIALS_FILE_PATH);
-    await safeRimraf(APP_ROOT);
-
+    const files = await readdir(APP_ROOT);
+    logger.debug(`${APP_ROOT} folder contents ${JSON.stringify(files.length)}`);
+    // This won't handle hidden files, but will remove if truly empty, which is safer
+    if (files.length === 0) {
+      logger.debug('Applications directory is empty, removing.');
+      await safeRimraf(APP_ROOT);
+    }
     logger.info('Device configuration cleaned');
   }
 });

package/src/subcommands/device/get-info.ts

@@ -0,0 +1,49 @@
+import { CliLeaf } from '@alwaysai/alwayscli';
+import {
+  getCpuDetails,
+  getDiskDetails,
+  getMemDetails,
+  getSystemInformation
+} from '../../device-control/device-control';
+
+export const getInfoCliLeaf = CliLeaf({
+  name: 'get-info',
+  description: 'Get device info',
+  namedInputs: {},
+  async action(_, opts) {
+    const cpuDetails = await getCpuDetails();
+    const diskDetails = await getDiskDetails();
+    const memDetails = await getMemDetails();
+    const out = {
+      'CPU Utilization': `${
+        cpuDetails?.usedPerc && cpuDetails.temperature
+          ? `Used ${cpuDetails?.usedPerc?.toFixed(2)}%, Temperature ${
+              cpuDetails?.temperature
+            } °C`
+          : 'Unavailable'
+      }`,
+      'Disk Utilization': `${
+        diskDetails?.usedGb && diskDetails.freeGb
+          ? `${diskDetails?.usedGb} GB / ${
+              diskDetails?.usedGb + diskDetails?.freeGb
+            } GB`
+          : 'Unavailable'
+      }`,
+      'Memory Utilization': `${
+        memDetails?.usedMb && memDetails.freeMb
+          ? `${memDetails.usedMb} MB / ${
+              memDetails.usedMb + memDetails.freeMb
+            } MB`
+          : 'Unavailable'
+      }`
+    };
+    console.table(out);
+    const systemInfo = await getSystemInformation();
+    console.table(systemInfo.os);
+    console.table(systemInfo.cpu);
+    console.table(systemInfo.disk?.drives);
+    console.table(systemInfo.device);
+    console.table(systemInfo.network);
+    console.table(systemInfo.versions);
+  }
+});

package/src/subcommands/device/index.ts

@@ -1,9 +1,20 @@
 import { CliBranch } from '@alwaysai/alwayscli';
-import { getInfoCliLeaf, initCliLeaf, restartCliLeaf } from './device';
+import { getInfoCliLeaf } from './get-info';
 import { cleanCliLeaf } from './clean';
+import { initCliLeaf } from './init';
+import { restartCliLeaf } from './restart';
+import { refreshCliLeaf } from './refresh';
+import { migrateCliLeaf } from './migrate';
 
 export const deviceCliBranch = CliBranch({
   name: 'device',
   description: 'Manage current device',
-  subcommands: [initCliLeaf, getInfoCliLeaf, cleanCliLeaf, restartCliLeaf]
+  subcommands: [
+    initCliLeaf,
+    getInfoCliLeaf,
+    refreshCliLeaf,
+    cleanCliLeaf,
+    restartCliLeaf,
+    migrateCliLeaf
+  ]
 });

package/src/subcommands/device/{device.ts → init.ts}

@@ -1,28 +1,21 @@
 import { CliLeaf, CliStringInput } from '@alwaysai/alwayscli';
 import { getTargetHardwareUuid } from 'alwaysai/lib/core/app';
-import { v4 as uuidv4 } from 'uuid';
-import { CliAuthenticationClient } from 'alwaysai/lib/infrastructure';
+import {
+  CliAuthenticationClient,
+  DEVICE_PRIVATE_KEY_FILE_PATH,
+  LOCAL_CERT_AND_KEY_DIR
+} from 'alwaysai/lib/infrastructure';
 import { existsSync } from 'fs';
+import { v4 as uuidv4 } from 'uuid';
+import { AWS_ROOT_CERTIFICATE_FILE_NAME } from '../../util/directories';
 import { httpClient, microServiceHttpClient } from '../../util/http-client';
-import {
-  AWS_ROOT_CERTIFICATE_FILE_NAME,
-  BOOTSTRAP_CERTIFICATES_DIR_PATH,
-  DEVICE_PRIVATE_KEY_FILE_PATH
-} from '../../util/directories';
 
+import { DeviceConfigFile } from 'alwaysai/lib/core/device';
 import { JsSpawner } from 'alwaysai/lib/util';
-import {
-  getCpuDetails,
-  getDiskDetails,
-  getMemDetails,
-  getSystemInformation,
-  reboot
-} from '../../device-control/device-control';
+import { getBootstrapCertificateDirectoryPath } from '../../infrastructure/device-certificate';
 import { writeTokenAndDeviceCfg } from '../../infrastructure/tokens-and-device-cfg';
 import { logger } from '../../util/logger';
-import { DeviceConfigFile } from 'alwaysai/lib/core/device';
 import { requireLoggedInAndPaidPlan } from '../../util/require-logged-in-and-paid-plan';
-import { LOCAL_CERT_AND_KEY_DIR } from 'alwaysai/lib/paths';
 
 export const initCliLeaf = CliLeaf({
   name: 'init',
@@ -86,14 +79,14 @@ export const initCliLeaf = CliLeaf({
       deviceUuid: response.deviceUuid
     });
 
-    await JsSpawner().mkdirp(BOOTSTRAP_CERTIFICATES_DIR_PATH());
+    await JsSpawner().mkdirp(getBootstrapCertificateDirectoryPath());
 
     await JsSpawner({ path: LOCAL_CERT_AND_KEY_DIR }).writeFile(
       AWS_ROOT_CERTIFICATE_FILE_NAME,
       ROOT_CERT_AWS
     );
     const certSpawner = JsSpawner({
-      path: BOOTSTRAP_CERTIFICATES_DIR_PATH()
+      path: getBootstrapCertificateDirectoryPath()
     });
     const writeCertFilePromises: Promise<void>[] = [];
     for (const key in response.claimCertificate) {
@@ -106,54 +99,3 @@ export const initCliLeaf = CliLeaf({
     logger.info(`Initialized device ${name}: UUID=${response.deviceUuid}`);
   }
 });
-
-export const getInfoCliLeaf = CliLeaf({
-  name: 'get-info',
-  description: 'Get device info',
-  namedInputs: {},
-  async action(_, opts) {
-    const cpuDetails = await getCpuDetails();
-    const diskDetails = await getDiskDetails();
-    const memDetails = await getMemDetails();
-    const out = {
-      'CPU Utilization': `${
-        cpuDetails?.usedPerc && cpuDetails.temperature
-          ? `Used ${cpuDetails?.usedPerc?.toFixed(2)}%, Temperature ${
-              cpuDetails?.temperature
-            } °C`
-          : 'Unavailable'
-      }`,
-      'Disk Utilization': `${
-        diskDetails?.usedGb && diskDetails.freeGb
-          ? `${diskDetails?.usedGb} GB / ${
-              diskDetails?.usedGb + diskDetails?.freeGb
-            } GB`
-          : 'Unavailable'
-      }`,
-      'Memory Utilization': `${
-        memDetails?.usedMb && memDetails.freeMb
-          ? `${memDetails.usedMb} MB / ${
-              memDetails.usedMb + memDetails.freeMb
-            } MB`
-          : 'Unavailable'
-      }`
-    };
-    console.table(out);
-    const systemInfo = await getSystemInformation();
-    console.table(systemInfo.os);
-    console.table(systemInfo.cpu);
-    console.table(systemInfo.disk?.drives);
-    console.table(systemInfo.device);
-    console.table(systemInfo.network);
-    console.table(systemInfo.versions);
-  }
-});
-
-export const restartCliLeaf = CliLeaf({
-  name: 'restart',
-  description: 'Restart the device',
-  namedInputs: {},
-  async action(_, opts) {
-    await reboot();
-  }
-});

package/src/subcommands/device/migrate.ts

@@ -0,0 +1,20 @@
+import { CliLeaf } from '@alwaysai/alwayscli';
+import { logger } from '../../util/logger';
+import { requiredConfigFilesPresentAndValid } from '../../infrastructure/required-config-checks';
+import { migrateFromLegacyCertsAndTokens } from '../../infrastructure/legacy-migration/legacy-migration';
+
+export const migrateCliLeaf = CliLeaf({
+  name: 'migrate',
+  description: 'Migrate configuration to the latest',
+  namedInputs: {},
+  async action(_, opts) {
+    const filesAlreadyMigrated = await requiredConfigFilesPresentAndValid();
+    if (filesAlreadyMigrated) {
+      logger.info('Configuration already migrated');
+    } else {
+      logger.info('Attempting configuration file migration');
+      await migrateFromLegacyCertsAndTokens();
+      logger.info('Migration complete');
+    }
+  }
+});

package/src/subcommands/device/refresh.ts

@@ -0,0 +1,23 @@
+import { CliLeaf, CliTerseError } from '@alwaysai/alwayscli';
+import { writeTokenAndDeviceCfg } from '../../infrastructure/tokens-and-device-cfg';
+import { logger } from '../../util/logger';
+import { DeviceConfigFile } from 'alwaysai/lib/core/device';
+
+// FIXME: Do we need this command now that tokens aren't used outside of provisioning step?
+export const refreshCliLeaf = CliLeaf({
+  name: 'refresh',
+  description: 'Refresh the device tokens',
+  namedInputs: {},
+  async action(_, opts) {
+    logger.info(`Refreshing device tokens`);
+    const cfg = DeviceConfigFile().readIfExists();
+    if (cfg === undefined) {
+      throw new CliTerseError('Configuration not found on current device!');
+    }
+    const deviceUuid = cfg.deviceUuid;
+
+    await writeTokenAndDeviceCfg({
+      deviceUuid
+    });
+  }
+});

package/src/subcommands/device/restart.ts

@@ -0,0 +1,11 @@
+import { CliLeaf } from '@alwaysai/alwayscli';
+import { reboot } from '../../device-control/device-control';
+
+export const restartCliLeaf = CliLeaf({
+  name: 'restart',
+  description: 'Restart the device',
+  namedInputs: {},
+  async action(_, opts) {
+    await reboot();
+  }
+});

package/src/subcommands/index.ts

@@ -1,11 +1,13 @@
 import { appCliBranch } from './app';
+import { configBranch } from './config';
 import { deviceCliBranch } from './device';
-import { loginCliLeaf } from './login';
 import { getModelPackageCliLeaf } from './get-model-package';
+import { loginCliLeaf } from './login';
 import { stopRabbitMQContainerCliLeaf } from './rabbitmq-connection';
 
 export const subcommands = [
   loginCliLeaf,
+  configBranch,
   appCliBranch,
   deviceCliBranch,
   getModelPackageCliLeaf,

package/src/util/aai-error.ts

@@ -0,0 +1,20 @@
+import { ErrorObject } from 'ajv';
+
+type ErrorOption = ErrorObject<string, Record<string, any>, unknown>;
+
+type Details = ErrorOption | ErrorOption[] | Error | null;
+
+interface Options {
+  cause?: Details;
+}
+
+class AaiError extends Error {
+  public detailed?: Details;
+  constructor(message: string, options?: Options) {
+    super(message);
+    this.name = 'AaiError';
+    this.detailed = options?.cause;
+  }
+}
+
+export default AaiError;

package/src/util/{cloud-mode-ready.ts → aws-regions.ts}

@@ -1,10 +1,3 @@
-import { existsSync } from 'fs';
-import {
-  AWS_ROOT_CERTIFICATE_FILE_PATH,
-  DEVICE_PRIVATE_KEY_FILE_PATH,
-  DEVICE_CERTIFICATE_FILE_PATH
-} from '../util/directories';
-
 const VALID_AWS_REGIONS = [
   // 'af-south-1', // Africa (Cape Town)
   // 'ap-east-1', // Asia Pacific (Hong Kong)
@@ -40,20 +33,3 @@ const VALID_AWS_REGIONS = [
 export function isValidAwsRegion(region: string): boolean {
   return VALID_AWS_REGIONS.includes(region);
 }
-
-export function cloudModeReady() {
-  let ready = true;
-  const requiredFiles = [
-    DEVICE_CERTIFICATE_FILE_PATH,
-    DEVICE_PRIVATE_KEY_FILE_PATH,
-    AWS_ROOT_CERTIFICATE_FILE_PATH
-  ];
-
-  for (const path of requiredFiles) {
-    if (!existsSync(path)) {
-      ready = false;
-      break;
-    }
-  }
-  return ready;
-}

package/src/util/check-for-updates.ts

@@ -0,0 +1,53 @@
+import { logger } from '../util/logger';
+import {
+  JsSpawner,
+  getLatestVersionFromNpm,
+  stringifyError
+} from 'alwaysai/lib/util';
+import * as path from 'path';
+
+const appPrompt =
+  'Please restart the Device Agent or reboot the device to update. ';
+const updatePrompt = `A new version of the Device Agent is available! \n\n`;
+
+export async function getDeviceAgentVersion(): Promise<string> {
+  let daVersion = '';
+  try {
+    const packagePath = path.join(__dirname, '../../');
+    const spawner = JsSpawner({ path: packagePath });
+    const output = await spawner.readFile('package.json');
+    const parsed = JSON.parse(output);
+    daVersion = parsed.version;
+  } catch (e) {
+    logger.error(
+      `Could not retrieve the Device Agent version!\n${stringifyError(e)}`
+    );
+  }
+  return daVersion;
+}
+
+function constructPrompt(props: { currentVer: string; latestVer: string }) {
+  const { currentVer, latestVer } = props;
+  const prompt = `${updatePrompt}${appPrompt}\nYour version: ${currentVer}. Newest version: ${latestVer}`;
+  return prompt;
+}
+
+export async function checkForUpdatesAndPrompt() {
+  try {
+    logger.debug('Checking for available Device Agent updates...');
+    const latestVersion = await getLatestVersionFromNpm(
+      '@alwaysai/device-agent'
+    );
+    const version = await getDeviceAgentVersion();
+    if (version !== latestVersion) {
+      logger.warn(
+        constructPrompt({
+          currentVer: version,
+          latestVer: latestVersion
+        })
+      );
+    }
+  } catch (e) {
+    logger.error(`Could not check for updates!\n${stringifyError(e)}`);
+  }
+}

package/src/util/clean-certs.ts

@@ -1,12 +1,16 @@
+import {
+  LOCAL_CERT_AND_KEY_DIR,
+  LocalDeviceCertificates
+} from 'alwaysai/lib/infrastructure';
 import { JsSpawner } from 'alwaysai/lib/util';
+import { getBootstrapCertificateDirectoryPath } from '../infrastructure/device-certificate';
 import { logger } from '../util/logger';
-import { LOCAL_CERT_AND_KEY_DIR } from 'alwaysai/lib/paths';
-import { BOOTSTRAP_CERTIFICATES_DIR_PATH } from '../util/directories';
 
 export const rmBootstrapCertsAndClose = async () => {
+  const deviceCertificates = new LocalDeviceCertificates();
   const spawner = JsSpawner();
-  await spawner.rimraf(BOOTSTRAP_CERTIFICATES_DIR_PATH());
-  await spawner.rimraf(LOCAL_CERT_AND_KEY_DIR);
+  await spawner.rimraf(getBootstrapCertificateDirectoryPath());
+  await spawner.rimraf(deviceCertificates.getCertificateDirectoryPath());
   logger.error('Could not provision device. Try again.');
   process.exit(1);
 };

package/src/util/directories.ts

@@ -1,9 +1,12 @@
+import {
+  LocalDeviceCertificates,
+  getDeviceConfigPath
+} from 'alwaysai/lib/infrastructure';
 import {
   AAI_DIR,
   DEVICE_TOKEN_FILE_NAME,
   DOCKER_COMPOSE_FILE,
-  LOCAL_AAI_CFG_DIR,
-  LOCAL_CERT_AND_KEY_DIR
+  LOCAL_AAI_CFG_DIR
 } from 'alwaysai/lib/paths';
 import { join } from 'path';
 import { getSystemId } from '../infrastructure/system-id';
@@ -11,25 +14,28 @@ import { getSystemId } from '../infrastructure/system-id';
 export const APP_ROOT = join(AAI_DIR, 'applications');
 
 export const DEVICE_AGENT_CFG_DIR = 'device-agent';
-export const DEVICE_AGENT_CFG_PATH = join(
-  LOCAL_AAI_CFG_DIR,
-  DEVICE_AGENT_CFG_DIR
-);
-export const DEVICE_AGENT_DOCKER_COMPOSE_PATH = join(
-  DEVICE_AGENT_CFG_PATH,
-  DOCKER_COMPOSE_FILE
-);
+
+export function getDeviceAgentConfigPath(baseDir?) {
+  if (baseDir) {
+    return join(baseDir, getDeviceConfigPath(), DEVICE_AGENT_CFG_DIR);
+  }
+  return join(LOCAL_AAI_CFG_DIR, getDeviceConfigPath(), DEVICE_AGENT_CFG_DIR);
+}
+
+export function getDeviceAgentDockerComposePath(baseDir?) {
+  return join(getDeviceAgentConfigPath(baseDir), DOCKER_COMPOSE_FILE);
+}
 
 export const CREDENTIALS_FILE_PATH = join(
   LOCAL_AAI_CFG_DIR,
   DEVICE_TOKEN_FILE_NAME
 );
 
-export const AWS_ROOT_CERTIFICATE_FILE_NAME = 'AmazonRootCA1.pem';
-export const AWS_ROOT_CERTIFICATE_FILE_PATH = join(
-  LOCAL_CERT_AND_KEY_DIR,
-  AWS_ROOT_CERTIFICATE_FILE_NAME
-);
+const localDeviceCertificates = new LocalDeviceCertificates();
+export const AWS_ROOT_CERTIFICATE_FILE_PATH =
+  localDeviceCertificates.getRootCertificateFilePath();
+export const AWS_ROOT_CERTIFICATE_FILE_NAME =
+  localDeviceCertificates.getRootCertificateFileName();
 
 export const shortenSystemId = () => {
   const id = getSystemId();
@@ -40,61 +46,11 @@ export const shortenSystemId = () => {
       return 'qa';
     case 'production':
       return 'prod';
+    default:
+      return 'prod';
   }
 };
 
-/*===================================================================
-                    Bootstrap Certificates
-===================================================================*/
-
-export const BOOTSTRAP_DIR_NAME = 'bootstrap-certificates';
-export const BOOTSTRAP_PRIVATE_KEY_FILE_NAME = () =>
-  `aai-claim-private-key_${shortenSystemId()}.pem.key`;
-export const BOOTSTRAP_CERTIFICATE_FILE_NAME = () =>
-  `aai-claim-cert_${shortenSystemId()}.pem.crt`;
-export const BOOTSTRAP_ID_FILE_NAME = () =>
-  `aai-claim-cert-id_${shortenSystemId()}.txt`;
-export const CERTIFICATE_OWNERSHIP_TOKEN_FILE_NAME =
-  'certificate-ownership-token.txt';
-
-export const BOOTSTRAP_CERTIFICATES_DIR_PATH = () =>
-  join(LOCAL_CERT_AND_KEY_DIR, BOOTSTRAP_DIR_NAME);
-
-export const BOOTSTRAP_PRIVATE_KEY_FILE_PATH = () =>
-  join(
-    LOCAL_CERT_AND_KEY_DIR,
-    BOOTSTRAP_DIR_NAME,
-    BOOTSTRAP_PRIVATE_KEY_FILE_NAME()
-  );
-
-export const BOOTSTRAP_CERTIFICATE_FILE_PATH = () =>
-  join(
-    LOCAL_CERT_AND_KEY_DIR,
-    BOOTSTRAP_DIR_NAME,
-    BOOTSTRAP_CERTIFICATE_FILE_NAME()
-  );
-
-export const BOOTSTRAP_ID_FILE_PATH = () =>
-  join(LOCAL_CERT_AND_KEY_DIR, BOOTSTRAP_DIR_NAME, BOOTSTRAP_ID_FILE_NAME());
-
-/*===================================================================
-                      Device Certificates
-===================================================================*/
-
-export const DEVICE_PRIVATE_KEY_FILE_NAME = 'aai-device-private-key.pem.key';
-export const DEVICE_CERTIFICATE_FILE_NAME = 'aai-device-cert.pem.crt';
-export const DEVICE_ID_FILE_NAME = 'aai-device-cert-id.txt';
-
-export const DEVICE_PRIVATE_KEY_FILE_PATH = join(
-  LOCAL_CERT_AND_KEY_DIR,
-  DEVICE_PRIVATE_KEY_FILE_NAME
-);
-
-export const DEVICE_CERTIFICATE_FILE_PATH = join(
-  LOCAL_CERT_AND_KEY_DIR,
-  DEVICE_CERTIFICATE_FILE_NAME
-);
-
 /*===================================================================
                       Secure Tunnel bin directory
 ===================================================================*/