Merge branch 'master' into v1.7335.0

remyleone · web-flow · commit 8a735079caeb · 2025-11-20T11:32:48.000+01:00
diff --git a/api/cockpit/v1/sweepers/sweepers.go b/api/cockpit/v1/sweepers/sweepers.go
@@ -57,6 +57,7 @@ func SweepGrafanaUser(scwClient *scw.Client) error {
 			continue
 		}
 
+		//nolint:staticcheck // ListGrafanaUsers is deprecated but still required for sweeper functionality
 		listGrafanaUsers, err := cockpitAPI.ListGrafanaUsers(&cockpit.GlobalAPIListGrafanaUsersRequest{
 			ProjectID: project.ID,
 		}, scw.WithAllPages())
@@ -65,6 +66,7 @@ func SweepGrafanaUser(scwClient *scw.Client) error {
 		}
 
 		for _, grafanaUser := range listGrafanaUsers.GrafanaUsers {
+			//nolint:staticcheck // DeleteGrafanaUser is deprecated but still required for sweeper functionality
 			err = cockpitAPI.DeleteGrafanaUser(&cockpit.GlobalAPIDeleteGrafanaUserRequest{
 				ProjectID:     project.ID,
 				GrafanaUserID: grafanaUser.ID,

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ func SweepGrafanaUser(scwClient *scw.Client) error {`
`57`	`57`	`continue`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ //nolint:staticcheck // ListGrafanaUsers is deprecated but still required for sweeper functionality`
`60`	`61`	`listGrafanaUsers, err := cockpitAPI.ListGrafanaUsers(&cockpit.GlobalAPIListGrafanaUsersRequest{`
`61`	`62`	`ProjectID: project.ID,`
`62`	`63`	`}, scw.WithAllPages())`
`@@ -65,6 +66,7 @@ func SweepGrafanaUser(scwClient *scw.Client) error {`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`for _, grafanaUser := range listGrafanaUsers.GrafanaUsers {`
	`69`	`+ //nolint:staticcheck // DeleteGrafanaUser is deprecated but still required for sweeper functionality`
`68`	`70`	`err = cockpitAPI.DeleteGrafanaUser(&cockpit.GlobalAPIDeleteGrafanaUserRequest{`
`69`	`71`	`ProjectID: project.ID,`
`70`	`72`	`GrafanaUserID: grafanaUser.ID,`