fix id delimiter to be less command character

.gitignore

@@ -1,7 +1,9 @@
 dist/
 vendor/
+sonar/
+.scannerwork/
+
 .envrc
 terraform-provider-jenkins
-sonar/
 report.json
 coverage.out

README.md

@@ -34,21 +34,21 @@ provider "jenkins" {
 }
 
 resource "jenkins_job" "premerge" {
-  name        = "Premerge checks"
+  name = "Premerge checks"
 }
 
 resource "jenkins_job_git_scm" "premerge" {
   job = "${jenkins_job.premerge.id}"
 
   config_version = "2"
-  script_path = "Jenkinsfile.api"
-  lightweight = false
+  script_path    = "Jenkinsfile.api"
+  lightweight    = false
 }
 
 resource "jenkins_job_git_scm_user_remote_config" "premerge" {
   scm = "${jenkins_job_git_scm.premerge.id}"
 
-  refspec        = "${GERRIT_REFSPEC}"
+  refspec        = "GERRIT_REFSPEC"
   url            = "ssh://git.server/git-repo.git"
   credentials_id = "123-abc"
 }
@@ -97,7 +97,7 @@ resource "jenkins_job_gerrit_trigger" "main" {
     on_successful = false
     on_failed     = false
     on_unstable   = false
-    on_not_built   = false
+    on_not_built  = false
   }
 }
 
