allow for gerrit trigger plugin attr

jgramoll · Jul 31, 2019 · 6f8a8d1 · 6f8a8d1
1 parent 9588a33
commit 6f8a8d1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/client/job_config_test.go b/client/job_config_test.go
@@ -82,7 +82,8 @@ func TestJobConfigSerialize(t *testing.T) {
 	<properties>
 		<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty id="trigger-id">
 			<triggers>
-				<com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
+				<com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger plugin="gerrit-trigger@2.29.0">
+					<spec></spec>
 					<gerritProjects>
 						<com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
 							<compareType>PLAIN</compareType>

diff --git a/client/job_gerrit_trigger.go b/client/job_gerrit_trigger.go
@@ -14,8 +14,9 @@ var ErrJobGerritTriggerEventNotFound = errors.New("Could not find job gerrit tri
 type JobGerritTrigger struct {
 	XMLName xml.Name `xml:"com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger"`
 	Id      string   `xml:"id,attr,omitempty"`
+	Plugin  string   `xml:"plugin,attr,omitempty"`
 
-	// spec
+	Spec                  string                    `xml:"spec"`
 	Projects              *JobGerritTriggerProjects `xml:"gerritProjects"`
 	dynamicGerritProjects *DynamicGerritProjects    `xml:"dynamicGerritProjects"`
 	SkipVote              *JobGerritTriggerSkipVote `xml:"skipVote"`

diff --git a/provider/job_gerrit_trigger.go b/provider/job_gerrit_trigger.go
@@ -6,6 +6,7 @@ import (
 )
 
 type jobGerritTrigger struct {
+	Plugin                     string       `mapstructure:"plugin"`
 	ServerName                 string       `mapstructure:"server_name"`
 	SilentMode                 bool         `mapstructure:"silent_mode"`
 	SilentStartMode            bool         `mapstructure:"silent_start_mode"`
@@ -31,6 +32,7 @@ func newJobGerritTrigger() *jobGerritTrigger {
 func (t *jobGerritTrigger) fromClientJobTrigger(clientTriggerInterface client.JobTrigger) jobTrigger {
 	clientTrigger := clientTriggerInterface.(*client.JobGerritTrigger)
 	trigger := newJobGerritTrigger()
+	trigger.Plugin = clientTrigger.Plugin
 	trigger.ServerName = clientTrigger.ServerName
 	trigger.SilentMode = clientTrigger.SilentMode
 	trigger.SilentStartMode = clientTrigger.SilentStartMode
@@ -46,6 +48,7 @@ func (t *jobGerritTrigger) fromClientJobTrigger(clientTriggerInterface client.Jo
 func (t *jobGerritTrigger) toClientJobTrigger(id string) (client.JobTrigger, error) {
 	clientTrigger := client.NewJobGerritTrigger()
 	clientTrigger.Id = id
+	clientTrigger.Plugin = t.Plugin
 	clientTrigger.ServerName = t.ServerName
 	clientTrigger.SilentMode = t.SilentMode
 	clientTrigger.SilentStartMode = t.SilentStartMode
@@ -83,6 +86,9 @@ func (t *jobGerritTrigger) parseParameterMode(clientTrigger *client.JobGerritTri
 }
 
 func (t *jobGerritTrigger) setResourceData(d *schema.ResourceData) error {
+	if err := d.Set("plugin", t.Plugin); err != nil {
+		return err
+	}
 	if err := d.Set("server_name", t.ServerName); err != nil {
 		return err
 	}

diff --git a/provider/job_gerrit_trigger_resource.go b/provider/job_gerrit_trigger_resource.go
@@ -29,6 +29,11 @@ func jobGerritTriggerResource() *schema.Resource {
 				Required:    true,
 				ForceNew:    true,
 			},
+			"plugin": &schema.Schema{
+				Type:        schema.TypeString,
+				Description: "Version of the job trigger",
+				Optional:    true,
+			},
 			"server_name": &schema.Schema{
 				Type:        schema.TypeString,
 				Description: "Id of the job trigger property",

diff --git a/provider/job_gerrit_trigger_test.go b/provider/job_gerrit_trigger_test.go
@@ -32,8 +32,10 @@ func TestAccJobGerritTriggerBasic(t *testing.T) {
 			{
 				Config: testAccJobGerritTriggerConfigServerName(jobName, serverName, 2),
 				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(trigger1, "plugin", "my-plugin"),
 					resource.TestCheckResourceAttr(trigger1, "server_name", serverName),
 					resource.TestCheckResourceAttr(trigger1, "silent_mode", "false"),
+					resource.TestCheckResourceAttr(trigger2, "plugin", "my-plugin"),
 					resource.TestCheckResourceAttr(trigger2, "server_name", serverName),
 					resource.TestCheckResourceAttr(trigger2, "silent_mode", "false"),
 					testAccCheckJobExists(jobResourceName, &jobRef),
@@ -46,8 +48,10 @@ func TestAccJobGerritTriggerBasic(t *testing.T) {
 			{
 				Config: testAccJobGerritTriggerConfigServerName(jobName, newServerName, 2),
 				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(trigger1, "plugin", "my-plugin"),
 					resource.TestCheckResourceAttr(trigger1, "server_name", newServerName),
 					resource.TestCheckResourceAttr(trigger1, "silent_mode", "false"),
+					resource.TestCheckResourceAttr(trigger2, "plugin", "my-plugin"),
 					resource.TestCheckResourceAttr(trigger2, "server_name", newServerName),
 					resource.TestCheckResourceAttr(trigger2, "silent_mode", "false"),
 					testAccCheckJobExists(jobResourceName, &jobRef),
@@ -60,6 +64,7 @@ func TestAccJobGerritTriggerBasic(t *testing.T) {
 			{
 				Config: testAccJobGerritTriggerConfigServerName(jobName, serverName, 1),
 				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(trigger1, "plugin", "my-plugin"),
 					resource.TestCheckResourceAttr(trigger1, "server_name", serverName),
 					resource.TestCheckResourceAttr(trigger1, "silent_mode", "false"),
 					testAccCheckJobExists(jobResourceName, &jobRef),
@@ -90,6 +95,7 @@ func testAccJobGerritTriggerConfigServerName(jobName string, serverName string,
 resource "jenkins_job_gerrit_trigger" "trigger_%v" {
 	property = "${jenkins_job_pipeline_triggers_property.prop_1.id}"
 
+	plugin = "my-plugin"
 	server_name = "%v"
 	skip_vote {}
 }`, i, serverName)