add jira project property

ensure that job can serialize and deserialize without losing data

README.md

@@ -149,6 +149,10 @@ resource "jenkins_job_datadog_job_property" "main" {
   job = "${jenkins_job.main.id}"
 }
 
+resource "jenkins_job_jira_project_property" "main" {
+  job = "${jenkins_job.main.id}"
+}
+
 ```
 
 ## TODO

client/cps_scm_flow_definition.go

@@ -1,9 +1,10 @@
 package client
 
 type CpsScmFlowDefinition struct {
-	Class string `xml:"class,attr"`
+	Class  string `xml:"class,attr"`
+	Id     string `xml:"id,attr,omitempty"`
+	Plugin string `xml:"plugin,attr,omitempty"`
 
-	Id          string  `xml:"id,attr"`
 	SCM         *GitSCM `xml:"scm"`
 	ScriptPath  string  `xml:"scriptPath"`
 	Lightweight bool    `xml:"lightweight"`

client/cps_scm_flow_definition_test.go

@@ -12,7 +12,7 @@ func TestCpsScmFlowDefinitionSerialize(t *testing.T) {
 		t.Fatalf("failed to serialize xml %s", err)
 	}
 	result := string(resultBytes)
-	expected := `<CpsScmFlowDefinition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" id="">
+	expected := `<CpsScmFlowDefinition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition">
 	<scriptPath></scriptPath>
 	<lightweight>false</lightweight>
 </CpsScmFlowDefinition>`

client/git_scm.go

@@ -15,26 +15,27 @@ var ErrGitScmExtensionNotFound = errors.New("Could not find git scm extension")
 var ErrGitScmUserRemoteConfigNotFound = errors.New("Could not find git scm scm user remote config")
 
 type GitSCM struct {
-	XMLName           xml.Name              `xml:"scm"`
-	Class             string                `xml:"class,attr"`
+	XMLName xml.Name `xml:"scm"`
+	Class   string   `xml:"class,attr"`
+	Plugin  string   `xml:"plugin,attr,omitempty"`
+
 	ConfigVersion     string                `xml:"configVersion"`
 	UserRemoteConfigs *GitUserRemoteConfigs `xml:"userRemoteConfigs"`
 	Branches          *GitScmBranches       `xml:"branches"`
 
-	DoGenerateSubmoduleConfigurations bool `xml:"doGenerateSubmoduleConfigurations"`
-	// submoduleCfg
-	Extensions *GitScmExtensions `xml:"extensions"`
+	DoGenerateSubmoduleConfigurations bool                    `xml:"doGenerateSubmoduleConfigurations"`
+	SubmoduleCfg                      *GitScmSubmodulesConfig `xml:"submoduleCfg"`
+	Extensions                        *GitScmExtensions       `xml:"extensions"`
 }
 
 func NewGitScm() *GitSCM {
 	return &GitSCM{
-		Class:             "hudson.plugins.git.GitSCM",
-		UserRemoteConfigs: NewGitUserRemoteConfigs(),
-		Branches:          NewGitScmBranches(),
+		Class: "hudson.plugins.git.GitSCM",
 
+		UserRemoteConfigs:                 NewGitUserRemoteConfigs(),
+		Branches:                          NewGitScmBranches(),
 		DoGenerateSubmoduleConfigurations: false,
-
-		Extensions: NewGitScmExtensions(),
+		Extensions:                        NewGitScmExtensions(),
 	}
 }
 

client/git_scm_branch_spec.go

@@ -1,7 +1,8 @@
 package client
 
 type GitScmBranchSpec struct {
-	Id   string `xml:"id,attr"`
+	Id string `xml:"id,attr,omitempty"`
+
 	Name string `xml:"name"`
 }
 

client/git_scm_clean_before_checkout_extension.go

