Skip to content

Commit e31d87b

Browse files
josh-silvasjosh-silvas
committed
Do not return on d.Set() errors.
1 parent 674a4d3 commit e31d87b

20 files changed

+144
-139
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.0.0
1+
v1.0.1

‎internal/awx/data_source_credential_role.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package awx
22

33
import (
44
"context"
5+
"fmt"
56
"strconv"
67

78
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -88,7 +89,7 @@ func dataSourceCredentialMachineRoleRead(ctx context.Context, d *schema.Resource
8889

8990
func setCredentialRoleData(d *schema.ResourceData, r *awx.ApplyRole) *schema.ResourceData {
9091
if err := d.Set("name", r.Name); err != nil {
91-
return d
92+
fmt.Println("Error setting name", err)
9293
}
9394
d.SetId(strconv.Itoa(r.ID))
9495
return d

‎internal/awx/data_source_inventory_role.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package awx
22

33
import (
44
"context"
5+
"fmt"
56
"strconv"
67

78
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -88,7 +89,7 @@ func dataSourceInventoryRoleRead(ctx context.Context, d *schema.ResourceData, m
8889

8990
func setInventoryRoleData(d *schema.ResourceData, r *awx.ApplyRole) *schema.ResourceData {
9091
if err := d.Set("name", r.Name); err != nil {
91-
return d
92+
fmt.Println("Error setting name", err)
9293
}
9394
d.SetId(strconv.Itoa(r.ID))
9495
return d

‎internal/awx/data_source_job_template_role.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package awx
22

33
import (
44
"context"
5+
"fmt"
56
"strconv"
67

78
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -88,7 +89,7 @@ func dataSourceJobTemplateRoleRead(ctx context.Context, d *schema.ResourceData,
8889

8990
func setJobTemplateRoleData(d *schema.ResourceData, r *awx.ApplyRole) *schema.ResourceData {
9091
if err := d.Set("name", r.Name); err != nil {
91-
return d
92+
fmt.Println("Error setting name", err)
9293
}
9394
d.SetId(strconv.Itoa(r.ID))
9495
return d

‎internal/awx/data_source_organization_role.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package awx
22

33
import (
44
"context"
5+
"fmt"
56
"strconv"
67

78
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -98,7 +99,7 @@ func dataSourceOrganizationRolesRead(ctx context.Context, d *schema.ResourceData
9899

99100
func setOrganizationRoleData(d *schema.ResourceData, r *awx.ApplyRole) *schema.ResourceData {
100101
if err := d.Set("name", r.Name); err != nil {
101-
return d
102+
fmt.Println("Error setting name", err)
102103
}
103104
d.SetId(strconv.Itoa(r.ID))
104105
return d

‎internal/awx/data_source_project_role.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package awx
22

33
import (
44
"context"
5+
"fmt"
56
"strconv"
67

78
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -87,7 +88,7 @@ func dataSourceProjectRolesRead(ctx context.Context, d *schema.ResourceData, m i
8788

8889
func setProjectRoleData(d *schema.ResourceData, r *awx.ApplyRole) *schema.ResourceData {
8990
if err := d.Set("name", r.Name); err != nil {
90-
return d
91+
fmt.Println("Error setting name", err)
9192
}
9293
d.SetId(strconv.Itoa(r.ID))
9394
return d

‎internal/awx/resource_execution_environment.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,19 +152,19 @@ func resourceExecutionEnvironmentsDelete(ctx context.Context, d *schema.Resource
152152

153153
func setExecutionEnvironmentsResourceData(d *schema.ResourceData, r *awx.ExecutionEnvironment) *schema.ResourceData {
154154
if err := d.Set("name", r.Name); err != nil {
155-
return d
155+
fmt.Println("Error setting name", err)
156156
}
157157
if err := d.Set("image", r.Image); err != nil {
158-
return d
158+
fmt.Println("Error setting image", err)
159159
}
160160
if err := d.Set("description", r.Description); err != nil {
161-
return d
161+
fmt.Println("Error setting description", err)
162162
}
163163
if err := d.Set("organization", r.Organization); err != nil {
164-
return d
164+
fmt.Println("Error setting organization", err)
165165
}
166166
if err := d.Set("credential", r.Credential); err != nil {
167-
return d
167+
fmt.Println("Error setting credential", err)
168168
}
169169
d.SetId(strconv.Itoa(r.ID))
170170
return d

‎internal/awx/resource_host.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,25 +180,25 @@ func resourceHostDelete(ctx context.Context, d *schema.ResourceData, m interface
180180

181181
func setHostResourceData(d *schema.ResourceData, r *awx.Host) *schema.ResourceData {
182182
if err := d.Set("name", r.Name); err != nil {
183-
return d
183+
fmt.Println("Error setting name", err)
184184
}
185185
if err := d.Set("description", r.Description); err != nil {
186-
return d
186+
fmt.Println("Error setting description", err)
187187
}
188188
if err := d.Set("inventory_id", r.Inventory); err != nil {
189-
return d
189+
fmt.Println("Error setting inventory_id", err)
190190
}
191191
if err := d.Set("enabled", r.Enabled); err != nil {
192-
return d
192+
fmt.Println("Error setting enabled", err)
193193
}
194194
if err := d.Set("instance_id", r.InstanceID); err != nil {
195-
return d
195+
fmt.Println("Error setting instance_id", err)
196196
}
197197
if err := d.Set("variables", normalizeJsonYaml(r.Variables)); err != nil {
198-
return d
198+
fmt.Println("Error setting variables", err)
199199
}
200200
if err := d.Set("group_ids", d.Get("group_ids").([]interface{})); err != nil {
201-
return d
201+
fmt.Println("Error setting group_ids", err)
202202
}
203203
return d
204204
}

‎internal/awx/resource_instance_group.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ func resourceInstanceGroupRead(ctx context.Context, d *schema.ResourceData, m in
139139

140140
func setInstanceGroupResourceData(d *schema.ResourceData, r *awx.InstanceGroup) *schema.ResourceData {
141141
if err := d.Set("name", r.Name); err != nil {
142-
return d
142+
fmt.Println("Error setting name", err)
143143
}
144144
if err := d.Set("is_container_group", r.IsContainerGroup); err != nil {
145-
return d
145+
fmt.Println("Error setting is_container_group", err)
146146
}
147147
if err := d.Set("pod_spec_override", normalizeJsonYaml(r.PodSpecOverride)); err != nil {
148-
return d
148+
fmt.Println("Error setting pod_spec_override", err)
149149
}
150150

151151
d.SetId(strconv.Itoa(r.ID))

‎internal/awx/resource_inventory.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,22 +143,22 @@ func resourceInventoryDelete(ctx context.Context, d *schema.ResourceData, m inte
143143

144144
func setInventoryResourceData(d *schema.ResourceData, r *awx.Inventory) *schema.ResourceData {
145145
if err := d.Set("name", r.Name); err != nil {
146-
return d
146+
fmt.Println("Error setting name", err)
147147
}
148148
if err := d.Set("organization_id", strconv.Itoa(r.Organization)); err != nil {
149-
return d
149+
fmt.Println("Error setting organization_id", err)
150150
}
151151
if err := d.Set("description", r.Description); err != nil {
152-
return d
152+
fmt.Println("Error setting description", err)
153153
}
154154
if err := d.Set("kind", r.Kind); err != nil {
155-
return d
155+
fmt.Println("Error setting kind", err)
156156
}
157157
if err := d.Set("host_filter", r.HostFilter); err != nil {
158-
return d
158+
fmt.Println("Error setting host_filter", err)
159159
}
160160
if err := d.Set("variables", normalizeJsonYaml(r.Variables)); err != nil {
161-
return d
161+
fmt.Println("Error setting variables", err)
162162
}
163163
d.SetId(strconv.Itoa(r.ID))
164164
return d

0 commit comments

Comments
 (0)