Bitbucket Cloud: Change platform indicator from DANGER_BITBUCKETCLOUD…

…_UUID to DANGER_BITBUCKETCLOUD_OAUTH_KEY OR DANGER_BITBUCKETCLOUD_USERNAME
danger · Dec 6, 2019 · b639246 · b639246
1 parent 8368d7e
commit b639246
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/source/ci_source/ci_source_helpers.ts b/source/ci_source/ci_source_helpers.ts
@@ -45,7 +45,7 @@ export async function getPullRequestIDForBranch(metadata: RepoMetaData, env: Env
     }
     return 0
   }
-  if (process.env["DANGER_BITBUCKETCLOUD_UUID"]) {
+  if (process.env["DANGER_BITBUCKETCLOUD_OAUTH_KEY"] || process.env["DANGER_BITBUCKETCLOUD_USERNAME"]) {
     const api = new BitBucketCloudAPI(metadata, bitbucketCloudCredentialsFromEnv(env))
     const prs = await api.getPullRequestsFromBranch(branch)
     if (prs.length) {

diff --git a/source/commands/danger-pr.ts b/source/commands/danger-pr.ts
@@ -40,12 +40,13 @@ program
     if (
       !process.env["DANGER_GITHUB_API_TOKEN"] &&
       !process.env["DANGER_BITBUCKETSERVER_HOST"] &&
-      !process.env["DANGER_BITBUCKETCLOUD_UUID"] &&
+      !process.env["DANGER_BITBUCKETCLOUD_OAUTH_KEY"] &&
+      !process.env["DANGER_BITBUCKETCLOUD_USERNAME"] &&
       !gitLabApiCredentials.token
     ) {
       log("")
       log(
-        "     You don't have a DANGER_GITHUB_API_TOKEN/DANGER_GITLAB_API_TOKEN/DANGER_BITBUCKETCLOUD_UUID set up, this is optional, but TBH, you want to do this."
+        "     You don't have a DANGER_GITHUB_API_TOKEN/DANGER_GITLAB_API_TOKEN/DANGER_BITBUCKETCLOUD_OAUTH_KEY/DANGER_BITBUCKETCLOUD_USERNAME set up, this is optional, but TBH, you want to do this."
       )
       log("     Check out: http://danger.systems/js/guides/the_dangerfile.html#working-on-your-dangerfile")
       log("")

diff --git a/source/platforms/platform.ts b/source/platforms/platform.ts
@@ -115,7 +115,11 @@ export function getPlatformForEnv(env: Env, source: CISource): Platform {
   }
 
   // Bitbucket Cloud
-  if (env["DANGER_BITBUCKETCLOUD_UUID"] || env["DANGER_PR_PLATFORM"] === BitBucketCloud.name) {
+  if (
+    env["DANGER_BITBUCKETCLOUD_OAUTH_KEY"] ||
+    env["DANGER_BITBUCKETCLOUD_USERNAME"] ||
+    env["DANGER_PR_PLATFORM"] === BitBucketCloud.name
+  ) {
     const api = new BitBucketCloudAPI(
       {
         pullRequestID: source.pullRequestID,

diff --git a/source/runner/Executor.ts b/source/runner/Executor.ts
@@ -294,7 +294,7 @@ export class Executor {
         let comment
         if (process.env["DANGER_BITBUCKETSERVER_HOST"]) {
           comment = bitbucketServerTemplate(dangerID, mergedResults, commitID)
-        } else if (process.env["DANGER_BITBUCKETCLOUD_UUID"]) {
+        } else if (process.env["DANGER_BITBUCKETCLOUD_OAUTH_KEY"] || process.env["DANGER_BITBUCKETCLOUD_USERNAME"]) {
           comment = bitbucketCloudTemplate(dangerID, mergedResults, commitID)
         } else {
           comment = githubResultsTemplate(dangerID, mergedResults, commitID)
@@ -414,7 +414,7 @@ export class Executor {
     let comment
     if (process.env["DANGER_BITBUCKETSERVER_HOST"]) {
       comment = bitbucketServerInlineTemplate(this.options.dangerID, results, inlineResults.file, inlineResults.line)
-    } else if (process.env["DANGER_BITBUCKETCLOUD_UUID"]) {
+    } else if (process.env["DANGER_BITBUCKETCLOUD_OAUTH_KEY"] || process.env["DANGER_BITBUCKETCLOUD_USERNAME"]) {
       comment = bitbucketCloudInlineTemplate(this.options.dangerID, results, inlineResults.file, inlineResults.line)
     } else {
       comment = githubResultsInlineTemplate(this.options.dangerID, results, inlineResults.file, inlineResults.line)
@@ -445,7 +445,7 @@ const messageForResults = (results: DangerResults) => {
   } else {
     if (process.env["DANGER_BITBUCKETSERVER_HOST"]) {
       return bitbucketMessageForResultWithIssues
-    } else if (process.env["DANGER_BITBUCKETCLOUD_UUID"]) {
+    } else if (process.env["DANGER_BITBUCKETCLOUD_OAUTH_KEY"] || process.env["DANGER_BITBUCKETCLOUD_USERNAME"]) {
       return bitbucketCloudMessageForResultWithIssues
     } else {
       return githubMessageForResultWithIssues

diff --git a/source/runner/jsonToDSL.ts b/source/runner/jsonToDSL.ts
@@ -43,7 +43,7 @@ export const jsonToDSL = async (dsl: DangerDSLJSONType, source: CISource): Promi
     git = await localPlatform.getPlatformGitRepresentation()
   } else if (process.env["DANGER_BITBUCKETSERVER_HOST"]) {
     git = bitBucketServerGitDSL(bitbucket_server!, dsl.git, api as BitBucketServerAPI)
-  } else if (process.env["DANGER_BITBUCKETCLOUD_UUID"]) {
+  } else if (process.env["DANGER_BITBUCKETCLOUD_OAUTH_KEY"] || process.env["DANGER_BITBUCKETCLOUD_USERNAME"]) {
     git = bitBucketCloudGitDSL(bitbucket_cloud!, dsl.git, api as BitBucketCloudAPI)
   } else if (process.env["DANGER_GITLAB_API_TOKEN"]) {
     git = gitLabGitDSL(gitlab!, dsl.git)
@@ -72,7 +72,7 @@ const apiForDSL = (dsl: DangerDSLJSONType): OctoKit | BitBucketServerAPI | GitLa
     return new BitBucketServerAPI(dsl.bitbucket_server!.metadata, bitbucketServerRepoCredentialsFromEnv(process.env))
   }
 
-  if (process.env["DANGER_BITBUCKETCLOUD_UUID"]) {
+  if (process.env["DANGER_BITBUCKETCLOUD_OAUTH_KEY"] || process.env["DANGER_BITBUCKETCLOUD_USERNAME"]) {
     return new BitBucketCloudAPI(dsl.bitbucket_cloud!.metadata, bitbucketCloudCredentialsFromEnv(process.env))
   }