Skip to content

Commit 15ae8ef

Browse files
authored
direct: internal cleanups: rm unnecessary check; update comments (#3461)
1 parent 81b302e commit 15ae8ef

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

bundle/terranova/plan.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ func CalculatePlanForDeploy(ctx context.Context, b *bundle.Bundle) error {
151151
}
152152

153153
if b.Graph.HasOutgoingEdges(node) && actionType.KeepsID() {
154+
// Now that we know that ID of this node is not going to change, update it
155+
// everywhere to actual value to calculate more accurate and more conservative plan.
154156
err = resolveIDReference(ctx, b, pl.group, pl.resourceName)
155157
if err != nil {
156158
logdiag.LogError(ctx, fmt.Errorf("failed to replace ref to resources.%s.%s.id: %w", pl.group, pl.resourceName, err))

bundle/terranova/tnresources/job.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ type ResourceJob struct {
1717
func NewResourceJob(client *databricks.WorkspaceClient, job *resources.Job) (*ResourceJob, error) {
1818
return &ResourceJob{
1919
client: client,
20-
// TODO Use Processor with explicit field mapping
2120
config: job.JobSettings,
2221
}, nil
2322
}
@@ -65,6 +64,8 @@ func (r *ResourceJob) WaitAfterUpdate(ctx context.Context) error {
6564
}
6665

6766
func makeCreateJob(config jobs.JobSettings) (jobs.CreateJob, error) {
67+
// Note, exhaustruct linter validates that all off CreateJob fields are initialized.
68+
// We don't have linter that validates that all of config fields are used.
6869
result := jobs.CreateJob{
6970
AccessControlList: nil, // Not supported by DABs
7071
BudgetPolicyId: config.BudgetPolicyId,
@@ -92,12 +93,9 @@ func makeCreateJob(config jobs.JobSettings) (jobs.CreateJob, error) {
9293
Trigger: config.Trigger,
9394
UsagePolicyId: config.UsagePolicyId,
9495
WebhookNotifications: config.WebhookNotifications,
95-
96-
ForceSendFields: filterFields[jobs.CreateJob](config.ForceSendFields),
96+
ForceSendFields: filterFields[jobs.CreateJob](config.ForceSendFields),
9797
}
9898

99-
// TODO: Validate copy - all fields must be initialized or explicitly allowed to be empty
100-
// Unset AccessControlList
10199
return result, nil
102100
}
103101

@@ -106,7 +104,9 @@ func makeResetJob(config jobs.JobSettings, id string) (jobs.ResetJob, error) {
106104
if err != nil {
107105
return jobs.ResetJob{}, err
108106
}
109-
result := jobs.ResetJob{JobId: idInt, NewSettings: config}
110-
// TODO: Validate copy - all fields must be initialized or explicitly allowed to be empty
107+
result := jobs.ResetJob{
108+
JobId: idInt,
109+
NewSettings: config,
110+
}
111111
return result, err
112112
}

bundle/terranova/tnresources/volume.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,7 @@ func (r *ResourceVolume) DoUpdateWithID(ctx context.Context, id string) (string,
9898
}
9999

100100
func DeleteVolume(ctx context.Context, client *databricks.WorkspaceClient, id string) error {
101-
err := client.Volumes.DeleteByName(ctx, id)
102-
if err != nil {
103-
return err
104-
}
105-
return nil
101+
return client.Volumes.DeleteByName(ctx, id)
106102
}
107103

108104
func (r *ResourceVolume) WaitAfterCreate(ctx context.Context) error {

0 commit comments

Comments
 (0)