Skip to content

Commit 417a891

Browse files
SwiftEngineerSwiftEngineer
committed
fix lint errors
1 parent 9c30144 commit 417a891

File tree

2 files changed

+34
-49
lines changed

2 files changed

+34
-49
lines changed

‎internal/provider/data_retention_policy.go‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
type modelTFEDataRetentionPolicy struct {
1414
ID types.String `tfsdk:"id"`
1515
Organization types.String `tfsdk:"organization"`
16-
WorkspaceId types.String `tfsdk:"workspace_id"`
16+
WorkspaceID types.String `tfsdk:"workspace_id"`
1717
DeleteOlderThan types.Object `tfsdk:"delete_older_than"`
1818
DontDelete types.Object `tfsdk:"dont_delete"`
1919
}
@@ -45,7 +45,7 @@ func modelFromTFEDataRetentionPolicyDeleteOlder(ctx context.Context, model model
4545
return modelTFEDataRetentionPolicy{
4646
ID: types.StringValue(deleteOlder.ID),
4747
Organization: model.Organization,
48-
WorkspaceId: model.WorkspaceId,
48+
WorkspaceID: model.WorkspaceID,
4949
DeleteOlderThan: deleteOlderThanObject,
5050
DontDelete: types.ObjectNull(map[string]attr.Type{}),
5151
}, diags
@@ -55,37 +55,17 @@ func modelFromTFEDataRetentionPolicyDontDelete(model modelTFEDataRetentionPolicy
5555
return modelTFEDataRetentionPolicy{
5656
ID: types.StringValue(dontDelete.ID),
5757
Organization: model.Organization,
58-
WorkspaceId: model.WorkspaceId,
58+
WorkspaceID: model.WorkspaceID,
5959
DeleteOlderThan: types.ObjectNull(modelTFEDeleteOlderThan{}.AttributeTypes()),
6060
DontDelete: DontDeleteEmptyObject(),
6161
}
6262
}
6363

64-
func modelFromTFELegacyDataRetentionPolicy(ctx context.Context, model modelTFEDataRetentionPolicy, legacy *tfe.DataRetentionPolicy) (modelTFEDataRetentionPolicy, diag.Diagnostics) {
65-
deleteOlderThan := modelTFEDeleteOlderThan{
66-
Days: types.NumberValue(big.NewFloat(float64(legacy.DeleteOlderThanNDays))),
67-
}
68-
deleteOlderThanObject, diags := types.ObjectValueFrom(ctx, deleteOlderThan.AttributeTypes(), deleteOlderThan)
69-
70-
return modelTFEDataRetentionPolicy{
71-
ID: types.StringValue(legacy.ID),
72-
Organization: model.Organization,
73-
WorkspaceId: model.WorkspaceId,
74-
DeleteOlderThan: deleteOlderThanObject,
75-
DontDelete: types.ObjectNull(map[string]attr.Type{}),
76-
}, diags
77-
}
78-
7964
func modelFromTFEDataRetentionPolicyChoice(ctx context.Context, model modelTFEDataRetentionPolicy, choice *tfe.DataRetentionPolicyChoice) (modelTFEDataRetentionPolicy, diag.Diagnostics) {
8065
if choice.DataRetentionPolicyDeleteOlder != nil {
8166
return modelFromTFEDataRetentionPolicyDeleteOlder(ctx, model, choice.DataRetentionPolicyDeleteOlder)
8267
}
8368

8469
var emptyDiag []diag.Diagnostic
85-
if choice.DataRetentionPolicyDontDelete != nil {
86-
return modelFromTFEDataRetentionPolicyDontDelete(model, choice.DataRetentionPolicyDontDelete), emptyDiag
87-
}
88-
89-
legacyPolicy := choice.ConvertToLegacyStruct()
90-
return modelFromTFELegacyDataRetentionPolicy(ctx, model, legacyPolicy)
70+
return modelFromTFEDataRetentionPolicyDontDelete(model, choice.DataRetentionPolicyDontDelete), emptyDiag
9171
}

‎internal/provider/resource_tfe_data_retention_policy.go‎

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ func (r *resourceTFEDataRetentionPolicy) Create(ctx context.Context, req resourc
140140
r.createDontDeleteRetentionPolicy(ctx, plan, resp)
141141
return
142142
}
143-
144143
}
145144