@@ -8,7 +8,7 @@ func init() {
 
 type GitScmCleanBeforeCheckoutExtension struct {
 	XMLName xml.Name `xml:"hudson.plugins.git.extensions.impl.CleanBeforeCheckout"`
-	Id      string   `xml:"id,attr"`
+	Id      string   `xml:"id,attr,omitempty"`
 }
 
 func NewGitScmCleanBeforeCheckoutExtension() *GitScmCleanBeforeCheckoutExtension {

client/git_scm_extensions.go

@@ -31,7 +31,7 @@ func (extensions *GitScmExtensions) Append(extension GitScmExtension) *GitScmExt
 func (extensions *GitScmExtensions) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 	var tok xml.Token
 	var err error
-	extensions.Items = &[]GitScmExtension{}
+	*extensions = *NewGitScmExtensions()
 	for tok, err = d.Token(); err == nil; tok, err = d.Token() {
 		if elem, ok := tok.(xml.StartElement); ok {
 			if unmarshalXML, ok := scmExtensionUnmarshalFunc[elem.Name.Local]; ok {

client/git_scm_submodules_config.go

@@ -0,0 +1,11 @@
+package client
+
+type GitScmSubmodulesConfig struct {
+	Class string `xml:"class,attr"`
+}
+
+func NewGitScmSubmodulesConfig() *GitScmSubmodulesConfig {
+	return &GitScmSubmodulesConfig{
+		Class: "list",
+	}
+}

client/job.go

@@ -14,6 +14,7 @@ var ErrJobActionNotFound = errors.New("Could not find job action")
 // Job
 type Job struct {
 	Id               string
+	Plugin           string
 	Name             string
 	Disabled         bool
 	Actions          *JobActions `xml:"actions"`
@@ -52,6 +53,7 @@ func newJobFromConfigAndDetails(config *jobConfig, details *jobDetails) *Job {
 
 	if config != nil {
 		job.Id = config.Id
+		job.Plugin = config.Plugin
 		job.Actions = config.Actions
 		job.Disabled = config.Disabled
 		job.Properties = config.Properties

client/job_actions.go

@@ -32,7 +32,7 @@ func (actions *JobActions) Append(action JobAction) *JobActions {
 func (actions *JobActions) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 	var tok xml.Token
 	var err error
-	actions.Items = &[]JobAction{}
+	*actions = *NewJobActions()
 	for tok, err = d.Token(); err == nil; tok, err = d.Token() {
 		if elem, ok := tok.(xml.StartElement); ok {
 			if unmarshalXML, ok := jobActionUnmarshalFunc[elem.Name.Local]; ok {

client/job_config.go

@@ -14,12 +14,14 @@ type jobConfig struct {
 	KeepDependencies bool              `xml:"keepDependencies"`
 	Properties       *JobProperties    `xml:"properties"`
 	Definition       *JobDefinitionXml `xml:"definition"`
-	Triggers         string            `xml:"trigger"`
+	Triggers         string            `xml:"triggers"`
 	Disabled         bool              `xml:"disabled"`
 }
 
 func JobConfigFromJob(job *Job) *jobConfig {
 	return &jobConfig{
+		Id:               job.Id,
+		Plugin:           job.Plugin,
 		Actions:          job.Actions,
 		Description:      job.Description,
 		KeepDependencies: job.KeepDependencies,

client/job_config_test.go

@@ -9,6 +9,7 @@ import (
 
 func TestJobConfigSerialize(t *testing.T) {
 	job := NewJob()
+	job.Plugin = "flow-plugin"
 	job.Description = "my-desc"
 	job.Actions = job.Actions.Append(NewJobDeclarativeJobAction())
 	job.Actions = job.Actions.Append(NewJobDeclarativeJobPropertyTrackerAction())
@@ -72,7 +73,7 @@ func TestJobConfigSerialize(t *testing.T) {
 		t.Fatalf("failed to serialize xml %s", err)
 	}
 	result := string(resultBytes)
-	expected := `<flow-definition>
+	expected := `<flow-definition plugin="flow-plugin">
 	<actions>
 		<org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobAction></org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobAction>
 		<org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction>
@@ -112,12 +113,21 @@ func TestJobConfigSerialize(t *testing.T) {
 						<onNotBuilt>false</onNotBuilt>
 					</skipVote>
 					<silentMode>false</silentMode>
+					<notificationLevel></notificationLevel>
 					<silentStartMode>false</silentStartMode>
 					<escapeQuotes>true</escapeQuotes>
 					<nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode>
+					<dependencyJobsNames></dependencyJobsNames>
 					<commitMessageParameterMode>BASE64</commitMessageParameterMode>
 					<changeSubjectParameterMode>PLAIN</changeSubjectParameterMode>
 					<commentTextParameterMode>BASE64</commentTextParameterMode>
+					<buildStartMessage></buildStartMessage>
+					<buildFailureMessage></buildFailureMessage>
+					<buildSuccessfulMessage></buildSuccessfulMessage>
+					<buildUnstableMessage></buildUnstableMessage>
+					<buildNotBuiltMessage></buildNotBuiltMessage>
+					<buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
+					<customUrl></customUrl>
 					<serverName>__ANY__</serverName>
 					<triggerOnEvents class="linked-list">
 						<com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
@@ -130,6 +140,8 @@ func TestJobConfigSerialize(t *testing.T) {
 						<com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginDraftPublishedEvent></com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginDraftPublishedEvent>
 					</triggerOnEvents>
 					<dynamicTriggerConfiguration>false</dynamicTriggerConfiguration>
+					<triggerConfigURL></triggerConfigURL>
+					<triggerInformationAction></triggerInformationAction>
 				</com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
 			</triggers>
 		</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
@@ -153,7 +165,7 @@ func TestJobConfigSerialize(t *testing.T) {
 				</hudson.plugins.git.UserRemoteConfig>
 			</userRemoteConfigs>
 			<branches>
-				<hudson.plugins.git.BranchSpec id="">
+				<hudson.plugins.git.BranchSpec>
 					<name>branchspec</name>
 				</hudson.plugins.git.BranchSpec>
 			</branches>
@@ -165,7 +177,7 @@ func TestJobConfigSerialize(t *testing.T) {
 		<scriptPath></scriptPath>
 		<lightweight>false</lightweight>
 	</definition>
-	<trigger></trigger>
+	<triggers></triggers>
 	<disabled>false</disabled>
 </flow-definition>`
 	if result != expected {

client/job_declarative_job_action.go

@@ -9,6 +9,7 @@ func init() {
 type JobDeclarativeJobAction struct {
 	XMLName xml.Name `xml:"org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobAction"`
 	Id      string   `xml:"id,attr,omitempty"`
+	Plugin  string   `xml:"plugin,attr,omitempty"`
 }
 
 func NewJobDeclarativeJobAction() *JobDeclarativeJobAction {

client/job_declarative_job_property_tracker_action.go

@@ -9,6 +9,7 @@ func init() {
 type JobDeclarativeJobPropertyTrackerAction struct {
 	XMLName xml.Name `xml:"org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction"`
 	Id      string   `xml:"id,attr,omitempty"`
+	Plugin  string   `xml:"plugin,attr,omitempty"`
 
 	JobProperties string `xml:"jobProperties"`
 	Triggers      string `xml:"triggers"`

client/job_gerrit_trigger.go

@@ -20,31 +20,31 @@ type JobGerritTrigger struct {
 	Id      string   `xml:"id,attr,omitempty"`
 	Plugin  string   `xml:"plugin,attr,omitempty"`
 
-	Spec                  string                    `xml:"spec"`
-	Projects              *JobGerritTriggerProjects `xml:"gerritProjects"`
-	DynamicGerritProjects *DynamicGerritProjects    `xml:"dynamicGerritProjects"`
-	SkipVote              *JobGerritTriggerSkipVote `xml:"skipVote"`
-	SilentMode            bool                      `xml:"silentMode"`
-	// notificationLevel
-	SilentStartMode           bool          `xml:"silentStartMode"`
-	EscapeQuotes              bool          `xml:"escapeQuotes"`
-	NameAndEmailParameterMode ParameterMode `xml:"nameAndEmailParameterMode"`
-	// dependencyJobsNames
-	CommitMessageParameterMode ParameterMode `xml:"commitMessageParameterMode"`
-	ChangeSubjectParameterMode ParameterMode `xml:"changeSubjectParameterMode"`
-	CommentTextParameterMode   ParameterMode `xml:"commentTextParameterMode"`
-	// buildStartMessage
-	// buildFailureMessage
-	// buildSuccessfulMessage
-	// buildUnstableMessage
-	// buildNotBuiltMessage
-	// buildUnsuccessfulFilepath
-	// customUrl
+	Spec                        string                    `xml:"spec"`
+	Projects                    *JobGerritTriggerProjects `xml:"gerritProjects"`
+	DynamicGerritProjects       *DynamicGerritProjects    `xml:"dynamicGerritProjects"`
+	SkipVote                    *JobGerritTriggerSkipVote `xml:"skipVote"`
+	SilentMode                  bool                      `xml:"silentMode"`
+	NotificationLevel           string                    `xml:"notificationLevel"`
+	SilentStartMode             bool                      `xml:"silentStartMode"`
+	EscapeQuotes                bool                      `xml:"escapeQuotes"`
+	NameAndEmailParameterMode   ParameterMode             `xml:"nameAndEmailParameterMode"`
+	DependencyJobsNames         string                    `xml:"dependencyJobsNames"`
+	CommitMessageParameterMode  ParameterMode             `xml:"commitMessageParameterMode"`
+	ChangeSubjectParameterMode  ParameterMode             `xml:"changeSubjectParameterMode"`
+	CommentTextParameterMode    ParameterMode             `xml:"commentTextParameterMode"`
+	BuildStartMessage           string                    `xml:"buildStartMessage"`
+	BuildFailureMessage         string                    `xml:"buildFailureMessage"`
+	BuildSuccessfulMessage      string                    `xml:"buildSuccessfulMessage"`
+	BuildUnstableMessage        string                    `xml:"buildUnstableMessage"`
+	BuildNotBuiltMessage        string                    `xml:"buildNotBuiltMessage"`
+	BuildUnsuccessfulFilepath   string                    `xml:"buildUnsuccessfulFilepath"`
+	CustomUrl                   string                    `xml:"customUrl"`
 	ServerName                  string                    `xml:"serverName"`
 	TriggerOnEvents             *JobGerritTriggerOnEvents `xml:"triggerOnEvents"`
 	DynamicTriggerConfiguration bool                      `xml:"dynamicTriggerConfiguration"`
-	// triggerConfigURL
-	// triggerInformationAction
+	TriggerConfigURL            string                    `xml:"triggerConfigURL"`
+	TriggerInformationAction    string                    `xml:"triggerInformationAction"`
 }
 
 func NewJobGerritTrigger() *JobGerritTrigger {

client/job_gerrit_trigger_on_events.go

@@ -7,15 +7,15 @@ type jobGerritTriggerOnEventsUnmarshaler func(*xml.Decoder, xml.StartElement) (J
 var jobGerritTriggerOnEventsUnmarshalFunc = map[string]jobGerritTriggerOnEventsUnmarshaler{}
 
 type JobGerritTriggerOnEvents struct {
-	XMLName    xml.Name `xml:"triggerOnEvents"`
-	LinkedList string   `xml:"class,attr"`
-	Items      *[]JobGerritTriggerOnEvent
+	XMLName xml.Name `xml:"triggerOnEvents"`
+	Class   string   `xml:"class,attr"`
+	Items   *[]JobGerritTriggerOnEvent
 }
 
 func NewJobGerritTriggerOnEvents() *JobGerritTriggerOnEvents {
 	return &JobGerritTriggerOnEvents{
-		LinkedList: "linked-list",
-		Items:      &[]JobGerritTriggerOnEvent{},
+		Class: "linked-list",
+		Items: &[]JobGerritTriggerOnEvent{},
 	}
 }
 
@@ -32,7 +32,7 @@ func (events *JobGerritTriggerOnEvents) Append(event JobGerritTriggerOnEvent) *J
 func (events *JobGerritTriggerOnEvents) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 	var tok xml.Token
 	var err error
-	events.Items = &[]JobGerritTriggerOnEvent{}
+	*events = *NewJobGerritTriggerOnEvents()
 	for tok, err = d.Token(); err == nil; tok, err = d.Token() {
 		if elem, ok := tok.(xml.StartElement); ok {
 			if unmarshalXML, ok := jobGerritTriggerOnEventsUnmarshalFunc[elem.Name.Local]; ok {

client/job_jira_project_property.go

@@ -0,0 +1,32 @@
+package client
+
+import (
+	"encoding/xml"
+)
+
+func init() {
+	propertyUnmarshalFunc["hudson.plugins.jira.JiraProjectProperty"] = unmarshalJobJiraProjectProperty
+}
+
+type JobJiraProjectProperty struct {
+	XMLName xml.Name `xml:"hudson.plugins.jira.JiraProjectProperty"`
+	Id      string   `xml:"id,attr,omitempty"`
+	Plugin  string   `xml:"plugin,attr,omitempty"`
+}
+
+func NewJobJiraProjectProperty() *JobJiraProjectProperty {
+	return &JobJiraProjectProperty{}
+}
+
+func (property *JobJiraProjectProperty) GetId() string {
+	return property.Id
+}
+
+func unmarshalJobJiraProjectProperty(d *xml.Decoder, start xml.StartElement) (JobProperty, error) {
+	property := NewJobJiraProjectProperty()
+	err := d.DecodeElement(property, &start)
+	if err != nil {
+		return nil, err
+	}
+	return property, nil
+}

client/job_pipeline_triggers_property.go

@@ -14,7 +14,7 @@ var ErrJobTriggerNotFound = errors.New("Could not find job pipeline trigger")
 
 type JobPipelineTriggersProperty struct {
 	XMLName  xml.Name     `xml:"org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty"`
-	Id       string       `xml:"id,attr"`
+	Id       string       `xml:"id,attr,omitempty"`
 	Triggers *JobTriggers `xml:"triggers"`
 }
 

client/job_properties.go

@@ -32,7 +32,7 @@ func (properties *JobProperties) Append(property JobProperty) *JobProperties {
 func (properties *JobProperties) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 	var tok xml.Token
 	var err error
-	properties.Items = &[]JobProperty{}
+	*properties = *NewJobProperties()
 	for tok, err = d.Token(); err == nil; tok, err = d.Token() {
 		if elem, ok := tok.(xml.StartElement); ok {
 			if unmarshalXML, ok := propertyUnmarshalFunc[elem.Name.Local]; ok {