patch(feat): octo deprecated Support model.

- The Support model is similar to Server, and hence not needed.

Author: rash805115

packages/octo/src/app.type.ts

@@ -34,8 +34,6 @@ export type ResourceSerializedOutput = {
   sharedResources: { [p: string]: { className: string; resource: IResource } };
 };
 
-export type SupportApplicationType = 'nginx';
-
 export type TransactionOptions = {
   yieldModelTransaction?: boolean;
   yieldNewResources?: boolean;

packages/octo/src/functions/diff/diff.utility.spec.ts

@@ -43,11 +43,11 @@ describe('Diff Utility UT', () => {
       expect(DiffUtility.isObjectDeepEquals([{ a: 1 }, { b: 2 }], [{ a: 1 }, { b: 3 }])).toEqual(false);
     });
 
-    it('should return true when array of booleans and undefined are equal', () => {
+    it('should return true when array of boolean and undefined are equal', () => {
       expect(DiffUtility.isObjectDeepEquals([undefined, false], [undefined, false])).toEqual(true);
     });
 
-    it('should return false when array of booleans and undefined are not equal', () => {
+    it('should return false when array of boolean and undefined are not equal', () => {
       expect(DiffUtility.isObjectDeepEquals([undefined, false], [null, true])).toEqual(false);
     });
   });

packages/octo/src/index.ts

@@ -33,8 +33,6 @@ export { IService } from './models/service/service.interface.js';
 export { Service } from './models/service/service.model.js';
 export { ISubnet } from './models/subnet/subnet.interface.js';
 export { Subnet, SubnetType } from './models/subnet/subnet.model.js';
-export { ISupport } from './models/support/support.interface.js';
-export { Support } from './models/support/support.model.js';
 
 export { AModel } from './models/model.abstract.js';
 export { IModel, IModelReference } from './models/model.interface.js';

packages/octo/src/models/app/app.model.ts

@@ -8,7 +8,6 @@ import { Pipeline } from '../pipeline/pipeline.model.js';
 import { Region } from '../region/region.model.js';
 import { Server } from '../server/server.model.js';
 import { Service } from '../service/service.model.js';
-import { Support } from '../support/support.model.js';
 import { IApp } from './app.interface.js';
 
 @Model()
@@ -82,18 +81,6 @@ export class App extends AModel<IApp, App> {
     this.addChild('name', service, 'serviceId');
   }
 
-  addSupport(support: Support): void {
-    const childrenDependencies = this.getChildren('support');
-    if (!childrenDependencies['support']) childrenDependencies['support'] = [];
-
-    // Check for duplicates.
-    const supports = childrenDependencies['support'].map((d) => d.to);
-    if (supports.find((s: Support) => s.serverKey === support.serverKey)) {
-      throw new Error('Support already exists!');
-    }
-    this.addChild('name', support, 'serverKey');
-  }
-
   getContext(): string {
     return `${this.MODEL_NAME}=${this.name}`;
   }

packages/octo/src/models/execution/execution.model.spec.ts

@@ -3,9 +3,8 @@ import { ModelSerializationService } from '../../services/serialization/model/mo
 import { App } from '../app/app.model.js';
 import { Deployment } from '../deployment/deployment.model.js';
 import { Environment } from '../environment/environment.model.js';
-import { Image } from '../image/image.model.js';
 import { Region } from '../region/region.model.js';
-import { Support } from '../support/support.model.js';
+import { Server } from '../server/server.model.js';
 import { Execution } from './execution.model.js';
 
 describe('Execution UT', () => {
@@ -16,43 +15,39 @@ describe('Execution UT', () => {
   });
 
   describe('diff()', () => {
-    describe('when diff of object with children', () => {
-      it('should capture delete of children', async () => {
-        const app0_0 = new App('test');
-        const image0_0 = new Image('test', 'imageTag', {
-          dockerfilePath: 'path/to/Dockerfile',
-        });
-        app0_0.addImage(image0_0);
-        const region0_0 = new Region('region');
-        app0_0.addRegion(region0_0);
-        const environment0_0 = new Environment('qa');
-        region0_0.addEnvironment(environment0_0);
-        const support0_0 = new Support('nginx', 'nginx');
-        app0_0.addSupport(support0_0);
-        const deployment0_0 = new Deployment('nginx@0.0.1');
-        support0_0.addDeployment(deployment0_0);
-        new Execution(deployment0_0, environment0_0);
+    describe('when diff of object', () => {
+      it('should capture delete', async () => {
+        const app_0 = new App('test');
+        const region_0 = new Region('region');
+        app_0.addRegion(region_0);
+        const environment_0 = new Environment('qa');
+        region_0.addEnvironment(environment_0);
+        const server_0 = new Server('backend');
+        app_0.addServer(server_0);
+        const deployment_0 = new Deployment('backend@0.0.1');
+        server_0.addDeployment(deployment_0);
+        new Execution(deployment_0, environment_0);
 
-        const app0_1 = (await modelSerializationService.deserialize(
-          await modelSerializationService.serialize(app0_0),
+        const app_1 = (await modelSerializationService.deserialize(
+          await modelSerializationService.serialize(app_0),
         )) as App;
-        const region0_1 = app0_1.getChild('region', [{ key: 'regionId', value: 'region' }]) as Region;
-        const environment0_1 = region0_1.getChild('environment', [
+        const region_1 = app_1.getChild('region', [{ key: 'regionId', value: 'region' }]) as Region;
+        const environment_1 = region_1.getChild('environment', [
           { key: 'environmentName', value: 'qa' },
         ]) as Environment;
-        const execution0_1 = environment0_1.getChild('execution', [
-          { key: 'executionId', value: 'nginx@0.0.1_qa' },
+        const execution_1 = environment_1.getChild('execution', [
+          { key: 'executionId', value: 'backend@0.0.1_qa' },
         ]) as Execution;
 
-        execution0_1.remove(true);
-        const diff = await app0_1.diff(app0_0);
+        execution_1.remove();
+        const diff = await app_1.diff(app_0);
 
         expect(diff).toMatchInlineSnapshot(`
           [
             {
               "action": "delete",
               "field": "executionId",
-              "value": "nginx@0.0.1_qa",
+              "value": "backend@0.0.1_qa",
             },
           ]
         `);

packages/octo/src/models/server/server.model.spec.ts

@@ -0,0 +1,73 @@
+import { Container } from '../../decorators/container.js';
+import { ModelSerializationService } from '../../services/serialization/model/model-serialization.service.js';
+import { App } from '../app/app.model.js';
+import { Deployment } from '../deployment/deployment.model.js';
+import { Environment } from '../environment/environment.model.js';
+import { Execution } from '../execution/execution.model.js';
+import { Region } from '../region/region.model.js';
+import { Server } from './server.model.js';
+
+describe('Server UT', () => {
+  let modelSerializationService: ModelSerializationService;
+
+  beforeAll(async () => {
+    modelSerializationService = await Container.get(ModelSerializationService);
+  });
+
+  describe('diff()', () => {
+    describe('when diff of object with children', () => {
+      it('should capture delete of children', async () => {
+        const app_0 = new App('test');
+        const region_0 = new Region('region');
+        app_0.addRegion(region_0);
+        const environment_0 = new Environment('qa');
+        region_0.addEnvironment(environment_0);
+        const server_0 = new Server('backend');
+        app_0.addServer(server_0);
+        const deployment_0 = new Deployment('backend@0.0.1');
+        server_0.addDeployment(deployment_0);
+        new Execution(deployment_0, environment_0);
+
+        const app_1 = (await modelSerializationService.deserialize(
+          await modelSerializationService.serialize(app_0),
+        )) as App;
+        const region_1 = app_1.getChild('region', [{ key: 'regionId', value: 'region' }]) as Region;
+        const environment_1 = region_1.getChild('environment', [
+          { key: 'environmentName', value: 'qa' },
+        ]) as Environment;
+        const execution_1 = environment_1.getChild('execution', [
+          { key: 'executionId', value: 'backend@0.0.1_qa' },
+        ]) as Execution;
+        const server_1 = app_1.getChild('server', [{ key: 'serverKey', value: 'backend' }]) as Server;
+        const deployment_1 = server_1.getChild('deployment', [
+          { key: 'deploymentTag', value: 'backend@0.0.1' },
+        ]) as Deployment;
+
+        execution_1.remove();
+        deployment_1.remove();
+        server_1.remove();
+        const diff = await app_1.diff(app_0);
+
+        expect(diff).toMatchInlineSnapshot(`
+          [
+            {
+              "action": "delete",
+              "field": "executionId",
+              "value": "backend@0.0.1_qa",
+            },
+            {
+              "action": "delete",
+              "field": "deploymentTag",
+              "value": "backend@0.0.1",
+            },
+            {
+              "action": "delete",
+              "field": "serverKey",
+              "value": "backend",
+            },
+          ]
+        `);
+      });
+    });
+  });
+});