Merge pull request #13389 from gabemontero/new-webhooks

Merged by openshift-bot

Author: OpenShift Bot

api/protobuf-spec/github_com_openshift_origin_pkg_build_api_v1.proto

@@ -23225,6 +23225,14 @@
      "imageChange": {
       "$ref": "v1.ImageChangeTrigger",
       "description": "imageChange contains parameters for an ImageChange type of trigger"
+     },
+     "gitlab": {
+      "$ref": "v1.WebHookTrigger",
+      "description": "GitLabWebHook contains the parameters for a GitLab webhook type of trigger"
+     },
+     "bitbucket": {
+      "$ref": "v1.WebHookTrigger",
+      "description": "BitbucketWebHook contains the parameters for a Bitbucket webhook type of trigger"
      }
     }
    },
@@ -24137,6 +24145,14 @@
      "imageChangeBuild": {
       "$ref": "v1.ImageChangeCause",
       "description": "imageChangeBuild stores information about an imagechange event that triggered a new build."
+     },
+     "gitlabWebHook": {
+      "$ref": "v1.GitLabWebHookCause",
+      "description": "GitLabWebHook represents data for a GitLab webhook that fired a specific build."
+     },
+     "bitbucketWebHook": {
+      "$ref": "v1.BitbucketWebHookCause",
+      "description": "BitbucketWebHook represents data for a Bitbucket webhook that fired a specific build."
      }
     }
    },
@@ -24182,6 +24198,34 @@
      }
     }
    },
+   "v1.GitLabWebHookCause": {
+    "id": "v1.GitLabWebHookCause",
+    "description": "GitLabWebHookCause has information about a GitLab webhook that triggered a build.",
+    "properties": {
+     "revision": {
+      "$ref": "v1.SourceRevision",
+      "description": "Revision is the git source revision information of the trigger."
+     },
+     "secret": {
+      "type": "string",
+      "description": "Secret is the obfuscated webhook secret that triggered a build."
+     }
+    }
+   },
+   "v1.BitbucketWebHookCause": {
+    "id": "v1.BitbucketWebHookCause",
+    "description": "BitbucketWebHookCause has information about a Bitbucket webhook that triggered a build.",
+    "properties": {
+     "revision": {
+      "$ref": "v1.SourceRevision",
+      "description": "Revision is the git source revision information of the trigger."
+     },
+     "secret": {
+      "type": "string",
+      "description": "Secret is the obfuscated webhook secret that triggered a build."
+     }
+    }
+   },
    "v1.DockerStrategyOptions": {
     "id": "v1.DockerStrategyOptions",
     "description": "DockerStrategyOptions contains extra strategy options for Docker builds",

api/swagger-spec/oapi-v1.json

@@ -67844,6 +67844,19 @@
      }
     }
    },