@@ -118,15 +118,15 @@ resource "jenkins_job_gerrit_trigger_draft_published_event" "main" {
 resource "jenkins_job_gerrit_project" "main" {
   trigger = "${jenkins_job_gerrit_trigger.main.id}"
 
-  compareType = "PLAIN"
-  pattern     = "bridge-skills"
+  compare_type = "PLAIN"
+  pattern      = "bridge-skills"
 }
 
 resource "jenkins_job_gerrit_branch" "main" {
   project = "${jenkins_job_gerrit_project.main.id}"
 
-  compareType = "REG_EXP"
-  pattern     = "^(?!refs/meta/config).*$"
+  compare_type = "REG_EXP"
+  pattern      = "^(?!refs/meta/config).*$"
 }
 
 ```

provider/id_delimiter.go

@@ -0,0 +1,3 @@
+package provider
+
+var IdDelimiter = string(0x1F)

provider/job_build_discarder_property_strategy_resource.go

@@ -1,7 +1,6 @@
 package provider
 
 import (
-	"fmt"
 	"log"
 	"strings"
 
@@ -11,8 +10,8 @@ import (
 	"github.com/mitchellh/mapstructure"
 )
 
-func resourceJobPropertyStrategyId(propertyString string) (jobName string, propertyId string, strategyId string, err error) {
-	parts := strings.Split(propertyString, "_")
+func resourceJobPropertyStrategyId(input string) (jobName string, propertyId string, strategyId string, err error) {
+	parts := strings.Split(input, IdDelimiter)
 	if len(parts) != 3 {
 		err = ErrInvalidPropertyId
 		return
@@ -62,7 +61,7 @@ func resourceJobBuildDiscarderPropertyStrategyCreate(d *schema.ResourceData, m i
 		return err
 	}
 
-	d.SetId(fmt.Sprintf("%s_%s_%s", jobName, propertyId, strategyId))
+	d.SetId(strings.Join([]string{jobName, propertyId, strategyId}, IdDelimiter))
 	log.Println("[DEBUG] Creating build discarder propety strategy", d.Id())
 	return resourceJobBuildDiscarderPropertyStrategyRead(d, m, createJobBuildDiscarderPropertyStrategy)
 }

provider/job_definition_resource.go

@@ -2,7 +2,6 @@ package provider
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"strings"
 
@@ -14,8 +13,8 @@ import (
 // ErrInvalidDefinitionId
 var ErrInvalidDefinitionId = errors.New("Invalid definition id, must be jobName_definitionId")
 
-func resourceJobDefinitionId(propertyString string) (jobName string, definitionId string, err error) {
-	parts := strings.Split(propertyString, "_")
+func resourceJobDefinitionId(input string) (jobName string, definitionId string, err error) {
+	parts := strings.Split(input, IdDelimiter)
 	if len(parts) != 2 {
 		err = ErrInvalidDefinitionId
 		return
@@ -54,7 +53,7 @@ func resourceJobDefinitionCreate(d *schema.ResourceData, m interface{}, createJo
 		return err
 	}
 
-	d.SetId(fmt.Sprintf("%s_%s", jobName, definitionId))
+	d.SetId(strings.Join([]string{jobName, definitionId}, IdDelimiter))
 	log.Println("[DEBUG] Creating job definition:", d.Id())
 	return resourceJobDefinitionRead(d, m, createJobDefinition)
 }

provider/job_gerrit_branch_resource.go

@@ -2,7 +2,6 @@ package provider
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"strings"
 
@@ -43,8 +42,8 @@ func jobGerritBranchResource() *schema.Resource {
 	}
 }
 
-func resourceJobGerritBranchId(triggerIdString string) (jobName string, propertyId string, triggerId string, projectId string, branchId string, err error) {
-	parts := strings.Split(triggerIdString, "_")
+func resourceJobGerritBranchId(input string) (jobName string, propertyId string, triggerId string, projectId string, branchId string, err error) {
+	parts := strings.Split(input, IdDelimiter)
 	if len(parts) != 5 {
 		err = ErrInvalidTriggerGerritBranchId
 		return
@@ -109,7 +108,7 @@ func resourceJobGerritBranchCreate(d *schema.ResourceData, m interface{}) error
 		return err
 	}
 
-	d.SetId(fmt.Sprintf("%s_%s_%s_%s_%s", jobName, propertyId, triggerId, projectId, branchId))
+	d.SetId(strings.Join([]string{jobName, propertyId, triggerId, projectId, branchId}, IdDelimiter))
 	log.Println("[DEBUG] Creating job gerrit branch:", d.Id())
 	return resourceJobGerritBranchRead(d, m)
 }

provider/job_gerrit_project_resource.go

@@ -2,7 +2,6 @@ package provider
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"strings"
 
@@ -43,8 +42,8 @@ func jobGerritProjectResource() *schema.Resource {
 	}
 }
 
-func resourceJobGerritProjectId(triggerIdString string) (jobName string, propertyId string, triggerId string, projectId string, err error) {
-	parts := strings.Split(triggerIdString, "_")
+func resourceJobGerritProjectId(input string) (jobName string, propertyId string, triggerId string, projectId string, err error) {
+	parts := strings.Split(input, IdDelimiter)
 	if len(parts) != 4 {
 		err = ErrInvalidTriggerGerritProjectId
 		return
@@ -103,7 +102,7 @@ func resourceJobGerritProjectCreate(d *schema.ResourceData, m interface{}) error
 		return err
 	}
 
-	d.SetId(fmt.Sprintf("%s_%s_%s_%s", jobName, propertyId, triggerId, projectId))
+	d.SetId(strings.Join([]string{jobName, propertyId, triggerId, projectId}, IdDelimiter))
 	log.Println("[DEBUG] Creating job trigger gerrit project:", d.Id())
 	return resourceJobGerritProjectRead(d, m)
 }

provider/job_gerrit_trigger_event_resource.go

@@ -2,7 +2,6 @@ package provider
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"strings"
 
@@ -15,8 +14,8 @@ import (
 // ErrInvalidJobTriggerEventId
 var ErrInvalidJobTriggerEventId = errors.New("Invalid trigger event id, must be jobName_propertyId_triggerId_eventId")
 
-func resourceJobTriggerEventId(triggerIdString string) (jobName string, propertyId string, triggerId string, eventId string, err error) {
-	parts := strings.Split(triggerIdString, "_")
+func resourceJobTriggerEventId(input string) (jobName string, propertyId string, triggerId string, eventId string, err error) {
+	parts := strings.Split(input, IdDelimiter)
 	if len(parts) != 4 {
 		err = ErrInvalidJobTriggerEventId
 		return
@@ -78,7 +77,7 @@ func resourceJobTriggerEventCreate(d *schema.ResourceData, m interface{}, create
 		return err
 	}
 
-	d.SetId(fmt.Sprintf("%s_%s_%s_%s", jobName, propertyId, triggerId, eventId))
+	d.SetId(strings.Join([]string{jobName, propertyId, triggerId, eventId}, IdDelimiter))
 	log.Println("[DEBUG] Creating job trigger:", d.Id())
 	return resourceJobTriggerEventRead(d, m, createJobTriggerEvent)
 }

provider/job_git_scm_branch_resource.go

@@ -2,7 +2,6 @@ package provider
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"strings"
 
@@ -42,8 +41,8 @@ func jobGitScmBranchResource() *schema.Resource {
 	}
 }
 
-func resourceJobGitScmBranchId(triggerIdString string) (jobName string, scmId string, branchId string, err error) {
-	parts := strings.Split(triggerIdString, "_")
+func resourceJobGitScmBranchId(input string) (jobName string, scmId string, branchId string, err error) {
+	parts := strings.Split(input, IdDelimiter)
 	if len(parts) != 3 {
 		err = ErrInvalidJobGitScmBranchId
 		return
@@ -94,8 +93,8 @@ func resourceJobGitScmBranchCreate(d *schema.ResourceData, m interface{}) error
 		return err
 	}
 
-	log.Println("[DEBUG] Creating job git scm branch:", id)
-	d.SetId(fmt.Sprintf("%s_%s_%s", jobName, scmId, branchId))
+	d.SetId(strings.Join([]string{jobName, scmId, branchId}, IdDelimiter))
+	log.Println("[DEBUG] Creating job git scm branch:", d.Id())
 	return resourceJobGitScmBranchRead(d, m)
 }
 

provider/job_git_scm_extension_resource.go

@@ -2,7 +2,6 @@ package provider
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"strings"
 
@@ -16,7 +15,7 @@ import (
 var ErrInvalidJobGitScmExtensionId = errors.New("Invalid git scm extension id, must be jobName_definitionId_extensionId")
 
 func resourceJobGitScmExtensionId(input string) (jobName string, definitionId string, extensionId string, err error) {
-	parts := strings.Split(input, "_")
+	parts := strings.Split(input, IdDelimiter)
 	if len(parts) != 3 {
 		err = ErrInvalidJobGitScmExtensionId
 		return
@@ -66,7 +65,7 @@ func resourceJobGitScmExtensionCreate(d *schema.ResourceData, m interface{}, cre
 		return err
 	}
 
-	d.SetId(fmt.Sprintf("%s_%s_%s", jobName, definitionId, extensionId))
+	d.SetId(strings.Join([]string{jobName, definitionId, extensionId}, IdDelimiter))
 	log.Println("[DEBUG] Creating job git scm extension:", d.Id())
 	return resourceJobGitScmExtensionRead(d, m, createGitScmExtension)
 }

provider/job_git_scm_user_remote_config_resource.go

@@ -2,7 +2,6 @@ package provider
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"strings"
 
@@ -52,7 +51,7 @@ func jobGitScmUserRemoteConfigResource() *schema.Resource {
 }
 
 func resourceJobGitScmUserRemoteConfigId(input string) (jobName string, definitionId string, configId string, err error) {
-	parts := strings.Split(input, "_")
+	parts := strings.Split(input, IdDelimiter)
 	if len(parts) != 3 {
 		err = ErrInvalidJobGitScmUserRemoteConfigId
 		return
@@ -100,7 +99,7 @@ func resourceJobGitScmUserRemoteConfigCreate(d *schema.ResourceData, m interface
 		return err
 	}
 
-	d.SetId(fmt.Sprintf("%s_%s_%s", jobName, definitionId, configId))
+	d.SetId(strings.Join([]string{jobName, definitionId, configId}, IdDelimiter))
 	log.Println("[DEBUG] Creating job git scm user remote config:", d.Id())
 	return resourceJobGitScmUserRemoteConfigRead(d, m)
 }

provider/job_property_resource.go

@@ -2,7 +2,6 @@ package provider
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"strings"
 
@@ -14,8 +13,8 @@ import (
 // ErrInvalidPropertyId
 var ErrInvalidPropertyId = errors.New("Invalid property id, must be jobName_propertyId")
 
-func resourceJobPropertyId(propertyString string) (jobName string, propertyId string, err error) {
-	parts := strings.Split(propertyString, "_")
+func resourceJobPropertyId(input string) (jobName string, propertyId string, err error) {
+	parts := strings.Split(input, IdDelimiter)
 	if len(parts) != 2 {
 		err = ErrInvalidPropertyId
 		return
@@ -53,7 +52,7 @@ func resourceJobPropertyCreate(d *schema.ResourceData, m interface{}, createJobP
 		return err
 	}
 
-	d.SetId(fmt.Sprintf("%s_%s", jobName, propertyId))
+	d.SetId(strings.Join([]string{jobName, propertyId}, IdDelimiter))
 	log.Println("[DEBUG] Creating job property:", d.Id())
 	return resourceJobPropertyRead(d, m, createJobProperty)
 }

provider/job_trigger_resource.go

@@ -2,7 +2,6 @@ package provider
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"strings"
 
@@ -15,8 +14,8 @@ import (
 // ErrInvalidJobTriggerId
 var ErrInvalidJobTriggerId = errors.New("Invalid trigger id, must be jobName_propertyId_triggerId")
 
-func resourceJobTriggerId(triggerIdString string) (jobName string, propertyId string, triggerId string, err error) {
-	parts := strings.Split(triggerIdString, "_")
+func resourceJobTriggerId(input string) (jobName string, propertyId string, triggerId string, err error) {
+	parts := strings.Split(input, IdDelimiter)
 	if len(parts) != 3 {
 		err = ErrInvalidJobTriggerId
 		return
@@ -71,7 +70,7 @@ func resourceJobTriggerCreate(d *schema.ResourceData, m interface{}, createJobTr
 		return err
 	}
 
-	d.SetId(fmt.Sprintf("%s_%s_%s", jobName, propertyId, triggerId))
+	d.SetId(strings.Join([]string{jobName, propertyId, triggerId}, IdDelimiter))
 	log.Println("[DEBUG] Creating job trigger:", d.Id())
 	return resourceJobTriggerRead(d, m, createJobTrigger)
 }