Skip to content

Commit 3d0967b

Browse files
karmada-botkarmada-bot
authored
Merge pull request #188 from chaosi-zju/staticcheck2
chore: format code about errcheck,gosimple,ineffassign,unused
2 parents 69430ec + 3408ec7 commit 3d0967b

File tree

13 files changed

+29
-151
lines changed

13 files changed

+29
-151
lines changed

‎cmd/api/app/api.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,8 @@ func run(ctx context.Context, opts *options.Options) error {
111111
ensureAPIServerConnectionOrDie()
112112
serve(opts)
113113
config.InitDashboardConfig(client.InClusterClient(), ctx.Done())
114-
select {
115-
case <-ctx.Done():
116-
os.Exit(0)
117-
}
114+
<-ctx.Done()
115+
os.Exit(0)
118116
return nil
119117
}
120118

‎cmd/api/app/routes/cluster/accesscluster.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func (o pullModeOption) makeKarmadaAgentDeployment() *appsv1.Deployment {
187187
//fmt.Sprintf("--controllers=%s", strings.Join(controllers, ",")),
188188
//fmt.Sprintf("--proxy-server-address=%s", proxyServerAddress),
189189
//fmt.Sprintf("--leader-elect-resource-namespace=%s", o.memberClusterNamespace),
190-
fmt.Sprintf("--feature-gates=CustomizedClusterResourceModeling=true,MultiClusterService=true"),
190+
"--feature-gates=CustomizedClusterResourceModeling=true,MultiClusterService=true",
191191
"--cluster-status-update-frequency=10s",
192192
"--bind-address=0.0.0.0",
193193
"--secure-port=10357",

‎cmd/api/app/routes/cluster/handler.go

-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ func handleDeleteCluster(c *gin.Context) {
223223
return
224224
}
225225
common.Success(c, "ok")
226-
return
227226
}
228227

