@pwrdrvr/microapps-datalib 1.2.0-beta.7 → 1.2.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pwrdrvr/microapps-datalib",
-  "version": "1.2.0-beta.7",
+  "version": "1.2.0-beta.8",
   "description": "Data library for the microapps framework",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
@@ -24,14 +24,14 @@
   },
   "homepage": "https://github.com/pwrdrvr/microapps-core#readme",
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.78.0",
-    "@aws-sdk/lib-dynamodb": "^3.78.0",
+    "@aws-sdk/client-dynamodb": "^3.1024.0",
+    "@aws-sdk/lib-dynamodb": "^3.1024.0",
     "class-transformer": "0.5.1",
     "tslib": "2.5.0"
   },
   "devDependencies": {
-    "@aws-sdk/client-dynamodb": "3.78.0",
-    "@aws-sdk/lib-dynamodb": "3.78.0",
+    "@aws-sdk/client-dynamodb": "3.1024.0",
+    "@aws-sdk/lib-dynamodb": "3.1024.0",
     "@types/node-fetch": "^2.5.8",
     "jest-dynalite": "3.6.1",
     "node-fetch": "^2.6.1"
@@ -39,6 +39,7 @@
   "files": [
     "dist",
     "src",
+    "!src/**/*.spec.ts",
     "package.json",
     "LICENSE"
   ]

package/src/models/application.spec.ts

@@ -1,202 +0,0 @@
-import 'jest-dynalite/withDb';
-import * as dynamodb from '@aws-sdk/client-dynamodb';
-import { DBManager } from '../manager';
-import { Application } from './application';
-import { Version } from './version';
-import { Rules } from './rules';
-
-let dynamoClient: dynamodb.DynamoDBClient;
-let dbManager: DBManager;
-
-const TEST_TABLE_NAME = 'microapps';
-
-describe('application records', () => {
-  beforeAll(() => {
-    dynamoClient = new dynamodb.DynamoDBClient({
-      endpoint: process.env.MOCK_DYNAMODB_ENDPOINT,
-      tls: false,
-      region: 'local',
-    });
-
-    // Init the DB manager to point it at the right table
-    dbManager = new DBManager({ dynamoClient, tableName: TEST_TABLE_NAME });
-  });
-
-  afterAll(() => {
-    dynamoClient.destroy();
-  }, 20000);
-
-  it('saving an application should create two records', async () => {
-    const application = new Application();
-    application.AppName = 'Cat';
-    application.DisplayName = 'Dog';
-
-    await application.Save(dbManager);
-
-    {
-      const { Item } = await dbManager.ddbDocClient.get({
-        TableName: TEST_TABLE_NAME,
-        Key: { PK: 'appname#cat', SK: 'application' },
-      });
-      expect(Item).toBeDefined();
-      expect(Item?.PK).toBe('appname#cat');
-      expect(Item?.SK).toBe('application');
-      expect(Item?.AppName).toBe('cat');
-      expect(Item?.DisplayName).toBe('Dog');
-    }
-
-    {
-      const { Item } = await dbManager.ddbDocClient.get({
-        TableName: TEST_TABLE_NAME,
-        Key: { PK: 'applications', SK: 'appname#cat' },
-        // ProjectionExpression: 'PK,SK,AppName,DisplayName',
-      });
-      expect(Item).toBeDefined();
-      expect(Item?.PK).toBe('applications');
-      expect(Item?.SK).toBe('appname#cat');
-      expect(Item?.AppName).toBe('cat');
-      expect(Item?.DisplayName).toBe('Dog');
-    }
-  });
-
-  it('load function should load records', async () => {
-    let application = new Application();
-    application.AppName = 'App1';
-    application.DisplayName = 'Application One';
-    await application.Save(dbManager);
-
-    application = new Application();
-    application.AppName = 'App2';
-    application.DisplayName = 'Application Two';
-    await application.Save(dbManager);
-
-    {
-      const record = await Application.Load({ dbManager, key: { AppName: 'App1' } });
-
-      expect(record.PK).toBe('appname#app1');
-      expect(record.SK).toBe('application');
-      expect(record.AppName).toBe('app1');
-      expect(record.DisplayName).toBe('Application One');
-    }
-
-    {
-      const record = await Application.Load({ dbManager, key: { AppName: 'App2' } });
-
-      expect(record.PK).toBe('appname#app2');
-      expect(record.SK).toBe('application');
-      expect(record.AppName).toBe('app2');
-      expect(record.DisplayName).toBe('Application Two');
-    }
-  });
-
-  it('Load should handle missing records', async () => {
-    const record = await Application.Load({ dbManager, key: { AppName: 'App1' } });
-    expect(record).toBeUndefined();
-  });
-
-  it('LoadAllAppsAsync should return all applications', async () => {
-    let application = new Application();
-    application.AppName = 'Bpp1';
-    application.DisplayName = 'Bpplication One';
-    await application.Save(dbManager);
-
-    application = new Application();
-    application.AppName = 'Bpp2';
-    application.DisplayName = 'Bpplication Two';
-    await application.Save(dbManager);
-
-    const applications = await Application.LoadAllApps(dbManager);
-    expect(applications).toBeDefined();
-    const appOne = applications.find((value) => {
-      return value.AppName === 'bpp1';
-    });
-    expect(appOne).toBeDefined();
-    expect(appOne).toHaveProperty('AppName');
-    expect(appOne?.AppName).toBe('bpp1');
-    expect(appOne?.DisplayName).toBe('Bpplication One');
-
-    const appTwo = applications.find((value) => {
-      return value.AppName === 'bpp2';
-    });
-    expect(appTwo).toBeDefined();
-    expect(appTwo).toHaveProperty('AppName');
-    expect(appTwo?.AppName).toBe('bpp2');
-    expect(appTwo?.DisplayName).toBe('Bpplication Two');
-  });
-
-  it('should get versions and rules when asked', async () => {
-    const app = new Application({
-      AppName: 'Bat',
-      DisplayName: 'Bat App',
-    });
-    await app.Save(dbManager);
-
-    const version = new Version({
-      AppName: 'Bat',
-      DefaultFile: 'bat.html',
-      IntegrationID: 'abcd',
-      SemVer: '3.2.1-beta0',
-      Status: 'deployed',
-      Type: 'lambda',
-    });
-    await version.Save(dbManager);
-
-    const rules = new Rules({
-      AppName: 'Bat',
-      Version: 0,
-      RuleSet: { default: { SemVer: '3.2.1-beta0', AttributeName: '', AttributeValue: '' } },
-    });
-    await rules.Save(dbManager);
-
-    const versAndRules = await Application.GetVersionsAndRules({
-      dbManager,
-      key: { AppName: 'bat' },
-    });
-
-    expect(versAndRules).toHaveProperty('Versions');
-    expect(versAndRules).toHaveProperty('Rules');
-    expect(versAndRules.Rules).toHaveProperty('RuleSet');
-    expect(versAndRules.Rules.RuleSet).toHaveProperty('default');
-    expect(versAndRules.Rules.RuleSet.default).toHaveProperty('SemVer');
-    expect(versAndRules.Rules.RuleSet.default.SemVer).toBe('3.2.1-beta0');
-    expect(versAndRules.Versions.length).toBe(1);
-    expect(versAndRules.Versions[0].SemVer).toBe('3.2.1-beta0');
-  });
-
-  it('should update default rule', async () => {
-    const app = new Application({
-      AppName: 'Bat2',
-      DisplayName: 'Bat App',
-    });
-    await app.Save(dbManager);
-
-    const version = new Version({
-      AppName: 'Bat2',
-      DefaultFile: 'bat.html',
-      IntegrationID: 'abcd',
-      SemVer: '3.2.1-beta0',
-      Status: 'deployed',
-      Type: 'lambda',
-    });
-    await version.Save(dbManager);
-
-    const rules = new Rules({
-      AppName: 'Bat2',
-      Version: 0,
-      RuleSet: { default: { SemVer: '3.2.1-beta0', AttributeName: '', AttributeValue: '' } },
-    });
-    await rules.Save(dbManager);
-
-    // Check version before update
-    let versAndRules = await Application.GetVersionsAndRules({
-      dbManager,
-      key: { AppName: 'bat2' },
-    });
-    expect(versAndRules.Rules.RuleSet.default.SemVer).toBe('3.2.1-beta0');
-
-    // Update default version
-    await Application.UpdateDefaultRule({ dbManager, key: { AppName: 'bat2', SemVer: '3.2.2' } });
-    versAndRules = await Application.GetVersionsAndRules({ dbManager, key: { AppName: 'bat2' } });
-    expect(versAndRules.Rules.RuleSet.default.SemVer).toBe('3.2.2');
-  });
-});

package/src/models/rules.spec.ts

@@ -1,49 +0,0 @@
-import 'jest-dynalite/withDb';
-import * as dynamodb from '@aws-sdk/client-dynamodb';
-import { DBManager } from '../manager';
-import { Rules } from './rules';
-
-let dynamoClient: dynamodb.DynamoDBClient;
-let dbManager: DBManager;
-
-const TEST_TABLE_NAME = 'microapps';
-
-describe('rules records', () => {
-  beforeAll(() => {
-    dynamoClient = new dynamodb.DynamoDBClient({
-      endpoint: process.env.MOCK_DYNAMODB_ENDPOINT,
-      tls: false,
-      region: 'local',
-    });
-
-    // Init the DB manager to point it at the right table
-    dbManager = new DBManager({ dynamoClient, tableName: TEST_TABLE_NAME });
-  });
-
-  afterAll(() => {
-    dynamoClient.destroy();
-  }, 20000);
-
-  it('saving rules should create 1 record', async () => {
-    const rules = new Rules();
-    rules.AppName = 'Cat';
-    rules.Version = 0;
-    rules.RuleSet.default = { SemVer: '1.2.3', AttributeName: '', AttributeValue: '' };
-
-    await rules.Save(dbManager);
-
-    {
-      const record = await Rules.Load({ dbManager, key: { AppName: 'Cat' } });
-
-      expect(record).toBeDefined();
-      expect(record.PK).toBe('appname#cat');
-      expect(record.SK).toBe('rules');
-      expect(record.AppName).toBe('cat');
-      expect(record.Version).toBe(0);
-      expect(record).toHaveProperty('RuleSet');
-      expect(record.RuleSet).toHaveProperty('default');
-      expect(record.RuleSet.default).toHaveProperty('SemVer');
-      expect(record.RuleSet.default.SemVer).toBe('1.2.3');
-    }
-  });
-});

package/src/models/version.spec.ts

@@ -1,171 +0,0 @@
-import 'jest-dynalite/withDb';
-import * as dynamodb from '@aws-sdk/client-dynamodb';
-import { DBManager } from '../manager';
-import { Version } from './version';
-
-let dynamoClient: dynamodb.DynamoDBClient;
-let dbManager: DBManager;
-
-const TEST_TABLE_NAME = 'microapps';
-
-describe('version records', () => {
-  beforeAll(() => {
-    dynamoClient = new dynamodb.DynamoDBClient({
-      endpoint: process.env.MOCK_DYNAMODB_ENDPOINT,
-      tls: false,
-      region: 'local',
-    });
-
-    // Init the DB manager to point it at the right table
-    dbManager = new DBManager({ dynamoClient, tableName: TEST_TABLE_NAME });
-  });
-
-  afterAll(() => {
-    dynamoClient.destroy();
-  }, 20000);
-
-  describe('Type API Gateway', () => {
-    it('saving a version should create one record', async () => {
-      const version = new Version();
-      version.AppName = 'Cat';
-      version.SemVer = '1.2.3-Beta4';
-      version.Status = 'pending';
-      version.Type = 'lambda';
-      version.DefaultFile = 'index.html';
-      version.IntegrationID = 'abcd';
-      version.RouteIDAppVersion = '123';
-      version.RouteIDAppVersionSplat = '456';
-
-      await version.Save(dbManager);
-
-      const { Item } = await dbManager.ddbDocClient.get({
-        TableName: dbManager.tableName,
-        Key: { PK: 'appname#cat', SK: 'version#1.2.3-beta4' },
-      });
-      expect(Item).toBeDefined();
-      expect(Item?.PK).toBe('appname#cat');
-      expect(Item?.SK).toBe('version#1.2.3-beta4');
-      expect(Item?.AppName).toBe('cat');
-      expect(Item?.SemVer).toBe('1.2.3-Beta4');
-      expect(Item?.Status).toBe('pending');
-      expect(Item?.Type).toBe('lambda');
-      expect(Item?.DefaultFile).toBe('index.html');
-      expect(Item?.IntegrationID).toBe('abcd');
-      expect(Item?.RouteIDAppVersion).toEqual('123');
-      expect(Item?.RouteIDAppVersionSplat).toEqual('456');
-    });
-
-    it('load 1 version should load 1 version', async () => {
-      let version = new Version();
-      version.AppName = 'Dog';
-      version.SemVer = '1.2.3-Beta5';
-      version.Status = 'pending';
-      version.Type = 'lambda';
-      version.DefaultFile = 'index.html';
-      version.IntegrationID = 'abcd';
-
-      await version.Save(dbManager);
-
-      version = new Version();
-      version.AppName = 'Dog';
-      version.SemVer = '1.2.3-Beta6';
-      version.Status = 'pending';
-      version.Type = 'lambda';
-      version.DefaultFile = 'index.html';
-      version.IntegrationID = 'abcd';
-
-      await version.Save(dbManager);
-
-      const version1 = await Version.LoadVersion({
-        dbManager,
-        key: {
-          AppName: 'Dog',
-          SemVer: '1.2.3-Beta5',
-        },
-      });
-
-      expect(version1.AppName).toBe('dog');
-      expect(version1.SK).toBe('version#1.2.3-beta5');
-      expect(version1.SemVer).toBe('1.2.3-Beta5');
-
-      const version2 = await Version.LoadVersion({
-        dbManager,
-        key: { AppName: 'Dog', SemVer: '1.2.3-Beta6' },
-      });
-
-      expect(version2.AppName).toBe('dog');
-      expect(version2.SK).toBe('version#1.2.3-beta6');
-      expect(version2.SemVer).toBe('1.2.3-Beta6');
-    });
-
-    it('load all app versions should load all versions for 1 app', async () => {
-      let version = new Version();
-      version.AppName = 'Frog';
-      version.SemVer = '2.2.3-Beta5';
-      version.Status = 'pending';
-      version.Type = 'lambda';
-      version.DefaultFile = 'index1.html';
-      version.IntegrationID = 'abcd1';
-      version.RouteIDAppVersion = 'routeAppVersion1';
-      version.RouteIDAppVersionSplat = 'routeAppVersionSplat1';
-
-      await version.Save(dbManager);
-
-      version = new Version();
-      version.AppName = 'Frog';
-      version.SemVer = '2.2.3-Beta6';
-      version.Status = 'pending';
-      version.Type = 'lambda';
-      version.DefaultFile = 'index2.html';
-      version.IntegrationID = 'abcd2';
-      version.RouteIDAppVersion = 'routeAppVersion2';
-      version.RouteIDAppVersionSplat = 'routeAppVersionSplat2';
-
-      await version.Save(dbManager);
-
-      const versions = await Version.LoadVersions({ dbManager, key: { AppName: 'Frog' } });
-
-      expect(versions.length).toBe(2);
-
-      expect(versions[0].AppName).toBe('frog');
-      expect(versions[0].SK).toBe('version#2.2.3-beta5');
-      expect(versions[0].SemVer).toBe('2.2.3-Beta5');
-      expect(versions[0].DefaultFile).toEqual('index1.html');
-      expect(versions[0].RouteIDAppVersion).toEqual('routeAppVersion1');
-      expect(versions[0].RouteIDAppVersionSplat).toEqual('routeAppVersionSplat1');
-      expect(versions[1].AppName).toBe('frog');
-      expect(versions[1].SK).toBe('version#2.2.3-beta6');
-      expect(versions[1].SemVer).toBe('2.2.3-Beta6');
-      expect(versions[1].DefaultFile).toEqual('index2.html');
-      expect(versions[1].RouteIDAppVersion).toEqual('routeAppVersion2');
-      expect(versions[1].RouteIDAppVersionSplat).toEqual('routeAppVersionSplat2');
-    });
-  });
-
-  describe('Type Lambda URL', () => {
-    it('saving and loading should return same record', async () => {
-      const version = new Version();
-      version.AppName = 'Cat';
-      version.SemVer = '1.2.3-Beta4';
-      version.Status = 'pending';
-      version.Type = 'lambda-url';
-      version.DefaultFile = 'index.html';
-      version.URL = 'https://abc123.lambda-url.us-east-1.on.aws/';
-
-      await version.Save(dbManager);
-
-      const { Item } = await dbManager.ddbDocClient.get({
-        TableName: dbManager.tableName,
-        Key: { PK: 'appname#cat', SK: 'version#1.2.3-beta4' },
-      });
-      expect(Item).toBeDefined();
-      expect(Item?.PK).toBe('appname#cat');
-      expect(Item?.SK).toBe('version#1.2.3-beta4');
-      expect(Item?.AppName).toBe('cat');
-      expect(Item?.SemVer).toBe('1.2.3-Beta4');
-      expect(Item?.Status).toBe('pending');
-      expect(Item?.Type).toBe('lambda-url');
-      expect(Item?.URL).toEqual('https://abc123.lambda-url.us-east-1.on.aws/');
-    });
-  });
-});