Skip to content

Commit

Permalink
Change the lock of setting ID for resource/datasource
Browse files Browse the repository at this point in the history 
Use name,profile_id or any unique identifier as ID for both resource/datasource
  • Loading branch information
@nikhilsbhat
nikhilsbhat committed Feb 19, 2023
1 parent 03c30db commit e60cdd0
Show file tree
Hide file tree
Showing 20 changed files with 36 additions and 106 deletions.
2 changes: 1 addition & 1 deletion examples/authorization_configuration.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ resource "gocd_auth_config" "password_file_config" {
}

data "gocd_auth_config" "password_file_config" {
profile_id = "admin_new"
profile_id = gocd_auth_config.password_file_config.id
}
2 changes: 1 addition & 1 deletion examples/cluster_profile.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@ resource "gocd_cluster_profile" "ec2_cluster_profile" {
}

data "gocd_cluster_profile" "ec2_cluster_profile" {
profile_id = "ec2_cluster_profile"
profile_id = gocd_cluster_profile.ec2_cluster_profile.id
}
6 changes: 3 additions & 3 deletions examples/config_repo.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ resource "gocd_config_repository" "sample_config_repo" {
}
configuration {
key = "url"
value = "https://github.com/sample/example.git"
value = "https://github.com/config-repo/gocd-json-config-example.git"
is_secure = false
}
material {
Expand All @@ -35,5 +35,5 @@ resource "gocd_config_repository" "sample_config_repo" {
}

data "gocd_config_repository" "sample_config_repo" {
profile_id = "sample_config_repo"
}
profile_id = gocd_config_repository.sample_config_repo.id
}
2 changes: 1 addition & 1 deletion examples/elastic_agent_profile.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ resource "gocd_elastic_agent_profile" "sample_ec2" {
}

data "gocd_elastic_agent_profile" "sample_ec2" {
profile_id = "sample_ec2"
profile_id = gocd_elastic_agent_profile.sample_ec2.id
}
2 changes: 1 addition & 1 deletion examples/environment.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ resource "gocd_environment" "sample_environment" {
}

data "gocd_environment" "sample_environment" {
name = "sample_environment"
name = gocd_environment.sample_environment.id
}
2 changes: 1 addition & 1 deletion examples/provider.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ terraform {
provider "gocd" {
base_url = "http://localhost:8153/go"
username = "admin"
// password = "admin"
password = "admin"
auth_token = "d8fccbc997d04e917b1490af8e7bf46290ab8c99"
loglevel = "debug"
}
9 changes: 2 additions & 7 deletions internal/provider/data_auth_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,8 @@ func datasourceAuthConfigRead(ctx context.Context, d *schema.ResourceData, meta
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformResourceProfileID))
id = resourceID
}

profileID := utils.String(d.Get(utils.TerraformResourceProfileID))
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/data_cluster_profile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,8 @@ func datasourceClusterProfileRead(ctx context.Context, d *schema.ResourceData, m
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformResourceProfileID))
id = resourceID
}

profileID := utils.String(d.Get(utils.TerraformResourceProfileID))
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/data_config_repository.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,8 @@ func dataSourceConfigRepositoryRead(ctx context.Context, d *schema.ResourceData,
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformResourceProfileID))
id = resourceID
}

profileID := utils.String(d.Get(utils.TerraformResourceProfileID))
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/data_elastic_agent_profile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,8 @@ func datasourceElasticAgentProfileRead(ctx context.Context, d *schema.ResourceDa
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformResourceProfileID))
id = resourceID
}

profileID := utils.String(d.Get(utils.TerraformResourceProfileID))
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/data_environment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,8 @@ func datasourceEnvironmentRead(ctx context.Context, d *schema.ResourceData, meta
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformResourceName))
id = resourceID
}

envName := utils.String(d.Get(utils.TerraformResourceName))
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/data_plugin_setting.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,8 @@ func dataSourcePluginsSettingRead(ctx context.Context, d *schema.ResourceData, m
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformPluginID))
id = resourceID
}

pluginID := utils.String(d.Get(utils.TerraformPluginID))
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/data_secret_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,8 @@ func dataSourceSecretConfigRead(ctx context.Context, d *schema.ResourceData, met
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformResourceProfileID))
id = resourceID
}

profileID := utils.String(d.Get(utils.TerraformResourceProfileID))
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/resource_auth_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,8 @@ func resourceAuthConfigCreate(ctx context.Context, d *schema.ResourceData, meta
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformResourceProfileID))
id = resourceID
}

cfg := gocd.CommonConfig{
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/resource_cluster_profile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,8 @@ func resourceClusterProfileCreate(ctx context.Context, d *schema.ResourceData, m
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformResourceProfileID))
id = resourceID
}

cfg := gocd.CommonConfig{
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/resource_config_repository.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,8 @@ func resourceConfigRepoCreate(ctx context.Context, d *schema.ResourceData, meta
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformResourceProfileID))
id = resourceID
}

rules, err := getRules(d.Get(utils.TerraformResourceRules))
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/resource_elastic_agent_profile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,8 @@ func resourceElasticAgentProfileCreate(ctx context.Context, d *schema.ResourceDa
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformResourceProfileID))
id = resourceID
}

cfg := gocd.CommonConfig{
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/resource_environments.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,8 @@ func resourceEnvironmentCreate(ctx context.Context, d *schema.ResourceData, meta
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformResourceName))
id = resourceID
}

envVars, err := getEnvironments(d.Get(utils.TerraformEnvVar))
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/resource_plugin_settings.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,8 @@ func resourcePluginsSettingsCreate(ctx context.Context, d *schema.ResourceData,
id := d.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
d.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(d.Get(utils.TerraformPluginID))
id = resourceID
}

pluginSettings := gocd.PluginSettings{
Expand Down
9 changes: 2 additions & 7 deletions internal/provider/resource_secret_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,8 @@ func resourceSecretConfigCreate(ctx context.Context, data *schema.ResourceData,
id := data.Id()

if len(id) == 0 {
newID, err := utils.GetRandomID()
if err != nil {
data.SetId("")

return diag.Errorf("errored while fetching randomID %v", err)
}
id = newID
resourceID := utils.String(data.Get(utils.TerraformResourceProfileID))
id = resourceID
}

rules, err := getRules(data.Get(utils.TerraformResourceRules))
Expand Down

0 comments on commit e60cdd0

Please sign in to comment.