chore: format code about revive stuttering check

Signed-off-by: chaosi-zju <[email protected]>

Author: chaosi-zju

.golangci.yml

@@ -70,7 +70,6 @@ linters-settings:
       - name: dot-imports
       - name: errorf
       - name: exported
-        arguments: ["disableStutteringCheck"]  # TODO Temporarily disable stuttering check
       - name: var-declaration
       - name: blank-imports
       - name: indent-error-flow

cmd/api/app/routes/namespace/handler.go

@@ -34,7 +34,7 @@ func handleCreateNamespace(c *gin.Context) {
 		common.Fail(c, err)
 		return
 	}
-	spec := &ns.NamespaceSpec{
+	spec := &ns.Spec{
 		Name:                createNamespaceRequest.Name,
 		SkipAutoPropagation: createNamespaceRequest.SkipAutoPropagation,
 	}

cmd/api/app/routes/overview/misc.go

@@ -161,7 +161,7 @@ func GetControllerManagerInfo() (*v1.KarmadaInfo, error) {
 }
 
 // GetMemberClusterInfo returns the status of member clusters.
-func GetMemberClusterInfo(ds *dataselect.DataSelectQuery) (*v1.MemberClusterStatus, error) {
+func GetMemberClusterInfo(ds *dataselect.Query) (*v1.MemberClusterStatus, error) {
 	karmadaClient := client.InClusterKarmadaClient()
 	result, err := cluster.GetClusterList(karmadaClient, ds)
 	if err != nil {

cmd/api/app/types/common/request.go

@@ -50,8 +50,8 @@ func parseSortPathParameter(request *gin.Context) *dataselect.SortQuery {
 	return dataselect.NewSortQuery(strings.Split(request.Query("sortBy"), ","))
 }
 
-// ParseDataSelectPathParameter parses query parameters of the request and returns a DataSelectQuery object
-func ParseDataSelectPathParameter(request *gin.Context) *dataselect.DataSelectQuery {
+// ParseDataSelectPathParameter parses query parameters of the request and returns a Query object
+func ParseDataSelectPathParameter(request *gin.Context) *dataselect.Query {
 	paginationQuery := parsePaginationPathParameter(request)
 	sortQuery := parseSortPathParameter(request)
 	filterQuery := parseFilterPathParameter(request)

hack/verify-staticcheck.sh

@@ -32,7 +32,7 @@ else
   curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VER}
 fi
 
-if golangci-lint run --enable-only goimports,gci,whitespace,misspell,staticcheck,govet,errcheck,gosimple,ineffassign,unused,gocyclo,gosec,revive; then
+if golangci-lint run; then
   echo 'Congratulations!  All Go source files have passed staticcheck.'
 else
   echo # print one empty line, separate from warning messages.

pkg/dataselect/dataselect.go

@@ -43,7 +43,7 @@ type DataSelector struct {
 	// GenericDataList hold generic data cells that are being selected.
 	GenericDataList []DataCell
 	// DataSelectQuery holds instructions for data select.
-	DataSelectQuery *DataSelectQuery
+	DataSelectQuery *Query
 }
 
 // Implementation of sort.Interface so that we can use built-in sort function (sort.Sort) for sorting SelectableData
@@ -74,13 +74,13 @@ func (s DataSelector) Less(i, j int) bool {
 	return false
 }
 
-// Sort sorts the data inside as instructed by DataSelectQuery and returns itself to allow method chaining.
+// Sort sorts the data inside as instructed by Query and returns itself to allow method chaining.
 func (s *DataSelector) Sort() *DataSelector {
 	sort.Sort(*s)
 	return s
 }
 
-// Filter the data inside as instructed by DataSelectQuery and returns itself to allow method chaining.
+// Filter the data inside as instructed by Query and returns itself to allow method chaining.
 func (s *DataSelector) Filter() *DataSelector {
 	filteredList := []DataCell{}
 
@@ -102,7 +102,7 @@ func (s *DataSelector) Filter() *DataSelector {
 	return s
 }
 
-// Paginate paginates the data inside as instructed by DataSelectQuery and returns itself to allow method chaining.
+// Paginate paginates the data inside as instructed by Query and returns itself to allow method chaining.
 func (s *DataSelector) Paginate() *DataSelector {
 	pQuery := s.DataSelectQuery.PaginationQuery
 	dataList := s.GenericDataList
@@ -122,17 +122,17 @@ func (s *DataSelector) Paginate() *DataSelector {
 	return s
 }
 
-// GenericDataSelect takes a list of GenericDataCells and DataSelectQuery and returns selected data as instructed by dsQuery.
-func GenericDataSelect(dataList []DataCell, dsQuery *DataSelectQuery) []DataCell {
+// GenericDataSelect takes a list of GenericDataCells and Query and returns selected data as instructed by dsQuery.
+func GenericDataSelect(dataList []DataCell, dsQuery *Query) []DataCell {
 	SelectableData := DataSelector{
 		GenericDataList: dataList,
 		DataSelectQuery: dsQuery,
 	}
 	return SelectableData.Sort().Paginate().GenericDataList
 }
 
-// GenericDataSelectWithFilter takes a list of GenericDataCells and DataSelectQuery and returns selected data as instructed by dsQuery.
-func GenericDataSelectWithFilter(dataList []DataCell, dsQuery *DataSelectQuery) ([]DataCell, int) {
+// GenericDataSelectWithFilter takes a list of GenericDataCells and Query and returns selected data as instructed by dsQuery.
+func GenericDataSelectWithFilter(dataList []DataCell, dsQuery *Query) ([]DataCell, int) {
 	SelectableData := DataSelector{
 		GenericDataList: dataList,
 		DataSelectQuery: dsQuery,

pkg/dataselect/dataselect_test.go

@@ -143,7 +143,7 @@ func TestSort(t *testing.T) {
 	for _, testCase := range testCases {
 		selectableData := DataSelector{
 			GenericDataList: getDataCellList(),
-			DataSelectQuery: &DataSelectQuery{SortQuery: testCase.SortQuery},
+			DataSelectQuery: &Query{SortQuery: testCase.SortQuery},
 		}
 		sortedData := fromCells(selectableData.Sort().GenericDataList)
 		order := getOrder(sortedData)
@@ -210,7 +210,7 @@ func TestPagination(t *testing.T) {
 	for _, testCase := range testCases {
 		selectableData := DataSelector{
 			GenericDataList: getDataCellList(),
-			DataSelectQuery: &DataSelectQuery{PaginationQuery: testCase.PaginationQuery},
+			DataSelectQuery: &Query{PaginationQuery: testCase.PaginationQuery},
 		}
 		paginatedData := fromCells(selectableData.Paginate().GenericDataList)
 		order := getOrder(paginatedData)

pkg/dataselect/dataselectquery.go

@@ -14,10 +14,10 @@
 
 package dataselect
 
-// DataSelectQuery is options for GenericDataSelect which takes []GenericDataCell and returns selected data.
+// Query is options for GenericDataSelect which takes []GenericDataCell and returns selected data.
 // Can be extended to include any kind of selection - for example filtering.
 // Currently included only Pagination and Sort options.
-type DataSelectQuery struct {
+type Query struct {
 	// PaginationQuery holds options for pagination of data select.
 	PaginationQuery *PaginationQuery
 	// SortQuery holds options for sort functionality of data select.
@@ -72,9 +72,9 @@ var NoFilter = &FilterQuery{
 // NoDataSelect is an option for no data select (same data will be returned).
 var NoDataSelect = NewDataSelectQuery(NoPagination, NoSort, NoFilter)
 
-// NewDataSelectQuery creates DataSelectQuery object from simpler data select queries.
-func NewDataSelectQuery(paginationQuery *PaginationQuery, sortQuery *SortQuery, filterQuery *FilterQuery) *DataSelectQuery {
-	return &DataSelectQuery{
+// NewDataSelectQuery creates Query object from simpler data select queries.
+func NewDataSelectQuery(paginationQuery *PaginationQuery, sortQuery *SortQuery, filterQuery *FilterQuery) *Query {
+	return &Query{
 		PaginationQuery: paginationQuery,
 		SortQuery:       sortQuery,
 		FilterQuery:     filterQuery,

pkg/resource/cluster/cluster.go

@@ -32,25 +32,25 @@ import (
 
 // Cluster the definition of a cluster.
 type Cluster struct {
-	ObjectMeta         types.ObjectMeta          `json:"objectMeta"`
-	TypeMeta           types.TypeMeta            `json:"typeMeta"`
-	Ready              metav1.ConditionStatus    `json:"ready"`
-	KubernetesVersion  string                    `json:"kubernetesVersion,omitempty"`
-	SyncMode           v1alpha1.ClusterSyncMode  `json:"syncMode"`
-	NodeSummary        *v1alpha1.NodeSummary     `json:"nodeSummary,omitempty"`
-	AllocatedResources ClusterAllocatedResources `json:"allocatedResources"`
+	ObjectMeta         types.ObjectMeta         `json:"objectMeta"`
+	TypeMeta           types.TypeMeta           `json:"typeMeta"`
+	Ready              metav1.ConditionStatus   `json:"ready"`
+	KubernetesVersion  string                   `json:"kubernetesVersion,omitempty"`
+	SyncMode           v1alpha1.ClusterSyncMode `json:"syncMode"`
+	NodeSummary        *v1alpha1.NodeSummary    `json:"nodeSummary,omitempty"`
+	AllocatedResources AllocatedResources       `json:"allocatedResources"`
 }
 
-// ClusterList contains a list of clusters.
-type ClusterList struct {
+// List contains a list of clusters.
+type List struct {
 	ListMeta types.ListMeta `json:"listMeta"`
 	Clusters []Cluster      `json:"clusters"`
 	// List of non-critical errors, that occurred during resource retrieval.
 	Errors []error `json:"errors"`
 }
 
 // GetClusterList returns a list of all Nodes in the cluster.
-func GetClusterList(client karmadaclientset.Interface, dsQuery *dataselect.DataSelectQuery) (*ClusterList, error) {
+func GetClusterList(client karmadaclientset.Interface, dsQuery *dataselect.Query) (*List, error) {
 	clusters, err := client.ClusterV1alpha1().Clusters().List(context.TODO(), helpers.ListEverything)
 	nonCriticalErrors, criticalError := errors.ExtractErrors(err)
 	if criticalError != nil {
@@ -59,8 +59,8 @@ func GetClusterList(client karmadaclientset.Interface, dsQuery *dataselect.DataS
 	return toClusterList(client, clusters.Items, nonCriticalErrors, dsQuery), nil
 }
 
-func toClusterList(_ karmadaclientset.Interface, clusters []v1alpha1.Cluster, nonCriticalErrors []error, dsQuery *dataselect.DataSelectQuery) *ClusterList {
-	clusterList := &ClusterList{
+func toClusterList(_ karmadaclientset.Interface, clusters []v1alpha1.Cluster, nonCriticalErrors []error, dsQuery *dataselect.Query) *List {
+	clusterList := &List{
 		Clusters: make([]Cluster, 0),
 		ListMeta: types.ListMeta{TotalItems: len(clusters)},
 		Errors:   nonCriticalErrors,

pkg/resource/cluster/common.go

@@ -22,11 +22,11 @@ import (
 	"github.com/karmada-io/dashboard/pkg/dataselect"
 )
 
-// ClusterCell is a cell representation of Cluster object.
-type ClusterCell v1alpha1.Cluster
+// Cell is a cell representation of Cluster object.
+type Cell v1alpha1.Cluster
 
 // GetProperty returns value of a given property.
-func (c ClusterCell) GetProperty(name dataselect.PropertyName) dataselect.ComparableValue {
+func (c Cell) GetProperty(name dataselect.PropertyName) dataselect.ComparableValue {
 	switch name {
 	case dataselect.NameProperty:
 		return dataselect.StdComparableString(c.ObjectMeta.Name)
@@ -43,15 +43,15 @@ func (c ClusterCell) GetProperty(name dataselect.PropertyName) dataselect.Compar
 func toCells(std []v1alpha1.Cluster) []dataselect.DataCell {
 	cells := make([]dataselect.DataCell, len(std))
 	for i := range std {
-		cells[i] = ClusterCell(std[i])
+		cells[i] = Cell(std[i])
 	}
 	return cells
 }
 
 func fromCells(cells []dataselect.DataCell) []v1alpha1.Cluster {
 	std := make([]v1alpha1.Cluster, len(cells))
 	for i := range std {
-		std[i] = v1alpha1.Cluster(cells[i].(ClusterCell))
+		std[i] = v1alpha1.Cluster(cells[i].(Cell))
 	}
 	return std
 }