add ensure id functionality to importer

client/cps_scm_flow_definition.go

@@ -19,3 +19,7 @@ func NewCpsScmFlowDefinition() *CpsScmFlowDefinition {
 func (d *CpsScmFlowDefinition) GetId() string {
 	return d.Id
 }
+
+func (d *CpsScmFlowDefinition) SetId(id string) {
+	d.Id = id
+}

client/git_scm_clean_before_checkout_extension.go

@@ -19,6 +19,10 @@ func (e *GitScmCleanBeforeCheckoutExtension) GetId() string {
 	return e.Id
 }
 
+func (e *GitScmCleanBeforeCheckoutExtension) SetId(id string) {
+	e.Id = id
+}
+
 func unmarshalScmExtension(d *xml.Decoder, start xml.StartElement) (GitScmExtension, error) {
 	extension := NewGitScmCleanBeforeCheckoutExtension()
 	err := d.DecodeElement(extension, &start)

client/git_scm_extension.go

@@ -2,4 +2,5 @@ package client
 
 type GitScmExtension interface {
 	GetId() string
+	SetId(string)
 }

client/job_action.go

@@ -2,4 +2,5 @@ package client
 
 type JobAction interface {
 	GetId() string
+	SetId(string)
 }

client/job_build_discarder_property.go

@@ -19,8 +19,12 @@ func NewJobBuildDiscarderProperty() *JobBuildDiscarderProperty {
 	}
 }
 
-func (property *JobBuildDiscarderProperty) GetId() string {
-	return property.Id
+func (p *JobBuildDiscarderProperty) GetId() string {
+	return p.Id
+}
+
+func (p *JobBuildDiscarderProperty) SetId(id string) {
+	p.Id = id
 }
 
 func unmarshalBuildDiscarderProperty(d *xml.Decoder, start xml.StartElement) (JobProperty, error) {

client/job_build_discarder_property_strategy.go

@@ -2,4 +2,5 @@ package client
 
 type JobBuildDiscarderPropertyStrategy interface {
 	GetId() string
+	SetId(string)
 }

client/job_build_discarder_property_strategy_log_rotator.go

@@ -24,3 +24,7 @@ func NewJobBuildDiscarderPropertyStrategyLogRotator() *JobBuildDiscarderProperty
 func (s *JobBuildDiscarderPropertyStrategyLogRotator) GetId() string {
 	return s.Id
 }
+
+func (s *JobBuildDiscarderPropertyStrategyLogRotator) SetId(id string) {
+	s.Id = id
+}

client/job_build_discarder_property_strategy_xml.go

@@ -19,6 +19,7 @@ func (strategy *JobBuildDiscarderPropertyStrategyXml) MarshalXML(e *xml.Encoder,
 
 func (strategy *JobBuildDiscarderPropertyStrategyXml) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 	for _, attr := range start.Attr {
+		// TODO use map
 		switch attr.Name.Local {
 		case "class":
 			switch attr.Value {

client/job_datadog_job_property.go

@@ -26,6 +26,10 @@ func (property *JobDatadogJobProperty) GetId() string {
 	return property.Id
 }
 
+func (p *JobDatadogJobProperty) SetId(id string) {
+	p.Id = id
+}
+
 func unmarshalJobDatadogJobProperty(d *xml.Decoder, start xml.StartElement) (JobProperty, error) {
 	property := NewJobDatadogJobProperty()
 	err := d.DecodeElement(property, &start)

client/job_declarative_job_action.go

@@ -20,6 +20,10 @@ func (action *JobDeclarativeJobAction) GetId() string {
 	return action.Id
 }
 
+func (a *JobDeclarativeJobAction) SetId(id string) {
+	a.Id = id
+}
+
 func unmarshalDeclarativeJobAction(d *xml.Decoder, start xml.StartElement) (JobAction, error) {
 	action := NewJobDeclarativeJobAction()
 	err := d.DecodeElement(action, &start)

client/job_declarative_job_property_tracker_action.go

@@ -25,6 +25,10 @@ func (action *JobDeclarativeJobPropertyTrackerAction) GetId() string {
 	return action.Id
 }
 
+func (a *JobDeclarativeJobPropertyTrackerAction) SetId(id string) {
+	a.Id = id
+}
+
 func unmarshalDeclarativeJobPropertyTrackerAction(d *xml.Decoder, start xml.StartElement) (JobAction, error) {
 	action := NewJobDeclarativeJobPropertyTrackerAction()
 	err := d.DecodeElement(action, &start)

client/job_definition.go

@@ -11,6 +11,7 @@ type JobDefinitionXml struct {
 
 type JobDefinition interface {
 	GetId() string
+	SetId(string)
 }
 
 func (jobDefinition *JobDefinitionXml) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
@@ -19,6 +20,7 @@ func (jobDefinition *JobDefinitionXml) MarshalXML(e *xml.Encoder, start xml.Star
 
 func (jobDefinition *JobDefinitionXml) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 	for _, attr := range start.Attr {
+		// TODO use map
 		switch attr.Name.Local {
 		case "class":
 			switch attr.Value {

client/job_gerrit_trigger.go

@@ -68,6 +68,10 @@ func (trigger *JobGerritTrigger) GetId() string {
 	return trigger.Id
 }
 
+func (t *JobGerritTrigger) SetId(id string) {
+	t.Id = id
+}
+
 func unmarshalJobGerritTrigger(d *xml.Decoder, start xml.StartElement) (JobTrigger, error) {
 	trigger := NewJobGerritTrigger()
 	err := d.DecodeElement(trigger, &start)

client/job_gerrit_trigger_on_event.go

@@ -2,4 +2,5 @@ package client
 
 type JobGerritTriggerOnEvent interface {
 	GetId() string
+	SetId(string)
 }

client/job_gerrit_trigger_plugin_draft_published_event.go

@@ -19,6 +19,10 @@ func (event *JobGerritTriggerPluginDraftPublishedEvent) GetId() string {
 	return event.Id
 }
 
+func (e *JobGerritTriggerPluginDraftPublishedEvent) SetId(id string) {
+	e.Id = id
+}
+
 func unmarshalJobGerritTriggerPluginDraftPublishedEvent(d *xml.Decoder, start xml.StartElement) (JobGerritTriggerOnEvent, error) {
 	event := NewJobGerritTriggerPluginDraftPublishedEvent()
 	err := d.DecodeElement(event, &start)

client/job_gerrit_trigger_plugin_patchset_created_event.go

@@ -31,6 +31,10 @@ func (event *JobGerritTriggerPluginPatchsetCreatedEvent) GetId() string {
 	return event.Id
 }
 
+func (e *JobGerritTriggerPluginPatchsetCreatedEvent) SetId(id string) {
+	e.Id = id
+}
+
 func unmarshalJobGerritTriggerPluginPatchsetCreatedEvent(d *xml.Decoder, start xml.StartElement) (JobGerritTriggerOnEvent, error) {
 	event := NewJobGerritTriggerPluginPatchsetCreatedEvent()
 	err := d.DecodeElement(event, &start)

client/job_jira_project_property.go

@@ -22,6 +22,10 @@ func (property *JobJiraProjectProperty) GetId() string {
 	return property.Id
 }
 
+func (p *JobJiraProjectProperty) SetId(id string) {
+	p.Id = id
+}
+
 func unmarshalJobJiraProjectProperty(d *xml.Decoder, start xml.StartElement) (JobProperty, error) {
 	property := NewJobJiraProjectProperty()
 	err := d.DecodeElement(property, &start)

client/job_pipeline_triggers_property.go

@@ -28,6 +28,10 @@ func (property *JobPipelineTriggersProperty) GetId() string {
 	return property.Id
 }
 
+func (p *JobPipelineTriggersProperty) SetId(id string) {
+	p.Id = id
+}
+
 func unmarshalPipelineTriggersProperty(d *xml.Decoder, start xml.StartElement) (JobProperty, error) {
 	property := NewJobPipelineTriggersProperty()
 	err := d.DecodeElement(property, &start)

client/job_property.go

@@ -2,4 +2,5 @@ package client
 
 type JobProperty interface {
 	GetId() string
+	SetId(string)
 }

client/job_trigger.go

@@ -2,4 +2,5 @@ package client
 
 type JobTrigger interface {
 	GetId() string
+	SetId(string)
 }

importer/ensure_resource_service.go

@@ -23,32 +23,15 @@ func (s *EnsureJobResourceService) EnsureResourceIds(job *client.Job) error {
 		}
 		job.Id = id.String()
 	}
-	if err := ensureJobConfig(); err != nil {
+	if err := ensureJobActions(job.Actions); err != nil {
 		return err
 	}
-	if err := ensureJobActions(); err != nil {
+	if err := ensureJobProperties(job.Properties); err != nil {
 		return err
 	}
-	if err := ensureJobProperties(); err != nil {
-		return err
-	}
-	if err := ensureJobDefinition(); err != nil {
+	if err := ensureJobDefinition(job.Definition); err != nil {
 		return err
 	}
 
 	return s.jobService.UpdateJob(job)
-	// return nil
-}
-
-func ensureJobConfig() error {
-	return nil
-}
-func ensureJobActions() error {
-	return nil
-}
-func ensureJobProperties() error {
-	return nil
-}
-func ensureJobDefinition() error {
-	return nil
 }

importer/job_import_service.go

@@ -19,7 +19,9 @@ func (s *JobImportService) Import(jobName string) error {
 	if err != nil {
 		return err
 	}
-	NewEnsureJobResourceService(s.jobService).EnsureResourceIds(job)
+	if err := NewEnsureJobResourceService(s.jobService).EnsureResourceIds(job); err != nil {
+		return err
+	}
 	// GenerateTerraformCodeService(s.jobService).Generate(job)
 	// GenerateTerraformImportScriptService(s.jobService).Generate(job)
 	return nil

importer/resource_cps_scm_flow_definition.go

@@ -0,0 +1,23 @@
+package main
+
+import (
+	"github.com/jgramoll/terraform-provider-jenkins/client"
+)
+
+func init() {
+	ensureDefinitionFuncs["*client.CpsScmFlowDefinition"] = ensureCpsScmFlowDefinition
+}
+
+func ensureCpsScmFlowDefinition(definitionInterface client.JobDefinition) error {
+	definition := definitionInterface.(*client.CpsScmFlowDefinition)
+	if err := ensureGitUserRemoteConfigs(definition.SCM.UserRemoteConfigs); err != nil {
+		return err
+	}
+	if err := ensureGitScmBranches(definition.SCM.Branches); err != nil {
+		return err
+	}
+	if err := ensureGitScmSubmoduleConfig(definition.SCM.SubmoduleCfg); err != nil {
+		return err
+	}
+	return ensureGitScmExtensions(definition.SCM.Extensions)
+}

importer/resource_definition.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"fmt"
+	"reflect"
+
+	"github.com/google/uuid"
+	"github.com/jgramoll/terraform-provider-jenkins/client"
+)
+
+type ensureDefinitionFunc func(client.JobDefinition) error
+
+var ensureDefinitionFuncs = map[string]ensureDefinitionFunc{}
+
+func ensureJobDefinition(definition client.JobDefinition) error {
+	if definition == nil {
+		return nil
+	}
+	if definition.GetId() == "" {
+		id, err := uuid.NewRandom()
+		if err != nil {
+			return err
+		}
+		definition.SetId(id.String())
+	}
+	reflectType := reflect.TypeOf(definition).String()
+	ensureFunc, ok := ensureDefinitionFuncs[reflectType]
+	if !ok {
+		return fmt.Errorf("Unknown Definition Type %s", reflectType)
+	}
+	return ensureFunc(definition)
+}

importer/resource_git_scm_branch.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"github.com/google/uuid"
+	"github.com/jgramoll/terraform-provider-jenkins/client"
+)
+
+func ensureGitScmBranches(branches *client.GitScmBranches) error {
+	if branches == nil || branches.Items == nil {
+		return nil
+	}
+	for _, item := range *branches.Items {
+		if item.Id == "" {
+			id, err := uuid.NewRandom()
+			if err != nil {
+				return err
+			}
+			item.Id = id.String()
+		}
+	}
+	return nil
+}

importer/resource_git_scm_clean_before_checkout_extension.go

@@ -0,0 +1 @@
+package main

importer/resource_git_scm_extension.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"github.com/google/uuid"
+	"github.com/jgramoll/terraform-provider-jenkins/client"
+)
+
+func ensureGitScmExtensions(extensions *client.GitScmExtensions) error {
+	if extensions == nil || extensions.Items == nil {
+		return nil
+	}
+	for _, item := range *extensions.Items {
+		if item.GetId() == "" {
+			id, err := uuid.NewRandom()
+			if err != nil {
+				return err
+			}
+			item.SetId(id.String())
+		}
+	}
+	return nil
+}

importer/resource_git_scm_submodule_config.go

@@ -0,0 +1,9 @@
+package main
+
+import (
+	"github.com/jgramoll/terraform-provider-jenkins/client"
+)
+
+func ensureGitScmSubmoduleConfig(branches *client.GitScmSubmodulesConfig) error {
+	return nil
+}

importer/resource_git_user_remote_config.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"github.com/google/uuid"
+	"github.com/jgramoll/terraform-provider-jenkins/client"
+)
+
+func ensureGitUserRemoteConfigs(configs *client.GitUserRemoteConfigs) error {
+	if configs == nil || configs.Items == nil {
+		return nil
+	}
+	for _, item := range *configs.Items {
+		if item.Id == "" {
+			id, err := uuid.NewRandom()
+			if err != nil {
+				return err
+			}
+			item.Id = id.String()
+		}
+	}
+	return nil
+}

importer/resource_job_action.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"github.com/google/uuid"
+	"github.com/jgramoll/terraform-provider-jenkins/client"
+)
+
+func ensureJobActions(actions *client.JobActions) error {
+	if actions == nil || actions.Items == nil {
+		return nil
+	}
+	for _, item := range *actions.Items {
+		if item.GetId() == "" {
+			id, err := uuid.NewRandom()
+			if err != nil {
+				return err
+			}
+			item.SetId(id.String())
+		}
+	}
+	return nil
+}

importer/resource_job_declarative_job_action.go

@@ -0,0 +1 @@
+package main