146145
func (r *resourceTFEDataRetentionPolicy) ensureOrganizationIsSet(ctx context.Context, model *modelTFEDataRetentionPolicy, data AttrGettable, diags *diag.Diagnostics) {
@@ -149,7 +148,7 @@ func (r *resourceTFEDataRetentionPolicy) ensureOrganizationIsSet(ctx context.Con
149148
return
150149
}
151150

152-
if model.WorkspaceId.IsNull() {
151+
if model.WorkspaceID.IsNull() {
153152
var organization string
154153
diags.Append(r.config.dataOrDefaultOrganization(ctx, data, &organization)...)
155154
model.Organization = types.StringValue(organization)
@@ -173,10 +172,10 @@ func (r *resourceTFEDataRetentionPolicy) createDeleteOlderThanRetentionPolicy(ct
173172
tflog.Debug(ctx, "Creating data retention policy")
174173
var dataRetentionPolicy *tfe.DataRetentionPolicyDeleteOlder
175174
var err error
176-
if plan.WorkspaceId.IsNull() {
175+
if plan.WorkspaceID.IsNull() {
177176
dataRetentionPolicy, err = r.config.Client.Organizations.SetDataRetentionPolicyDeleteOlder(ctx, plan.Organization.ValueString(), options)
178177
} else {
179-
dataRetentionPolicy, err = r.config.Client.Workspaces.SetDataRetentionPolicyDeleteOlder(ctx, plan.WorkspaceId.ValueString(), options)
178+
dataRetentionPolicy, err = r.config.Client.Workspaces.SetDataRetentionPolicyDeleteOlder(ctx, plan.WorkspaceID.ValueString(), options)
180179
}
181180
if err != nil {
182181
resp.Diagnostics.AddError("Unable to create data retention policy", err.Error())
@@ -211,10 +210,10 @@ func (r *resourceTFEDataRetentionPolicy) createDontDeleteRetentionPolicy(ctx con
211210
tflog.Debug(ctx, "Creating data retention policy")
212211
var dataRetentionPolicy *tfe.DataRetentionPolicyDontDelete
213212
var err error
214-
if plan.WorkspaceId.IsNull() {
213+
if plan.WorkspaceID.IsNull() {
215214
dataRetentionPolicy, err = r.config.Client.Organizations.SetDataRetentionPolicyDontDelete(ctx, plan.Organization.ValueString(), options)
216215
} else {
217-
dataRetentionPolicy, err = r.config.Client.Workspaces.SetDataRetentionPolicyDontDelete(ctx, plan.WorkspaceId.ValueString(), options)
216+
dataRetentionPolicy, err = r.config.Client.Workspaces.SetDataRetentionPolicyDontDelete(ctx, plan.WorkspaceID.ValueString(), options)
218217
}
219218
if err != nil {
220219
resp.Diagnostics.AddError("Unable to create data retention policy", err.Error())
@@ -233,7 +232,7 @@ func (r *resourceTFEDataRetentionPolicy) createDontDeleteRetentionPolicy(ctx con
233232

234233
func (r *resourceTFEDataRetentionPolicy) ensureOrganizationSetAfterApply(policy *modelTFEDataRetentionPolicy, diags *diag.Diagnostics) {
235234
if policy.Organization.IsUnknown() {
236-
workspace, err := r.config.Client.Workspaces.ReadByID(ctx, policy.WorkspaceId.ValueString())
235+
workspace, err := r.config.Client.Workspaces.ReadByID(ctx, policy.WorkspaceID.ValueString())
237236
if err != nil {
238237
diags.AddError("Unable to create data retention policy", err.Error())
239238
return
@@ -254,14 +253,14 @@ func (r *resourceTFEDataRetentionPolicy) Read(ctx context.Context, req resource.
254253

255254
var policy *tfe.DataRetentionPolicyChoice
256255
var err error
257-
if state.WorkspaceId.IsNull() {
256+
if state.WorkspaceID.IsNull() {
258257
policy, err = r.config.Client.Organizations.ReadDataRetentionPolicyChoice(ctx, state.Organization.ValueString())
259258
if err != nil {
260259
resp.Diagnostics.AddError("Failed to read data retention policy", err.Error())
261260
return
262261
}
263262
} else {
264-
policy, err = r.config.Client.Workspaces.ReadDataRetentionPolicyChoice(ctx, state.WorkspaceId.ValueString())
263+
policy, err = r.config.Client.Workspaces.ReadDataRetentionPolicyChoice(ctx, state.WorkspaceID.ValueString())
265264
if err != nil {
266265
resp.Diagnostics.AddError("Failed to read data retention policy", err.Error())
267266
return
@@ -295,59 +294,65 @@ func (r *resourceTFEDataRetentionPolicy) Delete(ctx context.Context, req resourc
295294
return
296295
}
297296

298-
if state.WorkspaceId.IsNull() {
297+
if state.WorkspaceID.IsNull() {
299298
tflog.Debug(ctx, fmt.Sprintf("Deleting data retention policy for organization: %s", state.Organization))
300299
err := r.config.Client.Organizations.DeleteDataRetentionPolicy(ctx, state.Organization.ValueString())
301300
if err != nil {
302301
resp.Diagnostics.AddError(fmt.Sprintf("Deleting data retention policy for organization: %s", state.Organization), err.Error())
303302
return
304303
}
305304
} else {
306-
tflog.Debug(ctx, fmt.Sprintf("Deleting data retention policy for workspace: %s", state.WorkspaceId))
307-
err := r.config.Client.Workspaces.DeleteDataRetentionPolicy(ctx, state.WorkspaceId.ValueString())
305+
tflog.Debug(ctx, fmt.Sprintf("Deleting data retention policy for workspace: %s", state.WorkspaceID))
306+
err := r.config.Client.Workspaces.DeleteDataRetentionPolicy(ctx, state.WorkspaceID.ValueString())
308307
if err != nil {
309-
resp.Diagnostics.AddError(fmt.Sprintf("Deleting data retention policy for workspace: %s", state.WorkspaceId), err.Error())
308+
resp.Diagnostics.AddError(fmt.Sprintf("Deleting data retention policy for workspace: %s", state.WorkspaceID), err.Error())
310309
return
311310
}
312311
}
313-
314312
}
315313

316314
func (r *resourceTFEDataRetentionPolicy) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
317315
s := strings.Split(req.ID, "/")
318-
if len(s) >= 3 {
316+
if len(s) >= 3 || len(s) == 0 {
319317
resp.Diagnostics.AddError("Error importing workspace settings", fmt.Sprintf(
320318
"invalid workspace input format: %s (expected <ORGANIZATION>/<WORKSPACE NAME> or <ORGANIZATION>)",
321319
req.ID,
322320
))
323-
} else if len(s) == 2 {
321+
return
322+
}
323+
324+
if len(s) == 2 {
324325
workspaceID, err := fetchWorkspaceExternalID(s[0]+"/"+s[1], r.config.Client)
325326
if err != nil {
326327
resp.Diagnostics.AddError("Error importing data retention policy", fmt.Sprintf(
327328
"error retrieving workspace with name %s from organization %s: %s", s[1], s[0], err.Error(),
328329
))
330+
return
329331
}
330332

331333
policy, err := r.config.Client.Workspaces.ReadDataRetentionPolicyChoice(ctx, workspaceID)
332334
if err != nil {
333335
resp.Diagnostics.AddError("Error importing data retention policy", fmt.Sprintf(
334336
"error retrieving data policy for workspace %s from organization %s: %s", s[1], s[0], err.Error(),
335337
))
338+
return
336339
}
337340

338341
req.ID = r.getPolicyID(policy)
339342
resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("workspace_id"), workspaceID)...)
340343
resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("organization"), s[0])...)
341-
} else if len(s) == 1 {
342-
policy, err := r.config.Client.Organizations.ReadDataRetentionPolicyChoice(ctx, s[0])
343-
if err != nil {
344-
resp.Diagnostics.AddError("Error importing data retention policy", fmt.Sprintf(
345-
"error retrieving data policy for organization %s: %s", s[0], err.Error(),
346-
))
347-
}
348-
req.ID = r.getPolicyID(policy)
349-
resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("organization"), s[0])...)
344+
return
345+
}
346+
347+
policy, err := r.config.Client.Organizations.ReadDataRetentionPolicyChoice(ctx, s[0])
348+
if err != nil {
349+
resp.Diagnostics.AddError("Error importing data retention policy", fmt.Sprintf(
350+
"error retrieving data policy for organization %s: %s", s[0], err.Error(),
351+
))
352+
return
350353
}
354+
req.ID = r.getPolicyID(policy)
355+
resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("organization"), s[0])...)
351356
}
352357

353358
func (r *resourceTFEDataRetentionPolicy) getPolicyID(policy *tfe.DataRetentionPolicyChoice) string {

0 commit comments

Comments
 (0)