Adding config to service create-pipeline (#97)

* Working service create-pipelines via config

* adding gitutil tests

Author: mtarng

src/commands/service/pipeline.test.ts

@@ -31,6 +31,7 @@ describe("create pipeline tests", () => {
       "wao",
       "amazing",
       "meow",
+      ".",
       exitFn
     );
 
@@ -49,6 +50,7 @@ describe("create pipeline tests", () => {
       "wao",
       "amazing",
       "meow",
+      ".",
       exitFn
     );
 
@@ -70,6 +72,7 @@ describe("create pipeline tests", () => {
       "wao",
       "amazing",
       "meow",
+      ".",
       exitFn
     );
 
@@ -90,6 +93,7 @@ describe("create pipeline tests", () => {
       "wao",
       "amazing",
       "meow",
+      ".",
       exitFn
     );
 

src/commands/service/pipeline.ts

@@ -1,13 +1,19 @@
-import commander = require("commander");
-import { logger } from "../../logger";
-
 import { IBuildApi } from "azure-devops-node-api/BuildApi";
+import commander = require("commander");
+import path from "path";
+import { Config } from "../../config";
+import {
+  getOriginUrl,
+  getRepositoryName,
+  getRepositoryUrl
+} from "../../lib/gitutils";
 import {
   createPipelineForDefinition,
   definitionForAzureRepoPipeline,
   getBuildApiClient,
   queueBuild
 } from "../../lib/pipelines/pipelines";
+import { logger } from "../../logger";
 
 import { BuildDefinition } from "azure-devops-node-api/interfaces/BuildInterfaces";
 
@@ -30,18 +36,32 @@ export const createPipelineCommandDecorator = (
     .option("-r, --repo-name <repo-name>", "Repository Name in Azure DevOps")
     .option("-u, --repo-url <repo-url>", "Repository URL")
     .option("-d, --devops-project <devops-project>", "Azure DevOps Project")
-    .option("-l, --project-path <project-path>", "Path to Bedrock Project")
+    .option(
+      "-l, --packages-dir <packages-dir>",
+      "The monorepository directory containing this service definition. ie. '--packages-dir packages' if my-service is located under ./packages/my-service."
+    )
     .action(async (serviceName, opts) => {
+      const gitOriginUrl = await getOriginUrl();
+
+      const { azure_devops } = Config();
       const {
-        pipelineName,
-        personalAccessToken,
-        orgName,
-        repoName,
-        repoUrl,
-        devopsProject,
-        projectPath
+        orgName = azure_devops && azure_devops.org,
+        personalAccessToken = azure_devops && azure_devops.access_token,
+        devopsProject = azure_devops && azure_devops.project,
+        pipelineName = serviceName + "-pipeline",
+        packagesDir = "./",
+        repoName = getRepositoryName(gitOriginUrl),
+        repoUrl = getRepositoryUrl(gitOriginUrl)
       } = opts;
 
+      logger.debug(`orgName: ${orgName}`);
+      logger.debug(`personalAccessToken: ${personalAccessToken}`);
+      logger.debug(`devopsProject: ${devopsProject}`);
+      logger.debug(`pipelineName: ${pipelineName}`);
+      logger.debug(`packagesDir: ${packagesDir}`);
+      logger.debug(`repoName: ${repoName}`);
+      logger.debug(`repoUrl: ${repoUrl}`);
+
       try {
         if (typeof pipelineName !== "string") {
           throw new Error(
@@ -79,9 +99,9 @@ export const createPipelineCommandDecorator = (
           );
         }
 
-        if (typeof projectPath !== "string") {
+        if (typeof packagesDir !== "string") {
           throw new Error(
-            `--project-path projectPath must be of type 'string', ${typeof projectPath} given.`
+            `--packages-dir must be of type 'string', ${typeof packagesDir} given.`
           );
         }
       } catch (err) {
@@ -99,6 +119,7 @@ export const createPipelineCommandDecorator = (
           repoName,
           repoUrl,
           devopsProject,
+          packagesDir,
           process.exit
         );
       } catch (err) {
@@ -118,7 +139,6 @@ export const createPipelineCommandDecorator = (
  * @param repoName
  * @param repoUrl
  * @param project
- * @param projectPath
  */
 export const installPipeline = async (
   serviceName: string,
@@ -128,6 +148,7 @@ export const installPipeline = async (
   repoName: string,
   repoUrl: string,
   project: string,
+  packagesDir: string,
   exitFn: (status: number) => void
 ) => {
   let devopsClient;
@@ -149,7 +170,7 @@ export const installPipeline = async (
     repositoryName: repoName,
     repositoryUrl: repoUrl,
     yamlFileBranch: "master",
-    yamlFilePath: `packages/${serviceName}/azure-pipelines.yaml`
+    yamlFilePath: path.join(packagesDir, serviceName, "azure-pipelines.yaml") // This may not work if we're using a non-mono repository and azure-pipelines.yaml is in the root directory.
   });
 
   try {

src/lib/gitutils.test.ts

@@ -6,6 +6,8 @@ import {
   getCurrentBranch,
   getOriginUrl,
   getPullRequestLink,
+  getRepositoryName,
+  getRepositoryUrl,
   pushBranch
 } from "../lib/gitutils";
 import { disableVerboseLogging, enableVerboseLogging, logger } from "../logger";
@@ -222,6 +224,96 @@ describe("getOriginUrl", () => {
   });
 });
 
+describe("getRepositoryName", () => {
+  it("returns the repository name for an AzDo HTTP origin url.", async () => {
+    const originUrl =
+      "https://[email protected]/myorg/spk-test-project/_git/new-repo";
+    const repositoryName = getRepositoryName(originUrl);
+
+    expect(repositoryName).toEqual(`new-repo`);
+  });
+
+  it("returns the repository name for an AzDo SSH origin url.", async () => {
+    const originUrl =
+      "[email protected]:v3/mitarng/spk-test-project/new-repo";
+    const repositoryName = getRepositoryName(originUrl);
+
+    expect(repositoryName).toEqual(`new-repo`);
+  });
+
+  it("returns the repository name for a GitHub HTTP origin url.", async () => {
+    const originUrl = "https://github.com/CatalystCode/spk.git";
+    const repositoryName = getRepositoryName(originUrl);
+
+    expect(repositoryName).toEqual(`spk`);
+  });
+
+  it("returns the repository name for a GitHub SSH origin url.", async () => {
+    const originUrl = "[email protected]:CatalystCode/spk.git";
+    const repositoryName = getRepositoryName(originUrl);
+
+    expect(repositoryName).toEqual(`spk`);
+  });
+
+  it("Returns a help message for unknown or unsupported git providers.", async () => {
+    const originUrl = "[email protected]:org/spk.git";
+    let threwError = false;
+    try {
+      getRepositoryName(originUrl);
+    } catch (e) {
+      threwError = true;
+    }
+    expect(threwError).toEqual(true);
+  });
+});
+
+describe("getRepositoryUrl", () => {
+  it("return a proper repo url for an AzDo HTTP origin url.", async () => {
+    const originUrl =
+      "https://[email protected]/myorg/spk-test-project/_git/new-repo";
+    const repositoryUrl = getRepositoryUrl(originUrl);
+
+    expect(repositoryUrl).toEqual(
+      `https://dev.azure.com/myorg/spk-test-project/_git/new-repo`
+    );
+  });
+
+  it("return a proper repo url for an AzDo SSH origin url.", async () => {
+    const originUrl =
+      "[email protected]:v3/mitarng/spk-test-project/new-repo";
+    const repositoryUrl = getRepositoryUrl(originUrl);
+
+    expect(repositoryUrl).toEqual(
+      `https://dev.azure.com/mitarng/spk-test-project/_git/new-repo`
+    );
+  });
+
+  it("return a proper repo url for a GitHub HTTP origin url.", async () => {
+    const originUrl = "https://github.com/CatalystCode/spk.git";
+    const repositoryUrl = getRepositoryUrl(originUrl);
+
+    expect(repositoryUrl).toEqual(`https://github.com/CatalystCode/spk`);
+  });
+
+  it("return a proper repo url for a GitHub SSH origin url.", async () => {
+    const originUrl = "[email protected]:CatalystCode/spk.git";
+    const repositoryUrl = getRepositoryUrl(originUrl);
+
+    expect(repositoryUrl).toEqual(`https://github.com/CatalystCode/spk`);
+  });
+
+  it("Returns a help message for unknown or unsupported git providers.", async () => {
+    const originUrl = "[email protected]:org/spk.git";
+    let threwError = false;
+    try {
+      getRepositoryUrl(originUrl);
+    } catch (e) {
+      threwError = true;
+    }
+    expect(threwError).toEqual(true);
+  });
+});
+
 describe("getPullRequestLink", () => {
   it("return a proper PR url for an AzDo HTTP origin url.", async () => {
     const originUrl =

src/lib/gitutils.ts

@@ -99,6 +99,46 @@ export const getOriginUrl = async (): Promise<string> => {
   }
 };
 
+/**
+ * Will return the name of the repository
+ * Currently only AzDo and Github are supported.
+ * @param originUrl
+ */
+export const getRepositoryName = (originUrl: string) => {
+  const gitComponents = GitUrlParse(originUrl);
+  if (gitComponents.resource.includes("dev.azure.com")) {
+    logger.debug("azure devops repo found.");
+    return gitComponents.name;
+  } else if (gitComponents.resource === "github.com") {
+    logger.debug("github repo found.");
+    return gitComponents.name;
+  } else {
+    throw Error(
+      "Could not determine origin repository, or it is not a supported type."
+    );
+  }
+};
+
+/**
+ * Will return the URL of the repository
+ * Currently only AzDo and Github are supported.
+ * @param originUrl
+ */
+export const getRepositoryUrl = (originUrl: string) => {
+  const gitComponents = GitUrlParse(originUrl);
+  if (gitComponents.resource.includes("dev.azure.com")) {
+    logger.debug("azure devops repo found.");
+    return `https://dev.azure.com/${gitComponents.organization}/${gitComponents.owner}/_git/${gitComponents.name}`;
+  } else if (gitComponents.resource === "github.com") {
+    logger.debug("github repo found.");
+    return `https://github.com/${gitComponents.organization}/${gitComponents.name}`;
+  } else {
+    throw Error(
+      "Could not determine origin repository, or it is not a supported type."
+    );
+  }
+};
+
 /**
  * Will create a link to create a PR for a given origin, base branch, and new branch.
  * Currently only AzDo and Github are supported.