+   "v1.BitbucketWebHookCause": {
+    "description": "BitbucketWebHookCause has information about a Bitbucket webhook that triggered a build.",
+    "properties": {
+     "revision": {
+      "description": "Revision is the git source revision information of the trigger.",
+      "$ref": "#/definitions/v1.SourceRevision"
+     },
+     "secret": {
+      "description": "Secret is the obfuscated webhook secret that triggered a build.",
+      "type": "string"
+     }
+    }
+   },
    "v1.Build": {
     "description": "Build encapsulates the inputs needed to produce a new deployable image, as well as the status of the execution and a reference to the Pod which executed the build.",
     "properties": {
@@ -68342,6 +68355,10 @@
    "v1.BuildTriggerCause": {
     "description": "BuildTriggerCause holds information about a triggered build. It is used for displaying build trigger data for each build and build configuration in oc describe. It is also used to describe which triggers led to the most recent update in the build configuration.",
     "properties": {
+     "bitbucketWebHook": {
+      "description": "BitbucketWebHook represents data for a Bitbucket webhook that fired a specific build.",
+      "$ref": "#/definitions/v1.BitbucketWebHookCause"
+     },
      "genericWebHook": {
       "description": "genericWebHook holds data about a builds generic webhook trigger.",
       "$ref": "#/definitions/v1.GenericWebHookCause"
@@ -68350,6 +68367,10 @@
       "description": "gitHubWebHook represents data for a GitHub webhook that fired a specific build.",
       "$ref": "#/definitions/v1.GitHubWebHookCause"
      },
+     "gitlabWebHook": {
+      "description": "GitLabWebHook represents data for a GitLab webhook that fired a specific build.",
+      "$ref": "#/definitions/v1.GitLabWebHookCause"
+     },
      "imageChangeBuild": {
       "description": "imageChangeBuild stores information about an imagechange event that triggered a new build.",
       "$ref": "#/definitions/v1.ImageChangeCause"
@@ -68366,6 +68387,10 @@
      "type"
     ],
     "properties": {
+     "bitbucket": {
+      "description": "BitbucketWebHook contains the parameters for a Bitbucket webhook type of trigger",
+      "$ref": "#/definitions/v1.WebHookTrigger"
+     },
      "generic": {
       "description": "generic contains the parameters for a Generic webhook type of trigger",
       "$ref": "#/definitions/v1.WebHookTrigger"
@@ -68374,6 +68399,10 @@
       "description": "github contains the parameters for a GitHub webhook type of trigger",
       "$ref": "#/definitions/v1.WebHookTrigger"
      },
+     "gitlab": {
+      "description": "GitLabWebHook contains the parameters for a GitLab webhook type of trigger",
+      "$ref": "#/definitions/v1.WebHookTrigger"
+     },
      "imageChange": {
       "description": "imageChange contains parameters for an ImageChange type of trigger",
       "$ref": "#/definitions/v1.ImageChangeTrigger"
@@ -70637,6 +70666,19 @@
      }
     }
    },
+   "v1.GitLabWebHookCause": {
+    "description": "GitLabWebHookCause has information about a GitLab webhook that triggered a build.",
+    "properties": {
+     "revision": {
+      "description": "Revision is the git source revision information of the trigger.",
+      "$ref": "#/definitions/v1.SourceRevision"
+     },
+     "secret": {
+      "description": "Secret is the obfuscated webhook secret that triggered a build.",
+      "type": "string"
+     }
+    }
+   },
    "v1.GitRepoVolumeSource": {
     "description": "Represents a volume that is populated with the contents of a git repository. Git repo volumes do not support ownership management. Git repo volumes support SELinux relabeling.",
     "required": [

api/swagger-spec/openshift-openapi-spec.json

@@ -15403,10 +15403,14 @@ _oc_set_triggers()
     flags_with_completion+=("-f")
     flags_completion+=("__handle_filename_extension_flag yaml|yml|json")
     local_nonpersistent_flags+=("--filename=")
+    flags+=("--from-bitbucket")
+    local_nonpersistent_flags+=("--from-bitbucket")
     flags+=("--from-config")
     local_nonpersistent_flags+=("--from-config")
     flags+=("--from-github")
     local_nonpersistent_flags+=("--from-github")
+    flags+=("--from-gitlab")
+    local_nonpersistent_flags+=("--from-gitlab")
     flags+=("--from-image=")
     local_nonpersistent_flags+=("--from-image=")
     flags+=("--from-webhook")

contrib/completions/bash/oc

@@ -20759,10 +20759,14 @@ _openshift_cli_set_triggers()
     flags_with_completion+=("-f")
     flags_completion+=("__handle_filename_extension_flag yaml|yml|json")
     local_nonpersistent_flags+=("--filename=")
+    flags+=("--from-bitbucket")
+    local_nonpersistent_flags+=("--from-bitbucket")
     flags+=("--from-config")
     local_nonpersistent_flags+=("--from-config")
     flags+=("--from-github")
     local_nonpersistent_flags+=("--from-github")
+    flags+=("--from-gitlab")
+    local_nonpersistent_flags+=("--from-gitlab")
     flags+=("--from-image=")
     local_nonpersistent_flags+=("--from-image=")
     flags+=("--from-webhook")

contrib/completions/bash/openshift

@@ -15551,10 +15551,14 @@ _oc_set_triggers()
     flags_with_completion+=("-f")
     flags_completion+=("__handle_filename_extension_flag yaml|yml|json")
     local_nonpersistent_flags+=("--filename=")
+    flags+=("--from-bitbucket")
+    local_nonpersistent_flags+=("--from-bitbucket")
     flags+=("--from-config")
     local_nonpersistent_flags+=("--from-config")
     flags+=("--from-github")
     local_nonpersistent_flags+=("--from-github")
+    flags+=("--from-gitlab")
+    local_nonpersistent_flags+=("--from-gitlab")
     flags+=("--from-image=")
     local_nonpersistent_flags+=("--from-image=")
     flags+=("--from-webhook")

contrib/completions/zsh/oc

@@ -20907,10 +20907,14 @@ _openshift_cli_set_triggers()
     flags_with_completion+=("-f")
     flags_completion+=("__handle_filename_extension_flag yaml|yml|json")
     local_nonpersistent_flags+=("--filename=")
+    flags+=("--from-bitbucket")
+    local_nonpersistent_flags+=("--from-bitbucket")
     flags+=("--from-config")
     local_nonpersistent_flags+=("--from-config")
     flags+=("--from-github")
     local_nonpersistent_flags+=("--from-github")
+    flags+=("--from-gitlab")
+    local_nonpersistent_flags+=("--from-gitlab")
     flags+=("--from-image=")
     local_nonpersistent_flags+=("--from-image=")
     flags+=("--from-webhook")

contrib/completions/zsh/openshift

@@ -132,11 +132,13 @@ type CommonSpec struct {
 }
 
 const (
-	BuildTriggerCauseManualMsg  = "Manually triggered"
-	BuildTriggerCauseConfigMsg  = "Build configuration change"
-	BuildTriggerCauseImageMsg   = "Image change"
-	BuildTriggerCauseGithubMsg  = "GitHub WebHook"
-	BuildTriggerCauseGenericMsg = "Generic WebHook"
+	BuildTriggerCauseManualMsg    = "Manually triggered"
+	BuildTriggerCauseConfigMsg    = "Build configuration change"
+	BuildTriggerCauseImageMsg     = "Image change"
+	BuildTriggerCauseGithubMsg    = "GitHub WebHook"
+	BuildTriggerCauseGenericMsg   = "Generic WebHook"
+	BuildTriggerCauseGitLabMsg    = "GitLab WebHook"
+	BuildTriggerCauseBitbucketMsg = "Bitbucket WebHook"
 )
 
 // BuildTriggerCause holds information about a triggered build. It is used for
@@ -159,6 +161,14 @@ type BuildTriggerCause struct {
 	// ImageChangeBuild stores information about an imagechange event that
 	// triggered a new build.
 	ImageChangeBuild *ImageChangeCause
+
+	// GitLabWebHook represents data for a GitLab webhook that fired a specific
+	// build.
+	GitLabWebHook *GitLabWebHookCause
+
+	// BitbucketWebHook represents data for a Bitbucket webhook that fired a
+	// specific build.
+	BitbucketWebHook *BitbucketWebHookCause
 }
 
 // GenericWebHookCause holds information about a generic WebHook that
@@ -182,6 +192,29 @@ type GitHubWebHookCause struct {
 	Secret string
 }
 
+// CommonWebHookCause factors out the identical format of these webhook
+// causes into struct so we can share it in the specific causes;  it is too late for
+// GitHub and Generic but we can leverage this pattern with GitLab and Bitbucket.
+type CommonWebHookCause struct {
+	// Revision is the git source revision information of the trigger.
+	Revision *SourceRevision
+
+	// Secret is the obfuscated webhook secret that triggered a build.
+	Secret string
+}
+
+// GitLabWebHookCause has information about a GitLab webhook that triggered a
+// build.
+type GitLabWebHookCause struct {
+	CommonWebHookCause
+}
+
+// BitbucketWebHookCause has information about a Bitbucket webhook that triggered a
+// build.
+type BitbucketWebHookCause struct {
+	CommonWebHookCause
+}
+
 // ImageChangeCause contains information about the image that triggered a
 // build.
 type ImageChangeCause struct {
@@ -907,6 +940,13 @@ type BuildTriggerPolicy struct {
 
 	// ImageChange contains parameters for an ImageChange type of trigger
 	ImageChange *ImageChangeTrigger
+
+	// GitLabWebHook contains the parameters for a GitLab webhook type of trigger
+	GitLabWebHook *WebHookTrigger
+
+	// BitbucketWebHook contains the parameters for a Bitbucket webhook type of
+	// trigger
+	BitbucketWebHook *WebHookTrigger
 }
 
 // BuildTriggerType refers to a specific BuildTriggerPolicy implementation.
@@ -918,6 +958,8 @@ var KnownTriggerTypes = sets.NewString(
 	string(GenericWebHookBuildTriggerType),
 	string(ImageChangeBuildTriggerType),
 	string(ConfigChangeBuildTriggerType),
+	string(GitLabWebHookBuildTriggerType),
+	string(BitbucketWebHookBuildTriggerType),
 )
 
 const (
@@ -931,6 +973,14 @@ const (
 	GenericWebHookBuildTriggerType           BuildTriggerType = "Generic"
 	GenericWebHookBuildTriggerTypeDeprecated BuildTriggerType = "generic"
 
+	// GitLabWebHookBuildTriggerType represents a trigger that launches builds on
+	// GitLab webhook invocations
+	GitLabWebHookBuildTriggerType BuildTriggerType = "GitLab"
+
+	// BitbucketWebHookBuildTriggerType represents a trigger that launches builds on
+	// Bitbucket webhook invocations
+	BitbucketWebHookBuildTriggerType BuildTriggerType = "Bitbucket"
+
 	// ImageChangeBuildTriggerType represents a trigger that launches builds on
 	// availability of a new version of an image
 	ImageChangeBuildTriggerType           BuildTriggerType = "ImageChange"