introspection cmds should consume new refactored package (#359)

* Consuming new spektate package

* Dashboard command

* Remove -it

Co-authored-by: Dennis Seah <[email protected]>

Author: samiyaakhtar

package.json

@@ -88,7 +88,7 @@
     "open": "^6.4.0",
     "shelljs": "^0.8.3",
     "simple-git": "^1.126.0",
-    "spektate": "^0.1.19",
+    "spektate": "^1.0.0",
     "ssh-url": "^0.1.5",
     "uuid": "^3.3.3",
     "winston": "^3.2.1"

src/commands/deployment/dashboard.ts

@@ -143,7 +143,7 @@ export const launchDashboard = async (
       "--rm",
       ...(await getEnvVars(config)),
       "-p",
-      port + ":80",
+      port + ":5000",
       dockerRepository
     ]);
     return containerId;
@@ -192,6 +192,10 @@ export const getEnvVars = async (config: IConfigYaml): Promise<string[]> => {
         "REACT_APP_SOURCE_REPO_ACCESS_TOKEN=" +
           config.azure_devops!.access_token
       );
+      envVars.push("-e");
+      envVars.push(
+        "REACT_APP_MANIFEST_ACCESS_TOKEN=" + config.azure_devops!.access_token
+      );
     }
   } else {
     logger.warn(
@@ -204,6 +208,11 @@ export const getEnvVars = async (config: IConfigYaml): Promise<string[]> => {
       "REACT_APP_SOURCE_REPO_ACCESS_TOKEN=" +
         config.introspection!.azure!.source_repo_access_token
     );
+    envVars.push("-e");
+    envVars.push(
+      "REACT_APP_MANIFEST_ACCESS_TOKEN=" +
+        config.introspection!.azure!.source_repo_access_token
+    );
   }
 
   const manifestRepo = extractManifestRepositoryInformation(config);

src/commands/deployment/get.test.ts

@@ -1,7 +1,10 @@
 import path from "path";
-import Deployment from "spektate/lib/Deployment";
-import { AzureDevOpsRepo } from "spektate/lib/repository/AzureDevOpsRepo";
-import { GitHub } from "spektate/lib/repository/GitHub";
+import { duration, IDeployment, status } from "spektate/lib/IDeployment";
+import * as Deployment from "spektate/lib/IDeployment";
+import { IAzureDevOpsRepo } from "spektate/lib/repository/IAzureDevOpsRepo";
+import * as AzureDevOpsRepo from "spektate/lib/repository/IAzureDevOpsRepo";
+import { IGitHub } from "spektate/lib/repository/IGitHub";
+import * as GitHub from "spektate/lib/repository/IGitHub";
 import { ITag } from "spektate/lib/repository/Tag";
 import { loadConfiguration } from "../../config";
 import { deepClone } from "../../lib/util";
@@ -66,30 +69,32 @@ const data = require("./mocks/data.json");
 const fakeDeployments = data;
 // tslint:disable-next-line: no-var-requires
 const fakeClusterSyncs = require("./mocks/cluster-sync.json");
-const mockedDeps: Deployment[] = fakeDeployments.data.map((dep: Deployment) => {
-  return new Deployment(
-    dep.deploymentId,
-    dep.commitId,
-    dep.hldCommitId || "",
-    dep.imageTag,
-    dep.timeStamp,
-    dep.environment,
-    dep.service,
-    dep.manifestCommitId,
-    dep.srcToDockerBuild,
-    dep.dockerToHldRelease,
-    dep.hldToManifestBuild
-  );
-});
+const mockedDeps: IDeployment[] = fakeDeployments.data.map(
+  (dep: IDeployment) => {
+    return {
+      commitId: dep.commitId,
+      deploymentId: dep.deploymentId,
+      dockerToHldRelease: dep.dockerToHldRelease,
+      environment: dep.environment,
+      hldCommitId: dep.hldCommitId || "",
+      hldToManifestBuild: dep.hldToManifestBuild,
+      imageTag: dep.imageTag,
+      manifestCommitId: dep.manifestCommitId,
+      service: dep.service,
+      srcToDockerBuild: dep.srcToDockerBuild,
+      timeStamp: dep.timeStamp
+    };
+  }
+);
 
 const mockedClusterSyncs: ITag[] = fakeClusterSyncs.data.map((sync: ITag) => {
   return sync;
 });
 jest
-  .spyOn(GitHub.prototype, "getManifestSyncState")
+  .spyOn(GitHub, "getManifestSyncState")
   .mockReturnValue(Promise.resolve(mockedClusterSyncs));
 jest
-  .spyOn(AzureDevOpsRepo.prototype, "getManifestSyncState")
+  .spyOn(AzureDevOpsRepo, "getManifestSyncState")
   .mockReturnValue(Promise.resolve(mockedClusterSyncs));
 
 let initObject: IInitObject;
@@ -277,14 +282,14 @@ describe("Watch get deployments", () => {
 
 describe("Introspect deployments", () => {
   test("verify basic fields are defined", () => {
-    mockedDeps.forEach((deployment: Deployment) => {
-      const dep = deployment as Deployment;
+    mockedDeps.forEach((deployment: IDeployment) => {
+      const dep = deployment as IDeployment;
 
       // Make sure the basic fields are defined
       expect(dep.deploymentId).not.toBe("");
       expect(dep.service).not.toBe("");
-      expect(dep.duration()).not.toBe("");
-      expect(dep.status()).not.toBe("");
+      expect(duration(dep)).not.toBe("");
+      expect(status(dep)).not.toBe("");
       expect(dep.environment).not.toBe("");
       expect(dep.timeStamp).not.toBe("");
 
@@ -327,7 +332,7 @@ describe("Print deployments", () => {
     const matchItems = table!.filter(field => field[2] === deployment[2]);
     expect(matchItems).toHaveLength(1); // one matching row
 
-    (matchItems[0] as Deployment[]).forEach((field, i) => {
+    (matchItems[0] as IDeployment[]).forEach((field, i) => {
       expect(field).toEqual(deployment[i]);
     });
     expect(matchItems[0]).toHaveLength(14);

src/commands/deployment/get.ts

@@ -1,10 +1,20 @@
 import Table from "cli-table";
 import commander from "commander";
-import Deployment from "spektate/lib/Deployment";
+import {
+  duration,
+  getDeploymentsBasedOnFilters,
+  IDeployment,
+  status as getDeploymentStatus
+} from "spektate/lib/IDeployment";
 import AzureDevOpsPipeline from "spektate/lib/pipeline/AzureDevOpsPipeline";
-import { AzureDevOpsRepo } from "spektate/lib/repository/AzureDevOpsRepo";
-import { GitHub } from "spektate/lib/repository/GitHub";
-import { IRepository } from "spektate/lib/repository/Repository";
+import {
+  getManifestSyncState as getAzureManifestSyncState,
+  IAzureDevOpsRepo
+} from "spektate/lib/repository/IAzureDevOpsRepo";
+import {
+  getManifestSyncState as getGithubManifestSyncState,
+  IGitHub
+} from "spektate/lib/repository/IGitHub";
 import { ITag } from "spektate/lib/repository/Tag";
 import { Config } from "../../config";
 import { build as buildCmd, exit as exitCmd } from "../../lib/commandBuilder";
@@ -152,10 +162,10 @@ export const processOutputFormat = (outputFormat: string): OUTPUT_FORMAT => {
 export const getDeployments = (
   initObj: IInitObject,
   values: IValidatedOptions
-): Promise<Deployment[]> => {
+): Promise<IDeployment[]> => {
   const config = initObj.config;
   const syncStatusesPromise = getClusterSyncStatuses(initObj);
-  const deploymentsPromise = Deployment.getDeploymentsBasedOnFilters(
+  const deploymentsPromise = getDeploymentsBasedOnFilters(
     config.introspection!.azure!.account_name!,
     initObj.key,
     config.introspection!.azure!.table_name!,
@@ -172,8 +182,8 @@ export const getDeployments = (
   );
   return new Promise((resolve, reject) => {
     Promise.all([deploymentsPromise, syncStatusesPromise])
-      .then((tuple: [Deployment[] | undefined, ITag[] | undefined]) => {
-        const deployments: Deployment[] | undefined = tuple[0];
+      .then((tuple: [IDeployment[] | undefined, ITag[] | undefined]) => {
+        const deployments: IDeployment[] | undefined = tuple[0];
         const syncStatuses: ITag[] | undefined = tuple[1];
         if (values.outputFormat === OUTPUT_FORMAT.JSON) {
           // tslint:disable-next-line: no-console
@@ -212,14 +222,15 @@ export const getClusterSyncStatuses = (
         const manifestUrlSplit = config.azure_devops?.manifest_repository.split(
           "/"
         );
-        const manifestRepo: IRepository = new AzureDevOpsRepo(
-          manifestUrlSplit[3],
-          manifestUrlSplit[4],
-          manifestUrlSplit[6],
+        const manifestRepo: IAzureDevOpsRepo = {
+          org: manifestUrlSplit[3],
+          project: manifestUrlSplit[4],
+          repo: manifestUrlSplit[6]
+        };
+        getAzureManifestSyncState(
+          manifestRepo,
           config.azure_devops.access_token
-        );
-        manifestRepo
-          .getManifestSyncState()
+        )
           .then((syncCommits: ITag[]) => {
             resolve(syncCommits);
           })
@@ -233,13 +244,15 @@ export const getClusterSyncStatuses = (
         const manifestUrlSplit = config.azure_devops?.manifest_repository.split(
           "/"
         );
-        const manifestRepo: IRepository = new GitHub(
-          manifestUrlSplit[3],
-          manifestUrlSplit[4],
+        const manifestRepo: IGitHub = {
+          reponame: manifestUrlSplit[4],
+          username: manifestUrlSplit[3]
+        };
+
+        getGithubManifestSyncState(
+          manifestRepo,
           config.azure_devops.access_token
-        );
-        manifestRepo
-          .getManifestSyncState()
+        )
           .then((syncCommits: ITag[]) => {
             resolve(syncCommits);
           })
@@ -330,7 +343,7 @@ export const watchGetDeployments = async (
  * @param outputFormat output format: normal | wide | json
  */
 export const printDeployments = (
-  deployments: Deployment[] | undefined,
+  deployments: IDeployment[] | undefined,
   outputFormat: OUTPUT_FORMAT,
   limit?: number,
   syncStatuses?: ITag[] | undefined
@@ -440,8 +453,8 @@ export const printDeployments = (
           : ""
       );
       if (outputFormat === OUTPUT_FORMAT.WIDE) {
-        row.push(deployment.duration() + " mins");
-        row.push(deployment.status());
+        row.push(duration(deployment) + " mins");
+        row.push(getDeploymentStatus(deployment));
         row.push(deployment.manifestCommitId || "-");
         row.push(
           deployment.hldToManifestBuild &&
@@ -481,7 +494,7 @@ export const printDeployments = (
  * @param syncStatuses list of sync statuses for manifest
  */
 export const getClusterSyncStatusForDeployment = (
-  deployment: Deployment,
+  deployment: IDeployment,
   syncStatuses: ITag[]
 ): ITag | undefined => {
   return syncStatuses.find(tag => tag.commit === deployment.manifestCommitId);

yarn.lock

@@ -6011,10 +6011,10 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
   integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
 
-spektate@^0.1.19:
-  version "0.1.19"
-  resolved "https://registry.yarnpkg.com/spektate/-/spektate-0.1.19.tgz#5118d0a17761285fd5624bbd214665e0d9124772"
-  integrity sha512-gQqdZagNAc9ssFuXUpMI1JZZGCCKZSZKbGS2z6btqi6EsCtlKnl107pHdQcU0kpgXRlmWaZeKvqa6Rmb7HMiRw==
+spektate@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/spektate/-/spektate-1.0.0.tgz#91d841724a19c66bb4c3d82e58eb3cb0468b77b5"
+  integrity sha512-QY8Nd4LhN5bcOpEPoNPig+JLEi2/INyjtPLXZ/t7o92pOa3b3FWbc4XULvcITpA9hsR4XbxPSax6ErKX+xtDfg==
   dependencies:
     axios "^0.19.0"
     azure-storage "^2.10.3"