Introduce branch on repo targets

atomist · Dec 20, 2018 · 6b0705b · 6b0705b
1 parent 9287ab8
commit 6b0705b
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 29 deletions.
diff --git a/lib/internal/transport/websocket/WebSocketLifecycle.ts b/lib/internal/transport/websocket/WebSocketLifecycle.ts
@@ -70,9 +70,7 @@ export class WebSocketLifecycle {
             while (this.messages.length) {
                 queuedMessages.push(this.messages.pop());
             }
-            for (const queuedMessage of queuedMessages) {
-                await this.send(queuedMessage);
-            }
+            queuedMessages.forEach(this.send);
         }, 1000);
         this.timer.unref();
     }

diff --git a/lib/operations/common/params/AlwaysAskRepoParameters.ts b/lib/operations/common/params/AlwaysAskRepoParameters.ts
@@ -6,6 +6,7 @@ import { GitHubTargetsParams } from "./GitHubTargetsParams";
 import {
     GitBranchRegExp,
     GitHubNameRegExp,
+    GitShaRegExp,
 } from "./validationPatterns";
 
 /**
@@ -21,7 +22,10 @@ export class AlwaysAskRepoParameters extends GitHubTargetsParams {
     @Parameter({ description: "Name of repo to edit or regex", pattern: /.+/, required: true })
     public repo: string;
 
-    @Parameter({ description: "Branch or ref. Defaults to 'master'", ...GitBranchRegExp, required: false })
+    @Parameter({ description: "Ref", ...GitShaRegExp, required: false })
     public sha: string;
 
+    @Parameter({ description: "Branch Defaults to 'master'", ...GitBranchRegExp, required: false })
+    public branch: string = "master";
+
 }
diff --git a/lib/operations/common/params/GitHubFallbackReposParameters.ts b/lib/operations/common/params/GitHubFallbackReposParameters.ts
@@ -5,7 +5,10 @@ import {
 } from "../../../decorators";
 import { FallbackParams } from "./FallbackParams";
 import { GitHubTargetsParams } from "./GitHubTargetsParams";
-import { GitBranchRegExp } from "./validationPatterns";
+import {
+    GitBranchRegExp,
+    GitShaRegExp,
+} from "./validationPatterns";
 
 /**
  * Resolve from a Mapped parameter or from a supplied repos regex if no repo mapping
@@ -18,8 +21,11 @@ export class GitHubFallbackReposParameters extends GitHubTargetsParams implement
     @MappedParameter(MappedParameters.GitHubRepository, false)
     public repo: string;
 
-    @Parameter({ description: "Branch or ref. Defaults to 'master'", ...GitBranchRegExp, required: false })
-    public sha: string = "master";
+    @Parameter({ description: "Ref", ...GitShaRegExp, required: false })
+    public sha: string;
+
+    @Parameter({ description: "Branch Defaults to 'master'", ...GitBranchRegExp, required: false })
+    public branch: string = "master";
 
     @Parameter({ description: "regex", required: false })
     public repos: string = ".*";

diff --git a/lib/operations/common/params/GitHubTargetsParams.ts b/lib/operations/common/params/GitHubTargetsParams.ts
@@ -32,20 +32,16 @@ export abstract class GitHubTargetsParams extends TargetsParams {
         if (!this.owner || !this.repo || this.usesRegex) {
             return undefined;
         }
-        // sha is actually a ref (either sha or pointer)
-        const branch = isValidSHA1(this.sha) ? undefined : this.sha;
-        const sha = isValidSHA1(this.sha) ? this.sha : undefined;
-        return GitHubRepoRef.from({ owner: this.owner, repo: this.repo, sha, branch, rawApiBase: this.apiUrl });
+        return GitHubRepoRef.from({
+            owner: this.owner,
+            repo: this.repo,
+            sha: this.sha,
+            branch: this.branch,
+            rawApiBase: this.apiUrl,
+        });
     }
 
     @Secret(Secrets.userToken(["repo", "user:email", "read:user"]))
     private githubToken: string;
 
 }
-
-function isValidSHA1(s: string): boolean {
-    if (!s) {
-        return false;
-    }
-    return s.match(/[a-fA-F0-9]{40}/) != null;
-}
diff --git a/lib/operations/common/params/GitlabTargetsParams.ts b/lib/operations/common/params/GitlabTargetsParams.ts
@@ -9,7 +9,10 @@ import { GitlabPrivateTokenCredentials } from "../GitlabPrivateTokenCredentials"
 import { GitlabRepoRef } from "../GitlabRepoRef";
 import { ProjectOperationCredentials } from "../ProjectOperationCredentials";
 import { TargetsParams } from "./TargetsParams";
-import { GitBranchRegExp } from "./validationPatterns";
+import {
+    GitBranchRegExp,
+    GitShaRegExp,
+} from "./validationPatterns";
 
 @Parameters()
 export class GitlabTargetsParams extends TargetsParams {
@@ -26,12 +29,11 @@ export class GitlabTargetsParams extends TargetsParams {
     @MappedParameter(MappedParameters.GitHubUrl, false)
     public url: string;
 
-    @Parameter({
-        description: "Branch or ref. Defaults to 'master'",
-        ...GitBranchRegExp,
-        required: false,
-    })
-    public sha: string = "master";
+    @Parameter({ description: "Ref", ...GitShaRegExp, required: false })
+    public sha: string;
+
+    @Parameter({ description: "Branch Defaults to 'master'", ...GitBranchRegExp, required: false })
+    public branch: string = "master";
 
     @Parameter({ description: "regex", required: false })
     public repos: string = ".*";
@@ -62,6 +64,7 @@ export class GitlabTargetsParams extends TargetsParams {
                 owner: this.owner,
                 repo: this.repo,
                 sha: this.sha,
+                branch: this.branch,
                 rawApiBase: this.apiUrl,
                 gitlabRemoteUrl: this.url,
             }) :

diff --git a/lib/operations/common/params/MappedRepoParameters.ts b/lib/operations/common/params/MappedRepoParameters.ts
@@ -5,7 +5,10 @@ import {
     Parameters,
 } from "../../../decorators";
 import { GitHubTargetsParams } from "./GitHubTargetsParams";
-import { GitBranchRegExp } from "./validationPatterns";
+import {
+    GitBranchRegExp,
+    GitShaRegExp,
+} from "./validationPatterns";
 
 /**
  * Get target from channel mapping
@@ -19,7 +22,10 @@ export class MappedRepoParameters extends GitHubTargetsParams {
     @MappedParameter(MappedParameters.GitHubRepository)
     public repo: string;
 
-    @Parameter({ description: "Branch or ref. Defaults to 'master'", ...GitBranchRegExp, required: false })
+    @Parameter({ description: "Ref", ...GitShaRegExp, required: false })
     public sha: string;
 
+    @Parameter({ description: "Branch Defaults to 'master'", ...GitBranchRegExp, required: false })
+    public branch: string = "master";
+
 }
diff --git a/lib/operations/common/params/TargetsParams.ts b/lib/operations/common/params/TargetsParams.ts
@@ -23,6 +23,8 @@ export abstract class TargetsParams implements Credentialed, RemoteLocator {
 
     public abstract sha;
 
+    public abstract branch;
+
     public abstract credentials: ProjectOperationCredentials;
 
     get usesRegex() {

diff --git a/lib/operations/edit/editModes.ts b/lib/operations/edit/editModes.ts
@@ -104,8 +104,7 @@ export class PullRequest extends Commit {
                 public title: string,
                 public body: string = title,
                 public message: string = title,
-                // Make default to master for backwards-compatible reasons
-                public targetBranch: string = "master",
+                public targetBranch?: string,
                 public autoMerge?: AutoMerge) {
         super(branch, message, autoMerge);
     }