bentoml · yetone · Nov 22, 2022 · Nov 22, 2022 · Nov 22, 2022
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -45,17 +45,22 @@ linters:
   presets:
     - bugs
     - unused
+    - error
+    - performance
   disable:
-    - unused
+    - wrapcheck
+    - goerr113
+    - maligned
+    - structcheck
+    - deadcode
+    - varcheck
     - scopelint
+    - rowserrcheck
+    - sqlclosecheck
   enable:
     - bodyclose
-    - deadcode
-    - varcheck
     - ineffassign
     - exportloopref
-    - sqlclosecheck
-    - structcheck
     - typecheck
     - gofmt
     - unconvert
@@ -69,4 +74,3 @@ linters:
     - dogsled
     - whitespace
     - misspell
-    - rowserrcheck
diff --git a/api-server/controllers/controllersv1/api_token.go b/api-server/controllers/controllersv1/api_token.go
@@ -17,6 +17,7 @@ import (
 )
 
 type apiTokenController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/auth.go b/api-server/controllers/controllersv1/auth.go
@@ -16,6 +16,7 @@ import (
 )
 
 type authController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/base.go b/api-server/controllers/controllersv1/base.go
@@ -2,6 +2,7 @@ package controllersv1
 
 import "github.com/gorilla/websocket"
 
+// nolint: unused
 type baseController struct{}
 
 var wsUpgrader = websocket.Upgrader{

diff --git a/api-server/controllers/controllersv1/bento.go b/api-server/controllers/controllersv1/bento.go
@@ -23,6 +23,7 @@ import (
 )
 
 type bentoController struct {
+	// nolint: unused
 	baseController
 }
 
@@ -61,6 +62,7 @@ func (c *bentoController) canUpdate(ctx context.Context, bento *models.Bento) er
 	return BentoRepositoryController.canUpdate(ctx, bentoRepository)
 }
 