229228
func parseEndpointFromKubeconfig(kubeconfigContents string) (string, error) {

‎cmd/api/app/routes/clusteroverridepolicy/handler.go

-42
Original file line numberDiff line numberDiff line change
@@ -91,48 +91,6 @@ func handlePostClusterOverridePolicy(c *gin.Context) {
9191
common.Success(c, "ok")
9292
}
9393

94-
func handlePutClusterOverridePolicy(c *gin.Context) {
95-
ctx := context.Context(c)
96-
overridepolicyRequest := new(v1.PutOverridePolicyRequest)
97-
if err := c.ShouldBind(&overridepolicyRequest); err != nil {
98-
common.Fail(c, err)
99-
return
100-
}
101-
var err error
102-
karmadaClient := client.InClusterKarmadaClient()
103-
// todo check pp exist
104-
if overridepolicyRequest.IsClusterScope {
105-
clusterOverridePolicy := v1alpha1.ClusterOverridePolicy{}
106-
if err = yaml.Unmarshal([]byte(overridepolicyRequest.OverrideData), &clusterOverridePolicy); err != nil {
107-
klog.ErrorS(err, "Failed to unmarshal ClusterOverridePolicy")
108-
common.Fail(c, err)
109-
return
110-
}
111-
_, err = karmadaClient.PolicyV1alpha1().ClusterOverridePolicies().Update(ctx, &clusterOverridePolicy, metav1.UpdateOptions{})
112-
} else {
113-
overridePolicy := v1alpha1.OverridePolicy{}
114-
if err = yaml.Unmarshal([]byte(overridepolicyRequest.OverrideData), &overridePolicy); err != nil {
115-
klog.ErrorS(err, "Failed to unmarshal OverridePolicy")
116-
common.Fail(c, err)
117-
return
118-
}
119-
var oldPropagationPolicy *v1alpha1.OverridePolicy
120-
oldPropagationPolicy, err = karmadaClient.PolicyV1alpha1().OverridePolicies(overridepolicyRequest.Namespace).Get(ctx, overridepolicyRequest.Name, metav1.GetOptions{})
121-
if err == nil {
122-
// only spec can be updated
123-
overridePolicy.TypeMeta = oldPropagationPolicy.TypeMeta
124-
overridePolicy.ObjectMeta = oldPropagationPolicy.ObjectMeta
125-
_, err = karmadaClient.PolicyV1alpha1().OverridePolicies(overridepolicyRequest.Namespace).Update(ctx, &overridePolicy, metav1.UpdateOptions{})
126-
}
127-
}
128-
if err != nil {
129-
klog.ErrorS(err, "Failed to update OverridePolicy")
130-
common.Fail(c, err)
131-
return
132-
}
133-
common.Success(c, "ok")
134-
}
135-
13694
func init() {
13795
r := router.V1()
13896
r.GET("/clusteroverridepolicy", handleGetClusterOverridePolicyList)

‎cmd/api/app/routes/clusterpropagationpolicy/handler.go

-80
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,13 @@ import (
2222
"github.com/gin-gonic/gin"
2323
"github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
25-
"k8s.io/client-go/util/retry"
2625
"k8s.io/klog/v2"
2726
"sigs.k8s.io/yaml"
2827

2928
"github.com/karmada-io/dashboard/cmd/api/app/router"
3029
v1 "github.com/karmada-io/dashboard/cmd/api/app/types/api/v1"
3130
"github.com/karmada-io/dashboard/cmd/api/app/types/common"
3231
"github.com/karmada-io/dashboard/pkg/client"
33-
"github.com/karmada-io/dashboard/pkg/common/errors"
3432
"github.com/karmada-io/dashboard/pkg/resource/clusterpropagationpolicy"
3533
)
3634

@@ -93,84 +91,6 @@ func handlePostClusterPropagationPolicy(c *gin.Context) {
9391
common.Success(c, "ok")
9492
}
9593

96-
func handlePutClusterPropagationPolicy(c *gin.Context) {
97-
ctx := context.Context(c)
98-
propagationpolicyRequest := new(v1.PutPropagationPolicyRequest)
99-
if err := c.ShouldBind(&propagationpolicyRequest); err != nil {
100-
common.Fail(c, err)
101-
return
102-
}
103-
var err error
104-
karmadaClient := client.InClusterKarmadaClient()
105-
// todo check pp exist
106-
if propagationpolicyRequest.IsClusterScope {
107-
clusterPropagationPolicy := v1alpha1.ClusterPropagationPolicy{}
108-
if err = yaml.Unmarshal([]byte(propagationpolicyRequest.PropagationData), &clusterPropagationPolicy); err != nil {
109-
klog.ErrorS(err, "Failed to unmarshal ClusterPropagationPolicy")
110-
common.Fail(c, err)
111-
return
112-
}
113-
_, err = karmadaClient.PolicyV1alpha1().ClusterPropagationPolicies().Update(ctx, &clusterPropagationPolicy, metav1.UpdateOptions{})
114-
} else {
115-
propagationPolicy := v1alpha1.PropagationPolicy{}
116-
if err = yaml.Unmarshal([]byte(propagationpolicyRequest.PropagationData), &propagationPolicy); err != nil {
117-
klog.ErrorS(err, "Failed to unmarshal PropagationPolicy")
118-
common.Fail(c, err)
119-
return
120-
}
121-
var oldPropagationPolicy *v1alpha1.PropagationPolicy
122-
oldPropagationPolicy, err = karmadaClient.PolicyV1alpha1().PropagationPolicies(propagationpolicyRequest.Namespace).Get(ctx, propagationpolicyRequest.Name, metav1.GetOptions{})
123-
if err == nil {
124-
// only spec can be updated
125-
propagationPolicy.TypeMeta = oldPropagationPolicy.TypeMeta
126-
propagationPolicy.ObjectMeta = oldPropagationPolicy.ObjectMeta
127-
_, err = karmadaClient.PolicyV1alpha1().PropagationPolicies(propagationpolicyRequest.Namespace).Update(ctx, &propagationPolicy, metav1.UpdateOptions{})
128-
}
129-
}
130-
if err != nil {
131-
klog.ErrorS(err, "Failed to update PropagationPolicy")
132-
common.Fail(c, err)
133-
return
134-
}
135-
common.Success(c, "ok")
136-
}
137-
func handleDeleteClusterPropagationPolicy(c *gin.Context) {
138-
ctx := context.Context(c)
139-
propagationpolicyRequest := new(v1.DeletePropagationPolicyRequest)
140-
if err := c.ShouldBind(&propagationpolicyRequest); err != nil {
141-
common.Fail(c, err)
142-
return
143-
}
144-
var err error
145-
karmadaClient := client.InClusterKarmadaClient()
146-
if propagationpolicyRequest.IsClusterScope {
147-
err = karmadaClient.PolicyV1alpha1().ClusterPropagationPolicies().Delete(ctx, propagationpolicyRequest.Name, metav1.DeleteOptions{})
148-
if err != nil {
149-
klog.ErrorS(err, "Failed to delete PropagationPolicy")
150-
common.Fail(c, err)
151-
return
152-
}
153-
} else {
154-
err = karmadaClient.PolicyV1alpha1().PropagationPolicies(propagationpolicyRequest.Namespace).Delete(ctx, propagationpolicyRequest.Name, metav1.DeleteOptions{})
155-
if err != nil {
156-
klog.ErrorS(err, "Failed to delete PropagationPolicy")
157-
common.Fail(c, err)
158-
return
159-
}
160-
_ = retry.OnError(
161-
retry.DefaultRetry,
162-
func(err error) bool {
163-
return errors.IsNotFound(err)
164-
},
165-
func() error {
166-
_, getErr := karmadaClient.PolicyV1alpha1().PropagationPolicies(propagationpolicyRequest.Namespace).Get(ctx, propagationpolicyRequest.Name, metav1.GetOptions{})
167-
return getErr
168-
})
169-
}
170-
171-
common.Success(c, "ok")
172-
}
173-
17494
func init() {
17595
r := router.V1()
17696
r.GET("/clusterpropagationpolicy", handleGetClusterPropagationPolicyList)

‎cmd/metrics-scraper/app/metricsscraper.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,8 @@ func run(ctx context.Context, opts *options.Options) error {
9191
go scrape.InitDatabase()
9292

9393
config.InitDashboardConfig(client.InClusterClient(), ctx.Done())
94-
select {
95-
case <-ctx.Done():
96-
os.Exit(0)
97-
}
94+
<-ctx.Done()
95+
os.Exit(0)
9896
return nil
9997
}
10098

‎cmd/metrics-scraper/app/routes/metrics/handlerqueries.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ func QueryMetrics(c *gin.Context) {
5959
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to start transaction"})
6060
return
6161
}
62-
defer tx.Rollback()
62+
defer func() {
63+
_ = tx.Rollback()
64+
}()
6365

6466
switch queryType {
6567
case "mname":

‎cmd/metrics-scraper/app/scrape/other.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ func saveToDBWithConnection(db *sql.DB, appName, podName string, data *db.Parsed
4747
}
4848
defer func() {
4949
if p := recover(); p != nil {
50-
tx.Rollback()
50+
_ = tx.Rollback()
5151
log.Printf("Recovered from panic: %v", p)
5252
err = fmt.Errorf("panic occurred: %v", p)
5353
} else if err != nil {
54-
tx.Rollback()
54+
_ = tx.Rollback()
5555
log.Printf("Transaction rolled back due to error: %v", err)
5656
} else {
57-
tx.Commit()
57+
_ = tx.Commit()
5858
}
5959
}()
6060

‎cmd/metrics-scraper/app/scrape/scrape.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,9 @@ func HandleSyncOperation(c *gin.Context, appName string, syncValue int, queryTyp
143143
}
144144
contextMutex.Unlock()
145145

146-
message := "Sync trigger updated successfully for all apps"
146+
message := "Sync turned off successfully for all apps"
147147
if syncValue == 1 {
148148
message = "Sync turned on successfully for all apps"
149-
} else {
150-
message = "Sync turned off successfully for all apps"
151149
}
152150
c.JSON(http.StatusOK, gin.H{"message": message})
153151
} else {

‎cmd/web/app/web.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,13 @@ func NewWebCommand(ctx context.Context) *cobra.Command {
8080

8181
func run(ctx context.Context, opts *options.Options) error {
8282
klog.InfoS("Starting Karmada Dashboard API", "version", environment.Version)
83-
config.InitDashboardConfigFromMountFile(opts.DashboardConfigPath)
84-
serve(opts)
85-
select {
86-
case <-ctx.Done():
87-
os.Exit(0)
83+
err := config.InitDashboardConfigFromMountFile(opts.DashboardConfigPath)
84+
if err != nil {
85+
return err
8886
}
87+
serve(opts)
88+
<-ctx.Done()
89+
os.Exit(0)
8990
return nil
9091
}
9192

‎hack/verify-staticcheck.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ else
3232
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VER}
3333
fi
3434

35-
if golangci-lint run --enable-only goimports,gci,whitespace,misspell,staticcheck,govet; then
35+
if golangci-lint run --enable-only goimports,gci,whitespace,misspell,staticcheck,govet,errcheck,gosimple,ineffassign,unused; then
3636
echo 'Congratulations! All Go source files have passed staticcheck.'
3737
else
3838
echo # print one empty line, separate from warning messages.

‎pkg/common/errors/handler.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020

2121
"github.com/emicklei/go-restful/v3"
2222
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
23+
"k8s.io/klog/v2"
2324
)
2425

2526
// nonCriticalErrors is an array of error statuses, that are non-critical. That means, that this error can be
@@ -52,7 +53,10 @@ func HandleInternalError(response *restful.Response, err error) {
5253
code, err := HandleError(err)
5354

5455
response.AddHeader("Content-Type", "text/plain")
55-
response.WriteError(code, err)
56+
err = response.WriteError(code, err)
57+
if err != nil {
58+
klog.Error(err)
59+
}
5660
}
5761

5862
// AppendError handles single error, that occurred during API GET call. If it is not critical, then it will be

‎pkg/environment/version.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ const (
2626
)
2727

2828
var (
29-
Version = dev // Version of this binary
30-
gitVersion = "v0.0.0-master"
31-
gitCommit = "unknown" // sha1 from git, output of $(git rev-parse HEAD)
32-
gitTreeState = "unknown" // state of git tree, either "clean" or "dirty"
33-
buildDate = "unknown" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
29+
Version = dev // Version of this binary
30+
gitVersion = "v0.0.0-master" // nolint:unused
31+
gitCommit = "unknown" // nolint:unused // sha1 from git, output of $(git rev-parse HEAD)
32+
gitTreeState = "unknown" // nolint:unused // state of git tree, either "clean" or "dirty"
33+
buildDate = "unknown" // nolint:unused // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
3434
)
3535

3636
// IsDev returns true if the version is dev.

0 commit comments

Comments
 (0)