Skip to content

Commit 2cbf2eb

Browse files
karmada-botkarmada-bot
authored
Merge pull request #191 from chaosi-zju/staticcheck6
chore: format code about revive
2 parents 2d0a968 + 081bf87 commit 2cbf2eb

File tree

57 files changed

+230
-233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+230
-233
lines changed

Diff for: ‎.golangci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ linters-settings:
7070
- name: dot-imports
7171
- name: errorf
7272
- name: exported
73+
arguments: ["disableStutteringCheck"] # TODO Temporarily disable stuttering check
7374
- name: var-declaration
7475
- name: blank-imports
7576
- name: indent-error-flow

Diff for: ‎cmd/api/app/api.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ import (
5353
"github.com/karmada-io/dashboard/pkg/environment"
5454
)
5555

56-
// NewApiCommand creates a *cobra.Command object with default parameters
57-
func NewApiCommand(ctx context.Context) *cobra.Command {
56+
// NewAPICommand creates a *cobra.Command object with default parameters
57+
func NewAPICommand(ctx context.Context) *cobra.Command {
5858
opts := options.NewOptions()
5959
cmd := &cobra.Command{
6060
Use: "karmada-dashboard-api",
6161
Long: `The karmada-dashboard-api provide api for karmada-dashboard web ui. It need to access host cluster apiserver and karmada apiserver internally, it will access host cluster apiserver for creating some resource like configmap in host cluster, meanwhile it will access karmada apiserver for interactiving for purpose of managing karmada-specific resources, like cluster、override policy、propagation policy and so on.`,
62-
RunE: func(cmd *cobra.Command, args []string) error {
62+
RunE: func(_ *cobra.Command, _ []string) error {
6363
// validate options
6464
//if errs := opts.Validate(); len(errs) != 0 {
6565
// return errs.ToAggregate()

Diff for: ‎cmd/api/app/routes/configmap/handler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
func handleGetConfigMap(c *gin.Context) {
29-
k8sClient := client.InClusterClientForKarmadaApiServer()
29+
k8sClient := client.InClusterClientForKarmadaAPIServer()
3030
dataSelect := common.ParseDataSelectPathParameter(c)
3131
nsQuery := common.ParseNamespacePathParameter(c)
3232
result, err := configmap.GetConfigMapList(k8sClient, nsQuery, dataSelect)
@@ -38,7 +38,7 @@ func handleGetConfigMap(c *gin.Context) {
3838
}
3939

4040
func handleGetConfigMapDetail(c *gin.Context) {
41-
k8sClient := client.InClusterClientForKarmadaApiServer()
41+
k8sClient := client.InClusterClientForKarmadaAPIServer()
4242
namespace := c.Param("namespace")
4343
name := c.Param("name")
4444
result, err := configmap.GetConfigMapDetail(k8sClient, namespace, name)

Diff for: ‎cmd/api/app/routes/cronjob/handler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
func handleGetCronJob(c *gin.Context) {
3030
namespace := common.ParseNamespacePathParameter(c)
3131
dataSelect := common.ParseDataSelectPathParameter(c)
32-
k8sClient := client.InClusterClientForKarmadaApiServer()
32+
k8sClient := client.InClusterClientForKarmadaAPIServer()
3333
result, err := cronjob.GetCronJobList(k8sClient, namespace, dataSelect)
3434
if err != nil {
3535
common.Fail(c, err)
@@ -41,7 +41,7 @@ func handleGetCronJob(c *gin.Context) {
4141
func handleGetCronJobDetail(c *gin.Context) {
4242
namespace := c.Param("namespace")
4343
name := c.Param("statefulset")
44-
k8sClient := client.InClusterClientForKarmadaApiServer()
44+
k8sClient := client.InClusterClientForKarmadaAPIServer()
4545
result, err := cronjob.GetCronJobDetail(k8sClient, namespace, name)
4646
if err != nil {
4747
common.Fail(c, err)
@@ -53,7 +53,7 @@ func handleGetCronJobDetail(c *gin.Context) {
5353
func handleGetCronJobEvents(c *gin.Context) {
5454
namespace := c.Param("namespace")
5555
name := c.Param("statefulset")
56-
k8sClient := client.InClusterClientForKarmadaApiServer()
56+
k8sClient := client.InClusterClientForKarmadaAPIServer()
5757
dataSelect := common.ParseDataSelectPathParameter(c)
5858
result, err := event.GetResourceEvents(k8sClient, dataSelect, namespace, name)
5959
if err != nil {

Diff for: ‎cmd/api/app/routes/daemonset/handler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
func handleGetDaemonset(c *gin.Context) {
3030
namespace := common.ParseNamespacePathParameter(c)
3131
dataSelect := common.ParseDataSelectPathParameter(c)
32-
k8sClient := client.InClusterClientForKarmadaApiServer()
32+
k8sClient := client.InClusterClientForKarmadaAPIServer()
3333
result, err := daemonset.GetDaemonSetList(k8sClient, namespace, dataSelect)
3434
if err != nil {
3535
common.Fail(c, err)
@@ -41,7 +41,7 @@ func handleGetDaemonset(c *gin.Context) {
4141
func handleGetDaemonsetDetail(c *gin.Context) {
4242
namespace := c.Param("namespace")
4343
name := c.Param("statefulset")
44-
k8sClient := client.InClusterClientForKarmadaApiServer()
44+
k8sClient := client.InClusterClientForKarmadaAPIServer()
4545
result, err := daemonset.GetDaemonSetDetail(k8sClient, namespace, name)
4646
if err != nil {
4747
common.Fail(c, err)
@@ -53,7 +53,7 @@ func handleGetDaemonsetDetail(c *gin.Context) {
5353
func handleGetDaemonsetEvents(c *gin.Context) {
5454
namespace := c.Param("namespace")
5555
name := c.Param("statefulset")
56-
k8sClient := client.InClusterClientForKarmadaApiServer()
56+
k8sClient := client.InClusterClientForKarmadaAPIServer()
5757
dataSelect := common.ParseDataSelectPathParameter(c)
5858
result, err := event.GetResourceEvents(k8sClient, dataSelect, namespace, name)
5959
if err != nil {

Diff for: ‎cmd/api/app/routes/deployment/handler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func handlerCreateDeployment(c *gin.Context) {
7070
func handleGetDeployments(c *gin.Context) {
7171
namespace := common.ParseNamespacePathParameter(c)
7272
dataSelect := common.ParseDataSelectPathParameter(c)
73-
k8sClient := client.InClusterClientForKarmadaApiServer()
73+
k8sClient := client.InClusterClientForKarmadaAPIServer()
7474
result, err := deployment.GetDeploymentList(k8sClient, namespace, dataSelect)
7575
if err != nil {
7676
common.Fail(c, err)
@@ -82,7 +82,7 @@ func handleGetDeployments(c *gin.Context) {
8282
func handleGetDeploymentDetail(c *gin.Context) {
8383
namespace := c.Param("namespace")
8484
name := c.Param("deployment")
85-
k8sClient := client.InClusterClientForKarmadaApiServer()
85+
k8sClient := client.InClusterClientForKarmadaAPIServer()
8686
result, err := deployment.GetDeploymentDetail(k8sClient, namespace, name)
8787
if err != nil {
8888
common.Fail(c, err)
@@ -94,7 +94,7 @@ func handleGetDeploymentDetail(c *gin.Context) {
9494
func handleGetDeploymentEvents(c *gin.Context) {
9595
namespace := c.Param("namespace")
9696
name := c.Param("deployment")
97-
k8sClient := client.InClusterClientForKarmadaApiServer()
97+
k8sClient := client.InClusterClientForKarmadaAPIServer()
9898
dataSelect := common.ParseDataSelectPathParameter(c)
9999
result, err := event.GetResourceEvents(k8sClient, dataSelect, namespace, name)
100100
if err != nil {

Diff for: ‎cmd/api/app/routes/ingress/handler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
func handleGetIngress(c *gin.Context) {
29-
k8sClient := client.InClusterClientForKarmadaApiServer()
29+
k8sClient := client.InClusterClientForKarmadaAPIServer()
3030
dataSelect := common.ParseDataSelectPathParameter(c)
3131
nsQuery := common.ParseNamespacePathParameter(c)
3232
result, err := ingress.GetIngressList(k8sClient, nsQuery, dataSelect)
@@ -38,7 +38,7 @@ func handleGetIngress(c *gin.Context) {
3838
}
3939

4040
func handleGetIngressDetail(c *gin.Context) {
41-
k8sClient := client.InClusterClientForKarmadaApiServer()
41+
k8sClient := client.InClusterClientForKarmadaAPIServer()
4242
namespace := c.Param("namespace")
4343
name := c.Param("service")
4444
result, err := ingress.GetIngressDetail(k8sClient, namespace, name)

Diff for: ‎cmd/api/app/routes/job/handler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
func handleGetJob(c *gin.Context) {
3030
namespace := common.ParseNamespacePathParameter(c)
3131
dataSelect := common.ParseDataSelectPathParameter(c)
32-
k8sClient := client.InClusterClientForKarmadaApiServer()
32+
k8sClient := client.InClusterClientForKarmadaAPIServer()
3333
result, err := job.GetJobList(k8sClient, namespace, dataSelect)
3434
if err != nil {
3535
common.Fail(c, err)
@@ -41,7 +41,7 @@ func handleGetJob(c *gin.Context) {
4141
func handleGetJobDetail(c *gin.Context) {
4242
namespace := c.Param("namespace")
4343
name := c.Param("statefulset")
44-
k8sClient := client.InClusterClientForKarmadaApiServer()
44+
k8sClient := client.InClusterClientForKarmadaAPIServer()
4545
result, err := job.GetJobDetail(k8sClient, namespace, name)
4646
if err != nil {
4747
common.Fail(c, err)
@@ -53,7 +53,7 @@ func handleGetJobDetail(c *gin.Context) {
5353
func handleGetJobEvents(c *gin.Context) {
5454
namespace := c.Param("namespace")
5555
name := c.Param("statefulset")
56-
k8sClient := client.InClusterClientForKarmadaApiServer()
56+
k8sClient := client.InClusterClientForKarmadaAPIServer()
5757
dataSelect := common.ParseDataSelectPathParameter(c)
5858
result, err := event.GetResourceEvents(k8sClient, dataSelect, namespace, name)
5959
if err != nil {

Diff for: ‎cmd/api/app/routes/member/member.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ limitations under the License.
1616

1717
package member
1818

19-
// Importing member route packages forces route registration
2019
import (
21-
_ "github.com/karmada-io/dashboard/cmd/api/app/routes/member/deployment"
22-
_ "github.com/karmada-io/dashboard/cmd/api/app/routes/member/namespace"
23-
_ "github.com/karmada-io/dashboard/cmd/api/app/routes/member/node"
24-
_ "github.com/karmada-io/dashboard/cmd/api/app/routes/member/pod"
20+
_ "github.com/karmada-io/dashboard/cmd/api/app/routes/member/deployment" // Importing member route packages forces route registration
21+
_ "github.com/karmada-io/dashboard/cmd/api/app/routes/member/namespace" // Importing member route packages forces route registration
22+
_ "github.com/karmada-io/dashboard/cmd/api/app/routes/member/node" // Importing member route packages forces route registration
23+
_ "github.com/karmada-io/dashboard/cmd/api/app/routes/member/pod" // Importing member route packages forces route registration
2524
)

Diff for: ‎cmd/api/app/routes/namespace/handler.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
)
2929

3030
func handleCreateNamespace(c *gin.Context) {
31-
k8sClient := client.InClusterClientForKarmadaApiServer()
31+
k8sClient := client.InClusterClientForKarmadaAPIServer()
3232
createNamespaceRequest := new(v1.CreateNamesapceRequest)
3333
if err := c.ShouldBind(&createNamespaceRequest); err != nil {
3434
common.Fail(c, err)
@@ -45,7 +45,7 @@ func handleCreateNamespace(c *gin.Context) {
4545
common.Success(c, "ok")
4646
}
4747
func handleGetNamespaces(c *gin.Context) {
48-
k8sClient := client.InClusterClientForKarmadaApiServer()
48+
k8sClient := client.InClusterClientForKarmadaAPIServer()
4949
dataSelect := common.ParseDataSelectPathParameter(c)
5050
result, err := ns.GetNamespaceList(k8sClient, dataSelect)
5151
if err != nil {
@@ -55,7 +55,7 @@ func handleGetNamespaces(c *gin.Context) {
5555
common.Success(c, result)
5656
}
5757
func handleGetNamespaceDetail(c *gin.Context) {
58-
k8sClient := client.InClusterClientForKarmadaApiServer()
58+
k8sClient := client.InClusterClientForKarmadaAPIServer()
5959
name := c.Param("name")
6060
result, err := ns.GetNamespaceDetail(k8sClient, name)
6161
if err != nil {
@@ -65,7 +65,7 @@ func handleGetNamespaceDetail(c *gin.Context) {
6565
common.Success(c, result)
6666
}
6767
func handleGetNamespaceEvents(c *gin.Context) {
68-
k8sClient := client.InClusterClientForKarmadaApiServer()
68+
k8sClient := client.InClusterClientForKarmadaAPIServer()
6969
name := c.Param("name")
7070
dataSelect := common.ParseDataSelectPathParameter(c)
7171
result, err := event.GetNamespaceEvents(k8sClient, dataSelect, name)

Diff for: ‎cmd/api/app/routes/overridepolicy/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func handleGetOverridePolicyList(c *gin.Context) {
3838
karmadaClient := client.InClusterKarmadaClient()
3939
dataSelect := common.ParseDataSelectPathParameter(c)
4040
namespace := common.ParseNamespacePathParameter(c)
41-
k8sClient := client.InClusterClientForKarmadaApiServer()
41+
k8sClient := client.InClusterClientForKarmadaAPIServer()
4242
overrideList, err := overridepolicy.GetOverridePolicyList(karmadaClient, k8sClient, namespace, dataSelect)
4343
if err != nil {
4444
klog.ErrorS(err, "Failed to GetOverridePolicyList")

Diff for: ‎cmd/api/app/routes/overview/misc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ func GetClusterResourceStatus() (*v1.ClusterResourceStatus, error) {
224224

225225
// handle cluster resources
226226
// handler namespace num
227-
kubeClient := client.InClusterClientForKarmadaApiServer()
227+
kubeClient := client.InClusterClientForKarmadaAPIServer()
228228
nsRet, err := kubeClient.CoreV1().Namespaces().List(ctx, metav1.ListOptions{})
229229
if err != nil {
230230
return nil, err

Diff for: ‎cmd/api/app/routes/propagationpolicy/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func handleGetPropagationPolicyList(c *gin.Context) {
3838
karmadaClient := client.InClusterKarmadaClient()
3939
dataSelect := common.ParseDataSelectPathParameter(c)
4040
namespace := common.ParseNamespacePathParameter(c)
41-
k8sClient := client.InClusterClientForKarmadaApiServer()
41+
k8sClient := client.InClusterClientForKarmadaAPIServer()
4242
propagationList, err := propagationpolicy.GetPropagationPolicyList(karmadaClient, k8sClient, namespace, dataSelect)
4343
if err != nil {
4444
klog.ErrorS(err, "Failed to GetPropagationPolicyList")

Diff for: ‎cmd/api/app/routes/secret/handler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
func handleGetSecrets(c *gin.Context) {
29-
k8sClient := client.InClusterClientForKarmadaApiServer()
29+
k8sClient := client.InClusterClientForKarmadaAPIServer()
3030
dataSelect := common.ParseDataSelectPathParameter(c)
3131
nsQuery := common.ParseNamespacePathParameter(c)
3232
result, err := secret.GetSecretList(k8sClient, nsQuery, dataSelect)
@@ -38,7 +38,7 @@ func handleGetSecrets(c *gin.Context) {
3838
}
3939

4040
func handleGetSecretDetail(c *gin.Context) {
41-
k8sClient := client.InClusterClientForKarmadaApiServer()
41+
k8sClient := client.InClusterClientForKarmadaAPIServer()
4242
namespace := c.Param("namespace")
4343
name := c.Param("service")
4444
result, err := secret.GetSecretDetail(k8sClient, namespace, name)

Diff for: ‎cmd/api/app/routes/service/handler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
func handleGetServices(c *gin.Context) {
29-
k8sClient := client.InClusterClientForKarmadaApiServer()
29+
k8sClient := client.InClusterClientForKarmadaAPIServer()
3030
dataSelect := common.ParseDataSelectPathParameter(c)
3131
nsQuery := common.ParseNamespacePathParameter(c)
3232
result, err := service.GetServiceList(k8sClient, nsQuery, dataSelect)
@@ -38,7 +38,7 @@ func handleGetServices(c *gin.Context) {
3838
}
3939

4040
func handleGetServiceDetail(c *gin.Context) {
41-
k8sClient := client.InClusterClientForKarmadaApiServer()
41+
k8sClient := client.InClusterClientForKarmadaAPIServer()
4242
namespace := c.Param("namespace")
4343
name := c.Param("service")
4444
result, err := service.GetServiceDetail(k8sClient, namespace, name)
@@ -50,7 +50,7 @@ func handleGetServiceDetail(c *gin.Context) {
5050
}
5151

5252
func handleGetServiceEvents(c *gin.Context) {
53-
k8sClient := client.InClusterClientForKarmadaApiServer()
53+
k8sClient := client.InClusterClientForKarmadaAPIServer()
5454
namespace := c.Param("namespace")
5555
name := c.Param("service")
5656
dataSelect := common.ParseDataSelectPathParameter(c)

Diff for: ‎cmd/api/app/routes/statefulset/handler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
func handleGetStatefulsets(c *gin.Context) {
3030
namespace := common.ParseNamespacePathParameter(c)
3131
dataSelect := common.ParseDataSelectPathParameter(c)
32-
k8sClient := client.InClusterClientForKarmadaApiServer()
32+
k8sClient := client.InClusterClientForKarmadaAPIServer()
3333
result, err := statefulset.GetStatefulSetList(k8sClient, namespace, dataSelect)
3434
if err != nil {
3535
common.Fail(c, err)
@@ -41,7 +41,7 @@ func handleGetStatefulsets(c *gin.Context) {
4141
func handleGetStatefulsetDetail(c *gin.Context) {
4242
namespace := c.Param("namespace")
4343
name := c.Param("statefulset")
44-
k8sClient := client.InClusterClientForKarmadaApiServer()
44+
k8sClient := client.InClusterClientForKarmadaAPIServer()
4545
result, err := statefulset.GetStatefulSetDetail(k8sClient, namespace, name)
4646
if err != nil {
4747
common.Fail(c, err)
@@ -53,7 +53,7 @@ func handleGetStatefulsetDetail(c *gin.Context) {
5353
func handleGetStatefulsetEvents(c *gin.Context) {
5454
namespace := c.Param("namespace")
5555
name := c.Param("statefulset")
56-
k8sClient := client.InClusterClientForKarmadaApiServer()
56+
k8sClient := client.InClusterClientForKarmadaAPIServer()
5757
dataSelect := common.ParseDataSelectPathParameter(c)
5858
result, err := event.GetResourceEvents(k8sClient, dataSelect, namespace, name)
5959
if err != nil {

Diff for: ‎cmd/api/app/types/api/v1/cluster.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type PostClusterResponse struct {
3838
}
3939

4040
// LabelRequest is the request body for labeling a cluster.
41-
type LableRequest struct {
41+
type LabelRequest struct {
4242
Key string `json:"key"`
4343
Value string `json:"value"`
4444
}
@@ -52,7 +52,7 @@ type TaintRequest struct {
5252

5353
// PutClusterRequest is the request body for updating a cluster.
5454
type PutClusterRequest struct {
55-
Labels *[]LableRequest `json:"labels"`
55+
Labels *[]LabelRequest `json:"labels"`
5656
Taints *[]TaintRequest `json:"taints"`
5757
}
5858

Diff for: ‎cmd/api/app/types/common/request.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func ParseDataSelectPathParameter(request *gin.Context) *dataselect.DataSelectQu
5858
return dataselect.NewDataSelectQuery(paginationQuery, sortQuery, filterQuery)
5959
}
6060

61-
// parseNamespacePathParameter parses namespace selector for list pages in path parameter.
61+
// ParseNamespacePathParameter parses namespace selector for list pages in path parameter.
6262
// The namespace selector is a comma separated list of namespaces that are trimmed.
6363
// No namespaces mean "view all user namespaces", i.e., everything except kube-system.
6464
func ParseNamespacePathParameter(request *gin.Context) *common.NamespaceQuery {

Diff for: ‎cmd/api/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
func main() {
2929
ctx := context.TODO()
30-
cmd := app.NewApiCommand(ctx)
30+
cmd := app.NewAPICommand(ctx)
3131
code := cli.Run(cmd)
3232
os.Exit(code)
3333
}

Diff for: ‎cmd/metrics-scraper/app/metricsscraper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func NewMetricsScraperCommand(ctx context.Context) *cobra.Command {
4141
cmd := &cobra.Command{
4242
Use: "karmada-dashboard-metrics-scraper",
4343
Long: `The karmada-dashboard-metrics-scraper responsible for scraping and visualizing the metrics of karmada components. `,
44-
RunE: func(cmd *cobra.Command, args []string) error {
44+
RunE: func(_ *cobra.Command, _ []string) error {
4545
if err := run(ctx, opts); err != nil {
4646
return err
4747
}

Diff for: ‎cmd/metrics-scraper/app/scrape/db.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var (
2828
dbMapLock sync.RWMutex
2929
)
3030

31-
// getDB returns an existing database connection or creates a new one
31+
// GetDB returns an existing database connection or creates a new one
3232
func GetDB(appName string) (*sql.DB, error) {
3333
sanitizedAppName := strings.ReplaceAll(appName, "-", "_")
3434

Diff for: ‎cmd/metrics-scraper/app/scrape/other.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"sync"
2626
"time"
2727

28-
_ "github.com/glebarez/sqlite"
28+
_ "github.com/glebarez/sqlite" // Import the SQLite driver
2929
"github.com/prometheus/common/expfmt"
3030

3131
"github.com/karmada-io/dashboard/cmd/metrics-scraper/app/db"

0 commit comments

Comments
 (0)