From bfb0f94b8264e4390e4b48dc8ae1e688d319d720 Mon Sep 17 00:00:00 2001 From: roy wang Date: Thu, 26 Nov 2020 16:12:03 +0900 Subject: [PATCH] fix lint issues in /pkg/controller fix lint issues in /apis Signed-off-by: roy wang --- apis/core.oam.dev/v1alpha2/appdeploy_types.go | 4 ++-- apis/types/capability.go | 4 ++-- pkg/controller/common/error.go | 2 +- .../applicationdeployment_controller.go | 2 +- .../standard.oam.dev/v1alpha1/autoscaler/keda.go | 2 +- .../standard.oam.dev/v1alpha1/autoscaler/types.go | 2 +- .../v1alpha1/routes/ingress/nginx_ingress.go | 8 ++++---- .../standard.oam.dev/v1alpha1/routes/util.go | 6 +++--- pkg/controller/utils/utils.go | 10 +++++----- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/apis/core.oam.dev/v1alpha2/appdeploy_types.go b/apis/core.oam.dev/v1alpha2/appdeploy_types.go index 8b7ec3598..2f40d44ae 100644 --- a/apis/core.oam.dev/v1alpha2/appdeploy_types.go +++ b/apis/core.oam.dev/v1alpha2/appdeploy_types.go @@ -25,12 +25,12 @@ import ( // ApplicationDeploymentSpec defines the desired state of ApplicationDeployment type ApplicationDeploymentSpec struct { - //TODO add spec here + // TODO add spec here } // ApplicationDeploymentStatus defines the observed state of ApplicationDeployment type ApplicationDeploymentStatus struct { - //TODO add status field here + // TODO add status field here runtimev1alpha1.ConditionedStatus `json:",inline"` } diff --git a/apis/types/capability.go b/apis/types/capability.go index 4ebfa7b9f..d9db4bc96 100644 --- a/apis/types/capability.go +++ b/apis/types/capability.go @@ -51,7 +51,7 @@ type Capability struct { Status string `json:"status,omitempty"` Description string `json:"description,omitempty"` - //trait only + // trait only AppliesTo []string `json:"appliesTo,omitempty"` // Plugin Source @@ -73,7 +73,7 @@ type Chart struct { // Installation defines the installation method for this Capability, currently only helm is supported type Installation struct { Helm Chart `json:"helm"` - //TODO(wonderflow) add raw yaml file support for install capability + // TODO(wonderflow) add raw yaml file support for install capability } // CapType defines the type of capability diff --git a/pkg/controller/common/error.go b/pkg/controller/common/error.go index 1e5ccf6ed..0b7e2a4a2 100644 --- a/pkg/controller/common/error.go +++ b/pkg/controller/common/error.go @@ -1,6 +1,6 @@ -//nolint package common +// error msg for common usage const ( ErrLocatingWorkload = "failed to locate the workload" ErrLocatingService = "failed to locate any the services" diff --git a/pkg/controller/core.oam.dev/applicationdeployment/applicationdeployment_controller.go b/pkg/controller/core.oam.dev/applicationdeployment/applicationdeployment_controller.go index 578c097af..f4884d53a 100644 --- a/pkg/controller/core.oam.dev/applicationdeployment/applicationdeployment_controller.go +++ b/pkg/controller/core.oam.dev/applicationdeployment/applicationdeployment_controller.go @@ -41,7 +41,7 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) { } log.Info("Get the applicationdeployment", "apiVersion", appdeploy.APIVersion, "kind", appdeploy.Kind) - //TODO add reconcile logic here + // TODO add reconcile logic here return ctrl.Result{}, nil } diff --git a/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/keda.go b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/keda.go index 7919717cf..db8211d53 100644 --- a/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/keda.go +++ b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/keda.go @@ -45,7 +45,7 @@ func (r *AutoscalerReconciler) scaleByKEDA(scaler v1alpha1.Autoscaler, namespace Name: t.Name, Metadata: t.Condition, - //TODO(wonderflow): add auth in the future + // TODO(wonderflow): add auth in the future AuthenticationRef: nil, }) } diff --git a/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/types.go b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/types.go index e83da14fa..d79fb4a76 100644 --- a/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/types.go +++ b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/types.go @@ -1,10 +1,10 @@ -//nolint:golint package autoscalers import ( "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1" ) +// constants used in autoscaler controller const ( CronType v1alpha1.TriggerType = "cron" CPUType v1alpha1.TriggerType = "cpu" diff --git a/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress.go index 44da655c8..a6a200ba1 100644 --- a/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress.go +++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress.go @@ -46,7 +46,7 @@ func (n *Nginx) CheckStatus(routeTrait *standardv1alpha1.Route) (string, []runti Status: v1.ConditionFalse, LastTransitionTime: metav1.Now(), Reason: runtimev1alpha1.ReasonUnavailable, Message: message}} } - //TODO(wonderflow): handle more than one condition case + // TODO(wonderflow): handle more than one condition case condition := issuer.Status.Conditions[0] if condition.Status != cmmeta.ConditionTrue { return StatusSynced, []runtimev1alpha1.Condition{{Type: runtimev1alpha1.TypeSynced, @@ -74,7 +74,7 @@ func (n *Nginx) CheckStatus(routeTrait *standardv1alpha1.Route) (string, []runti Status: v1.ConditionFalse, LastTransitionTime: metav1.Now(), Reason: runtimev1alpha1.ReasonUnavailable, Message: message}} } - //TODO(wonderflow): handle more than one condition case + // TODO(wonderflow): handle more than one condition case certcondition := cert.Status.Conditions[0] if certcondition.Status != cmmeta.ConditionTrue || certcondition.Type != certmanager.CertificateConditionReady { return StatusSynced, []runtimev1alpha1.Condition{{Type: runtimev1alpha1.TypeSynced, @@ -145,12 +145,12 @@ func (*Nginx) Construct(routeTrait *standardv1alpha1.Route) []*v1beta1.Ingress { annotations["nginx.ingress.kubernetes.io/configuration-snippet"] = headerSnippet } - //Send timeout + // Send timeout if backend.SendTimeout != 0 { annotations["nginx.ingress.kubernetes.io/proxy-send-timeout"] = strconv.Itoa(backend.SendTimeout) } - //Read timeout + // Read timeout if backend.ReadTimeout != 0 { annotations["nginx.ingress.kubernetes.io/proxy‑read‑timeout"] = strconv.Itoa(backend.ReadTimeout) } diff --git a/pkg/controller/standard.oam.dev/v1alpha1/routes/util.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/util.go index f86c1ec51..1d982afcc 100644 --- a/pkg/controller/standard.oam.dev/v1alpha1/routes/util.go +++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/util.go @@ -51,11 +51,11 @@ func FillRouteTraitWithService(service *corev1.Service, routeTrait *v1alpha1.Rou for idx, rule := range routeTrait.Spec.Rules { // If backendService.port not specified, will always use the service found and it's first port as backendService. for _, servicePort := range service.Spec.Ports { - //We use targetPort rather than port to match with the rule, because if serviceName not specified, - //Users will only know containerPort(which is targetPort) + // We use targetPort rather than port to match with the rule, because if serviceName not specified, + // Users will only know containerPort(which is targetPort) if MatchService(servicePort.TargetPort, rule) { ref := &v1alpha1.BackendServiceRef{ - //Use port of service rather than targetPort, it will be used in ingress pointing to the service + // Use port of service rather than targetPort, it will be used in ingress pointing to the service Port: intstr.FromInt(int(servicePort.Port)), ServiceName: service.Name, } diff --git a/pkg/controller/utils/utils.go b/pkg/controller/utils/utils.go index de3292cb4..b3ead72a1 100644 --- a/pkg/controller/utils/utils.go +++ b/pkg/controller/utils/utils.go @@ -41,12 +41,12 @@ func DiscoveryFromPodSpec(w *unstructured.Unstructured, fieldPath string) ([]int } data, err := json.Marshal(obj) if err != nil { - return nil, fmt.Errorf("discovery podSpec from %s in workload %v err %v", fieldPath, w.GetName(), err) + return nil, fmt.Errorf("discovery podSpec from %s in workload %v err %w", fieldPath, w.GetName(), err) } var spec v1.PodSpec err = json.Unmarshal(data, &spec) if err != nil { - return nil, fmt.Errorf("discovery podSpec from %s in workload %v err %v", fieldPath, w.GetName(), err) + return nil, fmt.Errorf("discovery podSpec from %s in workload %v err %w", fieldPath, w.GetName(), err) } ports := getContainerPorts(spec.Containers) if len(ports) == 0 { @@ -63,12 +63,12 @@ func DiscoveryFromPodTemplate(w *unstructured.Unstructured, fields ...string) ([ } data, err := json.Marshal(obj) if err != nil { - return nil, nil, fmt.Errorf("workload %v convert object err %v", w.GetName(), err) + return nil, nil, fmt.Errorf("workload %v convert object err %w", w.GetName(), err) } var spec v1.PodTemplateSpec err = json.Unmarshal(data, &spec) if err != nil { - return nil, nil, fmt.Errorf("workload %v convert object to PodTemplate err %v", w.GetName(), err) + return nil, nil, fmt.Errorf("workload %v convert object to PodTemplate err %w", w.GetName(), err) } ports := getContainerPorts(spec.Spec.Containers) if len(ports) == 0 { @@ -79,7 +79,7 @@ func DiscoveryFromPodTemplate(w *unstructured.Unstructured, fields ...string) ([ func getContainerPorts(cs []v1.Container) []intstr.IntOrString { var ports []intstr.IntOrString - //TODO(wonderflow): exclude some sidecars + // TODO(wonderflow): exclude some sidecars for _, container := range cs { for _, port := range container.Ports { ports = append(ports, intstr.FromInt(int(port.ContainerPort)))