use azdo git uri

Author: bnookala

src/commands/hld/reconcile.test.ts

@@ -1,3 +1,4 @@
+import { when } from "jest-when";
 import { create as createBedrockYaml } from "../../lib/bedrockYaml";
 import { disableVerboseLogging, enableVerboseLogging } from "../../logger";
 
@@ -15,12 +16,17 @@ import {
   IReconcileDependencies,
   reconcileHld,
   testAndGetAbsPath,
+  tryGetGitOrigin,
   validateInputs
 } from "./reconcile";
 import * as reconcile from "./reconcile";
 
+import { getAzdoOriginUrl, getOriginUrl } from "../../lib/gitutils";
+
 import { IBedrockFile, IBedrockServiceConfig } from "../../types";
 
+jest.mock("../../lib/gitutils");
+
 beforeAll(() => {
   enableVerboseLogging();
 });
@@ -98,6 +104,31 @@ describe("checkForFabrikate", () => {
   });
 });
 
+describe("tryGetGitOrigin", () => {
+  it("attempts to retrieve azdo git origin", async () => {
+    const originUrl = "http://github.com/repo/url";
+
+    (getAzdoOriginUrl as jest.Mock).mockReturnValue(originUrl);
+
+    const originUrlResponse = await tryGetGitOrigin();
+    expect(originUrlResponse).toEqual(originUrl);
+    expect(getAzdoOriginUrl).toHaveBeenCalledTimes(1);
+  });
+
+  it("attempts to retrieve git origin from using git cli", async () => {
+    const originUrl = "http://github.com/repo/url";
+    (getAzdoOriginUrl as jest.Mock).mockRejectedValue("some reason");
+
+    (getOriginUrl as jest.Mock).mockReturnValue(originUrl);
+
+    const originUrlResponse = await tryGetGitOrigin();
+
+    expect(originUrlResponse).toEqual(originUrl);
+    expect(getAzdoOriginUrl).toHaveBeenCalledTimes(1);
+    expect(getOriginUrl).toHaveBeenCalledTimes(1);
+  });
+});
+
 describe("testAndGetAbsPath", () => {
   it("fails to test and get an absolute path for a file", () => {
     const test = jest.fn();

src/commands/hld/reconcile.ts

@@ -5,12 +5,11 @@ import yaml from "js-yaml";
 import path from "path";
 import process from "process";
 import shelljs, { TestOptions } from "shelljs";
-import url from "url";
 import { Bedrock } from "../../config";
 import { assertIsStringWithContent } from "../../lib/assertions";
 import { build as buildCmd, exit as exitCmd } from "../../lib/commandBuilder";
 import { generateAccessYaml } from "../../lib/fileutils";
-import { getOriginUrl } from "../../lib/gitutils";
+import { getAzdoOriginUrl, getOriginUrl } from "../../lib/gitutils";
 import { TraefikIngressRoute } from "../../lib/traefik/ingress-route";
 import {
   ITraefikMiddleware,
@@ -170,7 +169,7 @@ export const execute = async (
       createStaticComponent,
       exec: execAndLog,
       generateAccessYaml,
-      getGitOrigin: getOriginUrl,
+      getGitOrigin: tryGetGitOrigin,
       test: shelljs.test,
       writeFile: writeFileSync
     };
@@ -211,6 +210,17 @@ export const commandDecorator = (command: commander.Command) => {
   );
 };
 
+export const tryGetGitOrigin = async (
+  absRepoPath?: string
+): Promise<string> => {
+  return getAzdoOriginUrl().catch(_ => {
+    logger.warn(
+      "Could not get Git Origin for Azure DevOps - are you running 'spk' _not_ in a pipeline?"
+    );
+    return getOriginUrl(absRepoPath);
+  });
+};
+
 export const reconcileHld = async (
   dependencies: IReconcileDependencies,
   bedrockYaml: IBedrockFile,
@@ -231,7 +241,7 @@ export const reconcileHld = async (
   // Repository in HLD ie /path/to/hld/repositoryName/
   const absRepositoryInHldPath = path.join(absHldPath, repositoryName);
 
-  // Create access.yaml containing the bedrock application repo's URL in access.yaml.
+  // Create access.yaml containing the bedrock application repo's URL in
   await dependencies.createAccessYaml(
     dependencies.getGitOrigin,
     dependencies.generateAccessYaml,

src/lib/gitutils.test.ts

@@ -3,6 +3,7 @@ import {
   checkoutBranch,
   commitPath,
   deleteBranch,
+  getAzdoOriginUrl,
   getCurrentBranch,
   getOriginUrl,
   getPullRequestLink,
@@ -229,7 +230,7 @@ describe("getOriginUrl", () => {
     );
   });
 
-  it("should call exec with the proper git arguments", async () => {
+  it("should call exec with the proper git arguments with a repo path", async () => {
     const originUrl = "foo";
     const repoPath = "/repo/path";
 
@@ -266,6 +267,37 @@ describe("getOriginUrl", () => {
   });
 });
 
+describe("getAzdoOriginUrl", () => {
+  it("should call exec with the proper git arguments", async () => {
+    const originUrl = "foo";
+
+    when(exec as jest.Mock)
+      .calledWith("echo", ["$(Build.Repository.Uri)"])
+      .mockReturnValue(originUrl);
+
+    const originUrlResponse = await getAzdoOriginUrl();
+
+    expect(originUrlResponse).toEqual(originUrl);
+    expect(exec).toHaveBeenCalledTimes(1);
+    expect(exec).toHaveBeenCalledWith("echo", ["$(Build.Repository.Uri)"]);
+  });
+
+  it("should return an error when exec throws an error", async () => {
+    (exec as jest.Mock).mockImplementation(() => {
+      throw new Error("sample error.");
+    });
+
+    let error: Error | undefined;
+    try {
+      await getAzdoOriginUrl();
+    } catch (_) {
+      error = _;
+    }
+
+    expect(error).not.toBeUndefined();
+  });
+});
+
 describe("getRepositoryName", () => {
   it("returns the repository name for a visualstudio.com HTTPS origin url.", async () => {
     const originUrl =

src/lib/gitutils.ts

@@ -127,8 +127,20 @@ export const getOriginUrl = async (
     const safeLoggingUrl = safeGitUrlForLogging(originUrl);
     logger.debug(`Got git origin url ${safeLoggingUrl}`);
     return originUrl;
-  } catch (_) {
-    throw Error(`Unable to get git origin URL.: ` + _);
+  } catch (error) {
+    throw Error(`Unable to get git origin URL: ${error}`);
+  }
+};
+
+export const getAzdoOriginUrl = async (): Promise<string> => {
+  try {
+    const originUrl = await exec("echo", ["$(Build.Repository.Uri)"]);
+
+    const safeLoggingUrl = safeGitUrlForLogging(originUrl);
+    logger.debug(`Got azdo git origin url ${safeLoggingUrl}`);
+    return originUrl;
+  } catch (error) {
+    throw Error(`Unable to get azdo origin URL: ${error}`);
   }
 };