Skip to content

Fix shadowed var #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 14, 2024
Merged

Fix shadowed var #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf27351
Added config
dylanratcliffe Feb 14, 2024
713446b
Fixed variable shadowing
dylanratcliffe Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/changes_get_change.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ fetch:
for {
// use the variable to avoid shadowing
var err error
riskRes, err := client.GetChangeRisks(ctx, &connect.Request[sdp.GetChangeRisksRequest]{
riskRes, err = client.GetChangeRisks(ctx, &connect.Request[sdp.GetChangeRisksRequest]{
Msg: &sdp.GetChangeRisksRequest{
UUID: changeUuid[:],
},
Expand Down
16 changes: 8 additions & 8 deletions cmd/changes_submit_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ func mappedItemDiffsFromPlan(ctx context.Context, fileName string, lf log.Fields
return nil, fmt.Errorf("failed to parse '%v': %w", fileName, err)
}

plannedChangeGroups := plannedChangeGroups{
plannedChangeGroupsVar := plannedChangeGroups{
supported: map[string][]*sdp.MappedItemDiff{},
unsupported: map[string][]*sdp.MappedItemDiff{},
}
Expand All @@ -343,7 +343,7 @@ func mappedItemDiffsFromPlan(ctx context.Context, fileName string, lf log.Fields

if len(mappings) == 0 {
log.WithContext(ctx).WithFields(lf).WithField("terraform-address", resourceChange.Address).Debug("Skipping unmapped resource")
plannedChangeGroups.Add(resourceChange.Type, &sdp.MappedItemDiff{
plannedChangeGroupsVar.Add(resourceChange.Type, &sdp.MappedItemDiff{
Item: itemDiff,
MappingQuery: nil, // unmapped item has no mapping query
})
Expand Down Expand Up @@ -461,7 +461,7 @@ func mappedItemDiffsFromPlan(ctx context.Context, fileName string, lf log.Fields
}
}

plannedChangeGroups.Add(resourceChange.Type, &sdp.MappedItemDiff{
plannedChangeGroupsVar.Add(resourceChange.Type, &sdp.MappedItemDiff{
Item: itemDiff,
MappingQuery: newQuery,
})
Expand All @@ -476,13 +476,13 @@ func mappedItemDiffsFromPlan(ctx context.Context, fileName string, lf log.Fields
}

supported := ""
numSupported := plannedChangeGroups.NumSupportedChanges()
numSupported := plannedChangeGroupsVar.NumSupportedChanges()
if numSupported > 0 {
supported = Green.Color(fmt.Sprintf("%v supported", numSupported))
}

unsupported := ""
numUnsupported := plannedChangeGroups.NumUnsupportedChanges()
numUnsupported := plannedChangeGroupsVar.NumUnsupportedChanges()
if numUnsupported > 0 {
unsupported = Yellow.Color(fmt.Sprintf("%v unsupported", numUnsupported))
}
Expand All @@ -499,14 +499,14 @@ func mappedItemDiffsFromPlan(ctx context.Context, fileName string, lf log.Fields
}

// Log the types
for typ, plannedChanges := range plannedChangeGroups.supported {
for typ, plannedChanges := range plannedChangeGroupsVar.supported {
log.WithContext(ctx).Infof(Green.Color(" ✓ %v (%v)"), typ, len(plannedChanges))
}
for typ, plannedChanges := range plannedChangeGroups.unsupported {
for typ, plannedChanges := range plannedChangeGroupsVar.unsupported {
log.WithContext(ctx).Infof(Yellow.Color(" ✗ %v (%v)"), typ, len(plannedChanges))
}

return plannedChangeGroups.MappedItemDiffs(), nil
return plannedChangeGroupsVar.MappedItemDiffs(), nil
}

func changeTitle(arg string) string {
Expand Down