+// nolint: unused
 func (c *bentoController) canOperate(ctx context.Context, bento *models.Bento) error {
 	bentoRepository, err := services.BentoRepositoryService.GetAssociatedBentoRepository(ctx, bento)
 	if err != nil {

diff --git a/api-server/controllers/controllersv1/bento_repository.go b/api-server/controllers/controllersv1/bento_repository.go
@@ -18,6 +18,7 @@ import (
 )
 
 type bentoRepositoryController struct {
+	// nolint: unused
 	baseController
 }
 
@@ -56,6 +57,7 @@ func (c *bentoRepositoryController) canUpdate(ctx context.Context, bentoReposito
 	return OrganizationController.canUpdate(ctx, organization)
 }
 
+// nolint: unused
 func (c *bentoRepositoryController) canOperate(ctx context.Context, bentoRepository *models.BentoRepository) error {
 	organization, err := services.OrganizationService.GetAssociatedOrganization(ctx, bentoRepository)
 	if err != nil {

diff --git a/api-server/controllers/controllersv1/cluster.go b/api-server/controllers/controllersv1/cluster.go
@@ -24,6 +24,7 @@ import (
 )
 
 type clusterController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/deployment.go b/api-server/controllers/controllersv1/deployment.go
@@ -31,6 +31,7 @@ import (
 )
 
 type deploymentController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/deployment_revision.go b/api-server/controllers/controllersv1/deployment_revision.go
@@ -11,6 +11,7 @@ import (
 )
 
 type deploymentRevisionController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/info.go b/api-server/controllers/controllersv1/info.go
@@ -7,6 +7,7 @@ import (
 )
 
 type infoController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/kube.go b/api-server/controllers/controllersv1/kube.go
@@ -25,6 +25,7 @@ import (
 )
 
 type kubeController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/label.go b/api-server/controllers/controllersv1/label.go
@@ -15,6 +15,7 @@ import (
 )
 
 type labelController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/log.go b/api-server/controllers/controllersv1/log.go
@@ -290,6 +290,7 @@ func (t *Tail) Start(ctx context.Context, clientset *kubernetes.Clientset) error
 }
 
 type logController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/model.go b/api-server/controllers/controllersv1/model.go
@@ -21,6 +21,7 @@ import (
 )
 
 type modelController struct {
+	// nolint: unused
 	baseController
 }
 
@@ -59,6 +60,7 @@ func (c *modelController) canUpdate(ctx context.Context, model *models.Model) er
 	return ModelRepositoryController.canUpdate(ctx, modelRepository)
 }
 
+// nolint: unused
 func (c *modelController) canOperate(ctx context.Context, model *models.Model) error {
 	modelRepository, err := services.ModelRepositoryService.GetAssociatedModelRepository(ctx, model)
 	if err != nil {

diff --git a/api-server/controllers/controllersv1/model_repository.go b/api-server/controllers/controllersv1/model_repository.go
@@ -17,6 +17,7 @@ import (
 )
 
 type modelRepositoryController struct {
+	// nolint: unused
 	baseController
 }
 
@@ -55,6 +56,7 @@ func (c *modelRepositoryController) canUpdate(ctx context.Context, modelReposito
 	return OrganizationController.canUpdate(ctx, organization)
 }
 
+// nolint: unused
 func (c *modelRepositoryController) canOperate(ctx context.Context, modelRepository *models.ModelRepository) error {
 	organization, err := services.OrganizationService.GetAssociatedOrganization(ctx, modelRepository)
 	if err != nil {

diff --git a/api-server/controllers/controllersv1/news.go b/api-server/controllers/controllersv1/news.go
@@ -13,6 +13,7 @@ import (
 )
 
 type newsController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/organization.go b/api-server/controllers/controllersv1/organization.go
@@ -19,6 +19,7 @@ import (
 )
 
 type organizationController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/self_hosted.go b/api-server/controllers/controllersv1/self_hosted.go
@@ -13,6 +13,7 @@ import (
 )
 
 type selfHostedController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/subscription.go b/api-server/controllers/controllersv1/subscription.go
@@ -18,6 +18,7 @@ import (
 )
 
 type subscriptionController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/terminal.go b/api-server/controllers/controllersv1/terminal.go
@@ -35,6 +35,7 @@ import (
 )
 
 type terminalController struct {
+	// nolint: unused
 	baseController
 }
 
@@ -584,6 +585,7 @@ func launchKubectlPod(ctx context.Context, cli *kubernetes.Clientset, userName s
 	return launchPod(ctx, cli, pod)
 }
 
+// nolint: unused
 func launchPod(ctx context.Context, cli *kubernetes.Clientset, pod *corev1.Pod) (*corev1.Pod, error) {
 	podCli := cli.CoreV1().Pods(pod.Namespace)
 	_, err := podCli.Get(ctx, pod.Name, metav1.GetOptions{})

diff --git a/api-server/controllers/controllersv1/terminal_record.go b/api-server/controllers/controllersv1/terminal_record.go
@@ -16,6 +16,7 @@ import (
 )
 
 type terminalRecordController struct {
+	// nolint: unused
 	baseController
 }
 
@@ -54,6 +55,7 @@ func (c *terminalRecordController) canView(ctx context.Context, terminalRecord *
 	return nil
 }
 
+// nolint: unused
 func (c *terminalRecordController) canUpdate(ctx context.Context, terminalRecord *models.TerminalRecord) error {
 	org, err := services.OrganizationService.GetAssociatedNullableOrganization(ctx, terminalRecord)
 	if err != nil {
@@ -79,6 +81,7 @@ func (c *terminalRecordController) canUpdate(ctx context.Context, terminalRecord
 	return nil
 }
 
+// nolint: unused
 func (c *terminalRecordController) canOperate(ctx context.Context, terminalRecord *models.TerminalRecord) error {
 	org, err := services.OrganizationService.GetAssociatedNullableOrganization(ctx, terminalRecord)
 	if err != nil {

diff --git a/api-server/controllers/controllersv1/user.go b/api-server/controllers/controllersv1/user.go
@@ -15,6 +15,7 @@ import (
 )
 
 type userController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/version.go b/api-server/controllers/controllersv1/version.go
@@ -8,6 +8,7 @@ import (
 )
 
 type versionController struct {
+	// nolint: unused
 	baseController
 }
 

diff --git a/api-server/controllers/controllersv1/yatai_component.go b/api-server/controllers/controllersv1/yatai_component.go
@@ -17,6 +17,7 @@ import (
 )
 
 type yataiComponentController struct {
+	// nolint: unused
 	baseController
 }
 
@@ -39,6 +40,7 @@ func (s *GetYataiComponentSchema) GetYataiComponent(ctx context.Context) (*model
 	return yataiComponent, nil
 }
 
+// nolint: unused
 func (c *yataiComponentController) canView(ctx context.Context, yataiComponent *models.YataiComponent) error {
 	cluster, err := services.ClusterService.GetAssociatedCluster(ctx, yataiComponent)
 	if err != nil {
@@ -47,6 +49,7 @@ func (c *yataiComponentController) canView(ctx context.Context, yataiComponent *
 	return ClusterController.canView(ctx, cluster)
 }
 
+// nolint: unused
 func (c *yataiComponentController) canUpdate(ctx context.Context, yataiComponent *models.YataiComponent) error {
 	cluster, err := services.ClusterService.GetAssociatedCluster(ctx, yataiComponent)
 	if err != nil {
@@ -55,6 +58,7 @@ func (c *yataiComponentController) canUpdate(ctx context.Context, yataiComponent
 	return ClusterController.canUpdate(ctx, cluster)
 }
 
+// nolint: unused
 func (c *yataiComponentController) canOperate(ctx context.Context, yataiComponent *models.YataiComponent) error {
 	cluster, err := services.ClusterService.GetAssociatedCluster(ctx, yataiComponent)
 	if err != nil {

diff --git a/api-server/services/kube_pod.go b/api-server/services/kube_pod.go
@@ -89,7 +89,7 @@ func (s *kubePodService) GetKubePodRestartCount(pod apiv1.Pod) int32 {
 
 // GetKubePodStatus returns a KubePodStatus object containing a summary of the pod's status.
 func (s *kubePodService) GetKubePodStatus(pod apiv1.Pod, warnings []apiv1.Event) modelschemas.KubePodStatus {
-	var states []apiv1.ContainerState
+	states := make([]apiv1.ContainerState, 0, len(pod.Status.ContainerStatuses))
 	for _, containerStatus := range pod.Status.ContainerStatuses {
 		states = append(states, containerStatus.State)
 	}

diff --git a/api-server/services/tracking/bentoevents.go b/api-server/services/tracking/bentoevents.go
@@ -10,6 +10,9 @@ import (
 )
 
 func TrackBentoEvent(ctx context.Context, bentoModel *models.Bento, eventType YataiEventType) {
+	if bentoModel == nil {
+		return
+	}
 	trackingLogger := NewTrackerLogger().WithField("eventType", eventType)
 	org, err := services.GetCurrentOrganization(ctx)
 	if err != nil {

diff --git a/api-server/services/tracking/deploymentevents.go b/api-server/services/tracking/deploymentevents.go
@@ -11,6 +11,9 @@ import (
 
 // track a DeploymentEvent(create/update/terminate/delete)
 func TrackDeploymentEvent(ctx context.Context, deploymentSchema *schemasv1.DeploymentSchema, eventType YataiEventType) {
+	if deploymentSchema == nil {
+		return
+	}
 	trackingLogger := NewTrackerLogger().WithField("eventType", eventType)
 	defaultOrg, err := services.OrganizationService.GetDefault(ctx)
 	if err != nil {
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ import ( @@
     )
     type apiTokenController struct {
+    	// nolint: unused
     	baseController
     }
@@ Expand Down @@