Skip to content

Commit 5f6abb7

Browse files
committed
chore: satisfy golangci-lint for cockpit updates
1 parent 4c022ef commit 5f6abb7

File tree

6 files changed

+15
-8
lines changed

6 files changed

+15
-8
lines changed

internal/services/cockpit/alert_manager.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ func ResourceCockpitAlertManagerCreate(ctx context.Context, d *schema.ResourceDa
7878
if err != nil {
7979
return diag.FromErr(err)
8080
}
81+
8182
_ = d.Set("project_id", projectID)
8283
}
84+
8385
contactPoints := d.Get("contact_points").([]any)
8486

8587
_, err = api.EnableAlertManager(&cockpit.RegionalAPIEnableAlertManagerRequest{
@@ -187,6 +189,7 @@ func ResourceCockpitAlertManagerRead(ctx context.Context, d *schema.ResourceData
187189
}
188190

189191
alertStatusMap := make(map[string]cockpit.AlertStatus)
192+
190193
for _, alert := range alerts.Alerts {
191194
if alert.PreconfiguredData != nil && alert.PreconfiguredData.PreconfiguredRuleID != "" {
192195
alertStatusMap[alert.PreconfiguredData.PreconfiguredRuleID] = alert.RuleStatus
@@ -196,6 +199,7 @@ func ResourceCockpitAlertManagerRead(ctx context.Context, d *schema.ResourceData
196199
if v, ok := d.GetOk("preconfigured_alert_ids"); ok {
197200
requestedIDs := expandStringSet(v.(*schema.Set))
198201
requestedMap := make(map[string]bool)
202+
199203
for _, id := range requestedIDs {
200204
requestedMap[id] = true
201205
}

internal/services/cockpit/alert_manager_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ func testAccCheckPreconfiguredAlertsCount(tt *acctest.TestTools, resourceName st
409409
}
410410

411411
actualCountStr := rs.Primary.Attributes["preconfigured_alert_ids.#"]
412+
412413
actualCount, err := strconv.Atoi(actualCountStr)
413414
if err != nil {
414415
return fmt.Errorf("failed to parse preconfigured_alert_ids count: %w", err)
@@ -423,7 +424,8 @@ func testAccCheckPreconfiguredAlertsCount(tt *acctest.TestTools, resourceName st
423424
region := scw.Region(rs.Primary.Attributes["region"])
424425

425426
userRequestedIDs := make(map[string]bool)
426-
for i := 0; i < actualCount; i++ {
427+
428+
for i := range actualCount {
427429
alertID := rs.Primary.Attributes[fmt.Sprintf("preconfigured_alert_ids.%d", i)]
428430
if alertID != "" {
429431
userRequestedIDs[alertID] = true

internal/services/cockpit/grafana_user.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func ResourceCockpitGrafanaUserCreate(ctx context.Context, d *schema.ResourceDat
7272
login := d.Get("login").(string)
7373
role := cockpit.GrafanaUserRole(d.Get("role").(string))
7474

75-
grafanaUser, err := api.CreateGrafanaUser(&cockpit.GlobalAPICreateGrafanaUserRequest{
75+
grafanaUser, err := api.CreateGrafanaUser(&cockpit.GlobalAPICreateGrafanaUserRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
7676
ProjectID: projectID,
7777
Login: login,
7878
Role: role,
@@ -93,7 +93,7 @@ func ResourceCockpitGrafanaUserRead(ctx context.Context, d *schema.ResourceData,
9393
return diag.FromErr(err)
9494
}
9595

96-
res, err := api.ListGrafanaUsers(&cockpit.GlobalAPIListGrafanaUsersRequest{
96+
res, err := api.ListGrafanaUsers(&cockpit.GlobalAPIListGrafanaUsersRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
9797
ProjectID: projectID,
9898
}, scw.WithContext(ctx), scw.WithAllPages())
9999
if err != nil {
@@ -149,7 +149,7 @@ func ResourceCockpitGrafanaUserDelete(ctx context.Context, d *schema.ResourceDat
149149
return diag.FromErr(err)
150150
}
151151

152-
err = api.DeleteGrafanaUser(&cockpit.GlobalAPIDeleteGrafanaUserRequest{
152+
err = api.DeleteGrafanaUser(&cockpit.GlobalAPIDeleteGrafanaUserRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
153153
ProjectID: projectID,
154154
GrafanaUserID: grafanaUserID,
155155
}, scw.WithContext(ctx))

internal/services/cockpit/grafana_user_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func isGrafanaUserPresent(tt *acctest.TestTools, n string) resource.TestCheckFun
132132
return err
133133
}
134134

135-
res, err := api.ListGrafanaUsers(&cockpitSDK.GlobalAPIListGrafanaUsersRequest{
135+
res, err := api.ListGrafanaUsers(&cockpitSDK.GlobalAPIListGrafanaUsersRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
136136
ProjectID: projectID,
137137
}, scw.WithAllPages())
138138
if err != nil {
@@ -169,7 +169,7 @@ func isGrafanaUserDestroyed(tt *acctest.TestTools) resource.TestCheckFunc {
169169
return err
170170
}
171171

172-
err = api.DeleteGrafanaUser(&cockpitSDK.GlobalAPIDeleteGrafanaUserRequest{
172+
err = api.DeleteGrafanaUser(&cockpitSDK.GlobalAPIDeleteGrafanaUserRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
173173
ProjectID: projectID,
174174
GrafanaUserID: grafanaUserID,
175175
})

internal/services/cockpit/preconfigured_alert_data_source.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ func dataSourceCockpitPreconfiguredAlertRead(ctx context.Context, d *schema.Reso
116116
if err != nil {
117117
return diag.FromErr(err)
118118
}
119+
119120
projectID = defaultProjectID
120121
}
121122

internal/services/cockpit/testfuncs/sweep.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func testSweepCockpitGrafanaUser(_ string) error {
8888
continue
8989
}
9090

91-
listGrafanaUsers, err := cockpitAPI.ListGrafanaUsers(&cockpit.GlobalAPIListGrafanaUsersRequest{
91+
listGrafanaUsers, err := cockpitAPI.ListGrafanaUsers(&cockpit.GlobalAPIListGrafanaUsersRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
9292
ProjectID: project.ID,
9393
}, scw.WithAllPages())
9494
if err != nil {
@@ -100,7 +100,7 @@ func testSweepCockpitGrafanaUser(_ string) error {
100100
}
101101

102102
for _, grafanaUser := range listGrafanaUsers.GrafanaUsers {
103-
err = cockpitAPI.DeleteGrafanaUser(&cockpit.GlobalAPIDeleteGrafanaUserRequest{
103+
err = cockpitAPI.DeleteGrafanaUser(&cockpit.GlobalAPIDeleteGrafanaUserRequest{ //nolint:staticcheck // legacy Grafana user resource uses deprecated API
104104
ProjectID: project.ID,
105105
GrafanaUserID: grafanaUser.ID,
106106
})

0 commit comments

Comments
 (0)