Merge pull request #362 from Innablr/feature/esm-project

Convert to ESM module
Innablr · Jun 18, 2024 · 4ea926b · 4ea926b
2 parents 808946b + 1d9192e
commit 4ea926b
Show file tree

Hide file tree

Showing 60 changed files with 2,546 additions and 3,531 deletions.
diff --git a/actions/actions.ts b/actions/actions.ts
@@ -1,5 +1,5 @@
-import { RevolverPlugin } from '../plugins/pluginInterface';
-import { TagInterface } from '../drivers/tags';
+import { RevolverPlugin } from '../plugins/pluginInterface.js';
+import { TagInterface } from '../drivers/tags.js';
 
 export abstract class RevolverAction {
   public who: RevolverPlugin;

diff --git a/drivers/driverInterface.ts b/drivers/driverInterface.ts
@@ -1,9 +1,9 @@
 import { Logger } from 'tslog';
-import { logger, RevolverLogObject } from '../lib/logger';
-import { InstrumentedResource, ToolingInterface } from './instrumentedResource';
-import { RevolverAction } from '../actions/actions';
-import { ActionAuditEntry } from '../actions/audit';
-import dateTime from '../lib/dateTime';
+import { logger, RevolverLogObject } from '../lib/logger.js';
+import { InstrumentedResource, ToolingInterface } from './instrumentedResource.js';
+import { RevolverAction } from '../actions/actions.js';
+import { ActionAuditEntry } from '../actions/audit.js';
+import dateTime from '../lib/dateTime.js';
 
 export abstract class DriverInterface {
   protected accountConfig: any;

diff --git a/drivers/ebs.ts b/drivers/ebs.ts
@@ -6,12 +6,12 @@ import {
   paginateDescribeInstances,
 } from '@aws-sdk/client-ec2';
 import { DateTime } from 'luxon';
-import { makeResourceTags, paginateAwsCall } from '../lib/common';
-import { InstrumentedResource, ToolingInterface } from './instrumentedResource';
-import { DriverInterface } from './driverInterface';
-import { RevolverAction, RevolverActionWithTags } from '../actions/actions';
-import { ec2Tagger } from './tags';
-import { getAwsClientForAccount } from '../lib/awsConfig';
+import { makeResourceTags, paginateAwsCall } from '../lib/common.js';
+import { InstrumentedResource, ToolingInterface } from './instrumentedResource.js';
+import { DriverInterface } from './driverInterface.js';
+import { RevolverAction, RevolverActionWithTags } from '../actions/actions.js';
+import { ec2Tagger } from './tags.js';
+import { getAwsClientForAccount } from '../lib/awsConfig.js';
 
 class InstrumentedEBS extends ToolingInterface {
   private volumeARN: string;

diff --git a/drivers/ec2.ts b/drivers/ec2.ts
@@ -13,12 +13,12 @@ import {
   StopInstancesCommand,
   paginateDescribeInstances,
 } from '@aws-sdk/client-ec2';
-import { InstrumentedResource, ToolingInterface } from './instrumentedResource';
-import { DriverInterface } from './driverInterface';
-import { RevolverAction, RevolverActionWithTags } from '../actions/actions';
-import { chunkArray, makeResourceTags, paginateAwsCall } from '../lib/common';
-import { ec2Tagger } from './tags';
-import { getAwsClientForAccount } from '../lib/awsConfig';
+import { InstrumentedResource, ToolingInterface } from './instrumentedResource.js';
+import { DriverInterface } from './driverInterface.js';
+import { RevolverAction, RevolverActionWithTags } from '../actions/actions.js';
+import { chunkArray, makeResourceTags, paginateAwsCall } from '../lib/common.js';
+import { ec2Tagger } from './tags.js';
+import { getAwsClientForAccount } from '../lib/awsConfig.js';
 
 class InstrumentedEc2 extends ToolingInterface {
   private instanceARN: string;

diff --git a/drivers/instrumentedResource.ts b/drivers/instrumentedResource.ts
@@ -1,6 +1,6 @@
-import { logger } from '../lib/logger';
+import { logger } from '../lib/logger.js';
 import { DateTime } from 'luxon';
-import { RevolverAction } from '../actions/actions';
+import { RevolverAction } from '../actions/actions.js';
 
 export interface InstrumentedResource {
   resourceId: string;

diff --git a/drivers/rdsCluster.ts b/drivers/rdsCluster.ts
@@ -7,12 +7,12 @@ import {
   StopDBClusterCommand,
   Tag,
 } from '@aws-sdk/client-rds';
-import { InstrumentedResource, ToolingInterface } from './instrumentedResource';
-import { DriverInterface } from './driverInterface';
-import { RevolverAction, RevolverActionWithTags } from '../actions/actions';
-import { rdsTagger } from './tags';
-import { getAwsClientForAccount } from '../lib/awsConfig';
-import { makeResourceTags } from '../lib/common';
+import { InstrumentedResource, ToolingInterface } from './instrumentedResource.js';
+import { DriverInterface } from './driverInterface.js';
+import { RevolverAction, RevolverActionWithTags } from '../actions/actions.js';
+import { rdsTagger } from './tags.js';
+import { getAwsClientForAccount } from '../lib/awsConfig.js';
+import { makeResourceTags } from '../lib/common.js';
 
 class InstrumentedRdsCluster extends ToolingInterface {
   constructor(awsResource: any) {

diff --git a/drivers/rdsInstance.ts b/drivers/rdsInstance.ts
@@ -7,12 +7,12 @@ import {
   StopDBInstanceCommand,
   Tag,
 } from '@aws-sdk/client-rds';
-import { InstrumentedResource, ToolingInterface } from './instrumentedResource';
-import { DriverInterface } from './driverInterface';
-import { RevolverAction, RevolverActionWithTags } from '../actions/actions';
-import { rdsTagger } from './tags';
-import { getAwsClientForAccount } from '../lib/awsConfig';
-import { makeResourceTags } from '../lib/common';
+import { InstrumentedResource, ToolingInterface } from './instrumentedResource.js';
+import { DriverInterface } from './driverInterface.js';
+import { RevolverAction, RevolverActionWithTags } from '../actions/actions.js';
+import { rdsTagger } from './tags.js';
+import { getAwsClientForAccount } from '../lib/awsConfig.js';
+import { makeResourceTags } from '../lib/common.js';
 
 class InstrumentedRdsInstance extends ToolingInterface {
   public tags: Tag[] = [];

diff --git a/drivers/redshiftCluster.ts b/drivers/redshiftCluster.ts
@@ -8,13 +8,13 @@ import {
   RedshiftClient,
   Tag,
 } from '@aws-sdk/client-redshift';
-import assume from '../lib/assume';
-import { InstrumentedResource, ToolingInterface } from './instrumentedResource';
-import { DriverInterface } from './driverInterface';
-import { RevolverAction, RevolverActionWithTags } from '../actions/actions';
-import dateTime from '../lib/dateTime';
-import { getAwsClientForAccount } from '../lib/awsConfig';
-import { makeResourceTags } from '../lib/common';
+import assume from '../lib/assume.js';
+import { InstrumentedResource, ToolingInterface } from './instrumentedResource.js';
+import { DriverInterface } from './driverInterface.js';
+import { RevolverAction, RevolverActionWithTags } from '../actions/actions.js';
+import dateTime from '../lib/dateTime.js';
+import { getAwsClientForAccount } from '../lib/awsConfig.js';
+import { makeResourceTags } from '../lib/common.js';
 
 class InstrumentedRedshiftCluster extends ToolingInterface {
   public tags: Tag[] = [];

diff --git a/drivers/redshiftClusterSnapshot.ts b/drivers/redshiftClusterSnapshot.ts
@@ -11,11 +11,11 @@ import {
   RestoreFromClusterSnapshotCommand,
   Tag,
 } from '@aws-sdk/client-redshift';
-import { InstrumentedResource, ToolingInterface } from './instrumentedResource';
-import { DriverInterface } from './driverInterface';
-import { RevolverAction, RevolverActionWithTags } from '../actions/actions';
-import { getAwsClientForAccount } from '../lib/awsConfig';
-import { makeResourceTags } from '../lib/common';
+import { InstrumentedResource, ToolingInterface } from './instrumentedResource.js';
+import { DriverInterface } from './driverInterface.js';
+import { RevolverAction, RevolverActionWithTags } from '../actions/actions.js';
+import { getAwsClientForAccount } from '../lib/awsConfig.js';
+import { makeResourceTags } from '../lib/common.js';
 
 class InstrumentedRedshiftClusterSnapshot extends ToolingInterface {
   public tags: Tag[] = [];

diff --git a/drivers/snapshot.ts b/drivers/snapshot.ts
@@ -6,12 +6,12 @@ import {
   paginateDescribeSnapshots,
   paginateDescribeVolumes,
 } from '@aws-sdk/client-ec2';
-import { InstrumentedResource, ToolingInterface } from './instrumentedResource';
-import { DriverInterface } from './driverInterface';
-import { RevolverActionWithTags } from '../actions/actions';
-import { makeResourceTags, paginateAwsCall } from '../lib/common';
-import { ec2Tagger } from './tags';
-import { getAwsClientForAccount } from '../lib/awsConfig';
+import { InstrumentedResource, ToolingInterface } from './instrumentedResource.js';
+import { DriverInterface } from './driverInterface.js';
+import { RevolverActionWithTags } from '../actions/actions.js';
+import { makeResourceTags, paginateAwsCall } from '../lib/common.js';
+import { ec2Tagger } from './tags.js';
+import { getAwsClientForAccount } from '../lib/awsConfig.js';
 
 class InstrumentedSnapshot extends ToolingInterface {
   get resourceId() {

diff --git a/drivers/tags.ts b/drivers/tags.ts
@@ -1,8 +1,8 @@
 import { Logger } from 'tslog';
-import { RevolverLogObject } from '../lib/logger';
-import { ToolingInterface } from './instrumentedResource';
-import { RevolverActionWithTags } from '../actions/actions';
-import { chunkArray, unique } from '../lib/common';
+import { RevolverLogObject } from '../lib/logger.js';
+import { ToolingInterface } from './instrumentedResource.js';
+import { RevolverActionWithTags } from '../actions/actions.js';
+import { chunkArray, unique } from '../lib/common.js';
 import { EC2Client, CreateTagsCommand, DeleteTagsCommand } from '@aws-sdk/client-ec2';
 import { AddTagsToResourceCommand, RDSClient, RemoveTagsFromResourceCommand } from '@aws-sdk/client-rds';
 

diff --git a/invoke.ts b/invoke.ts
@@ -1,6 +1,6 @@
 // eslint-disable-next-line import/no-unresolved
 import { EventBridgeEvent, Context } from 'aws-lambda';
-import { handler as revolverHandle } from './revolver';
+import { handler as revolverHandle } from './revolver.js';
 
 const timeStamp = process.env['CURRENT_TIME'] || new Date().toISOString();
 

diff --git a/lib/accountRevolver.ts b/lib/accountRevolver.ts
@@ -1,10 +1,10 @@
-import { DriverInterface } from '../drivers/driverInterface';
-import { InstrumentedResource, ToolingInterface } from '../drivers/instrumentedResource';
-import { RevolverPlugin } from '../plugins/pluginInterface';
-import { logger } from './logger';
+import { DriverInterface } from '../drivers/driverInterface.js';
+import { InstrumentedResource, ToolingInterface } from '../drivers/instrumentedResource.js';
+import { RevolverPlugin } from '../plugins/pluginInterface.js';
+import { logger } from './logger.js';
 import path from 'node:path';
-import { promises as fs } from 'fs';
-import { buildFilter } from '../plugins/filters/index';
+import { promises as fs } from 'node:fs';
+import { buildFilter } from '../plugins/filters/index.js';
 import {
   ActionAuditTable,
   ObjectLogTable,
@@ -13,7 +13,7 @@ import {
   ResourceTable,
   ObjectLogHtml,
   resetFileLogger,
-} from './objectLog';
+} from './objectLog.js';
 
 export class AccountRevolver {
   readonly supportedDrivers = [
@@ -54,7 +54,7 @@ export class AccountRevolver {
       activePlugins.flatMap((xs: string) => {
         this.logger.info(`Configuring plugin ${xs}...`);
         return this.config.plugins[xs].configs.map(async (xp: any) => {
-          const PluginModule = await require(`../plugins/${xs}`);
+          const PluginModule = await import(`../plugins/${xs}.js`);
           return new PluginModule['default'](this.config, xs, xp);
         });
       }),
@@ -66,7 +66,7 @@ export class AccountRevolver {
         .filter((xd: any) => this.supportedDrivers.indexOf(xd.name) > -1)
         .map(async (xd: any) => {
           this.logger.info(`Configuring driver ${xd.name}...`);
-          const DriverModule = await require(`../drivers/${xd.name}`);
+          const DriverModule = await import(`../drivers/${xd.name}.js`);
           return new DriverModule.default(this.config, xd);
         }),
     );

diff --git a/lib/assume.ts b/lib/assume.ts
@@ -1,10 +1,10 @@
-import { logger } from './logger';
+import { logger } from './logger.js';
 import { STS } from '@aws-sdk/client-sts';
-import dateTime from './dateTime';
+import dateTime from './dateTime.js';
 import { DateTime } from 'luxon';
 import { AwsCredentialIdentity as Credentials, Provider } from '@aws-sdk/types';
 import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
-import { getAwsConfig } from './awsConfig';
+import { getAwsConfig } from './awsConfig.js';
 
 export interface Creds {
   expiration: DateTime;

diff --git a/lib/awsConfig.ts b/lib/awsConfig.ts
@@ -1,8 +1,8 @@
-import environ from './environ';
+import environ from './environ.js';
 import { AwsCredentialIdentity as Credentials, Provider } from '@aws-sdk/types';
 import { NodeHttpHandler } from '@smithy/node-http-handler';
 import { HttpsProxyAgent } from 'https-proxy-agent';
-import assume from '../lib/assume';
+import assume from '../lib/assume.js';
 
 // In version 3 , there is no longer a global configuration managed by the SDK
 function getAwsConfig(region?: string, credentials?: Credentials | Provider<Credentials>) {

diff --git a/lib/config.ts b/lib/config.ts
@@ -1,15 +1,15 @@
-import { logger } from './logger';
-import { promises as fs } from 'fs';
+import { logger } from './logger.js';
+import { promises as fs } from 'node:fs';
 import path = require('node:path');
 import yaml from 'js-yaml';
 import { Organizations, paginateListAccounts } from '@aws-sdk/client-organizations';
 import { S3Client, GetObjectCommand } from '@aws-sdk/client-s3';
-import { paginateAwsCall } from './common';
+import { paginateAwsCall } from './common.js';
 import { merge } from 'ts-deepmerge';
-import { getAwsConfig } from './awsConfig';
-import { ConfigSchema } from './config-schema';
+import { getAwsConfig } from './awsConfig.js';
+import { ConfigSchema } from './config-schema.js';
 import { ZodError, ZodIssueCode, ZodInvalidUnionIssue, ZodInvalidArgumentsIssue, ZodInvalidReturnTypeIssue } from 'zod';
-import { ObjectLogJson } from './objectLog';
+import { ObjectLogJson } from './objectLog.js';
 
 function flattenZodErrors(ze: ZodError, depth: number): string[] {
   let lines: string[] = [];

diff --git a/lib/dateTime.ts b/lib/dateTime.ts
@@ -1,5 +1,5 @@
 import { DateTime as LuxonDateTime } from 'luxon';
-import { logger } from './logger';
+import { logger } from './logger.js';
 
 /**
  * A class for using a consistent time during execution of a cycle of Revolver.

diff --git a/lib/logger.ts b/lib/logger.ts
@@ -1,5 +1,5 @@
 import { Logger, ISettingsParam } from 'tslog';
-import environ from './environ';
+import environ from './environ.js';
 
 const logLevels: { [key: string]: number } = {
   silly: 0,

diff --git a/lib/objectLog.ts b/lib/objectLog.ts
@@ -1,12 +1,12 @@
-import { ToolingInterface } from '../drivers/instrumentedResource';
-import { logger } from './logger';
-import { existsSync, promises as fs } from 'fs';
-import { getAwsConfig } from './awsConfig';
+import { ToolingInterface } from '../drivers/instrumentedResource.js';
+import { logger } from './logger.js';
+import { existsSync, promises as fs } from 'node:fs';
+import { getAwsConfig } from './awsConfig.js';
 import { GetObjectCommand, NoSuchKey, PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { SendMessageCommand, SQSClient, MessageAttributeValue } from '@aws-sdk/client-sqs';
-import { ActionAuditEntry } from '../actions/audit';
-import dateTime from './dateTime';
-import { htmlTableReport } from './templater';
+import { ActionAuditEntry } from '../actions/audit.js';
+import dateTime from './dateTime.js';
+import { htmlTableReport } from './templater.js';
 import zlib from 'node:zlib';
 import { stringify } from 'csv-stringify/sync';
 import { PublishCommand, SNSClient } from '@aws-sdk/client-sns';