Custom bug fixes and enhancement (#815)

* Update .deepsource.toml * Use `strings.EqualFold` for `string` comparison * Use `strings.EqualFold` for `string` comparison * Simplify returning of boolean expression * Multiple `append` combined into a single call * Simplify complex boolean expression * Replace `for` loop with `append` * Replace `time.Now().Sub(t)` with `time.Since(t)` * Omit redundant control flow * Merge variable declaration and assignment * Omit redundant `nil` check on slices * Fix check for empty string * Format code with gofmt * Update .deepsource.toml Co-authored-by: DeepSource Bot <[email protected]> Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
devtron-labs · Oct 28, 2021 · 35db62b · 35db62b
1 parent d9aa7c0
commit 35db62b
Show file tree

Hide file tree

Showing 57 changed files with 356 additions and 339 deletions.
diff --git a/.deepsource.toml b/.deepsource.toml
@@ -6,3 +6,8 @@ enabled = true
 
   [analyzers.meta]
   import_paths = ["github.com/devtron-labs/devtron"]
+  import_root = " github.com/devtron-labs/devtron"
+
+[[transformers]]
+name = "gofmt"
+enabled = true
diff --git a/api/restHandler/AppListingRestHandler.go b/api/restHandler/AppListingRestHandler.go
@@ -21,6 +21,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+
 	application2 "github.com/argoproj/argo-cd/pkg/apiclient/application"
 	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
 	"github.com/devtron-labs/devtron/api/bean"
@@ -35,10 +40,6 @@ import (
 	"github.com/devtron-labs/devtron/util/rbac"
 	"github.com/gorilla/mux"
 	"go.uber.org/zap"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
 )
 
 type AppListingRestHandler interface {
@@ -153,9 +154,7 @@ func (handler AppListingRestHandlerImpl) FetchAppsByEnvironment(w http.ResponseW
 	}
 	appEnvContainers := make([]*bean.AppEnvironmentContainer, 0)
 	if isActionUserSuperAdmin {
-		for _, envContainer := range envContainers {
-			appEnvContainers = append(appEnvContainers, envContainer)
-		}
+		appEnvContainers = append(appEnvContainers, envContainers...)
 	} else {
 		uniqueTeams := make(map[int]string)
 		authorizedTeams := make(map[int]bool)
@@ -402,7 +401,7 @@ func (handler AppListingRestHandlerImpl) FetchAppTriggerView(w http.ResponseWrit
 				return
 			}
 			response <- AppStatus{name: pipelineName, status: "", message: "", err: fmt.Errorf("Connection Closed by Client"), conditions: make([]v1alpha1.ApplicationCondition, 0)}
-			return
+
 		}(acdAppName)
 	}
 	rCount := 0

diff --git a/api/restHandler/ClusterRestHandler.go b/api/restHandler/ClusterRestHandler.go
@@ -22,6 +22,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
+	"strconv"
+	"strings"
+
 	cluster3 "github.com/argoproj/argo-cd/pkg/apiclient/cluster"
 	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
 	cluster2 "github.com/devtron-labs/devtron/client/argocdServer/cluster"
@@ -34,9 +38,6 @@ import (
 	"github.com/gorilla/mux"
 	"go.uber.org/zap"
 	"gopkg.in/go-playground/validator.v9"
-	"net/http"
-	"strconv"
-	"strings"
 )
 
 type ClusterRestHandler interface {
@@ -514,7 +515,7 @@ func (impl ClusterRestHandlerImpl) FindAllForAutoComplete(w http.ResponseWriter,
 	}
 	//RBAC enforcer Ends
 
-	if result == nil || len(result) == 0 {
+	if len(result) == 0 {
 		result = make([]cluster.ClusterBean, 0)
 	}
 	writeJsonResp(w, err, result, http.StatusOK)

diff --git a/api/restHandler/DockerRegRestHandler.go b/api/restHandler/DockerRegRestHandler.go
@@ -248,7 +248,7 @@ func (impl DockerRegRestHandlerImpl) IsDockerRegConfigured(w http.ResponseWriter
 		writeJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
-	if res != nil && len(res) > 0 {
+	if len(res) > 0 {
 		isConfigured = true
 	}
 

diff --git a/api/restHandler/NotificationRestHandler.go b/api/restHandler/NotificationRestHandler.go
@@ -22,23 +22,24 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/ioutil"
+	"net/http"
+	"strconv"
+	"strings"
+
 	"github.com/devtron-labs/devtron/internal/sql/repository"
 	"github.com/devtron-labs/devtron/pkg/cluster"
 	"github.com/devtron-labs/devtron/pkg/notifier"
 	"github.com/devtron-labs/devtron/pkg/pipeline"
 	"github.com/devtron-labs/devtron/pkg/team"
 	"github.com/devtron-labs/devtron/pkg/user"
-	"github.com/devtron-labs/devtron/util/event"
+	util "github.com/devtron-labs/devtron/util/event"
 	"github.com/devtron-labs/devtron/util/rbac"
 	"github.com/devtron-labs/devtron/util/response"
 	"github.com/go-pg/pg"
 	"github.com/gorilla/mux"
 	"go.uber.org/zap"
 	"gopkg.in/go-playground/validator.v9"
-	"io/ioutil"
-	"net/http"
-	"strconv"
-	"strings"
 )
 
 type NotificationRestHandler interface {
@@ -532,7 +533,7 @@ func (impl NotificationRestHandlerImpl) FindAllNotificationConfig(w http.Respons
 
 	//RBAC
 	pass := true
-	if slackConfigs != nil && len(slackConfigs) > 0 {
+	if len(slackConfigs) > 0 {
 		var teamIds []*int
 		for _, item := range slackConfigs {
 			teamIds = append(teamIds, &item.TeamId)

diff --git a/api/restHandler/PipelineConfigRestHandler.go b/api/restHandler/PipelineConfigRestHandler.go
@@ -23,6 +23,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"net/http"
+	"strconv"
+	"strings"
+
 	"github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
 	bean2 "github.com/devtron-labs/devtron/api/bean"
 	"github.com/devtron-labs/devtron/client/argocdServer/application"
@@ -48,10 +53,6 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"gopkg.in/go-playground/validator.v9"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
 )
 
 type PipelineConfigRestHandler interface {
@@ -1205,7 +1206,7 @@ func (handler PipelineConfigRestHandlerImpl) GetArtifactsByCDPipeline(w http.Res
 				if err != nil {
 					handler.Logger.Errorw("service err, GetArtifactsByCDPipeline", "err", err, "cdPipelineId", cdPipelineId, "stage", stage)
 				}
-				if blockCveList != nil && len(blockCveList) > 0 {
+				if len(blockCveList) > 0 {
 					vulnerableMap[digest] = true
 				}
 			}

diff --git a/api/restHandler/UserAuthHandler.go b/api/restHandler/UserAuthHandler.go
@@ -20,6 +20,9 @@ package restHandler
 import (
 	"encoding/json"
 	"fmt"
+	"net/http"
+	"strings"
+
 	"github.com/devtron-labs/devtron/api/bean"
 	"github.com/devtron-labs/devtron/client/pubsub"
 	"github.com/devtron-labs/devtron/internal/casbin"
@@ -30,8 +33,6 @@ import (
 	"github.com/nats-io/stan.go"
 	"go.uber.org/zap"
 	"gopkg.in/go-playground/validator.v9"
-	"net/http"
-	"strings"
 )
 
 type UserAuthHandler interface {
@@ -252,7 +253,6 @@ func (handler UserAuthHandlerImpl) AddDefaultPolicyAndRoles(w http.ResponseWrite
 		return
 	}
 
-	return
 }
 
 func (handler UserAuthHandlerImpl) AuthVerification(w http.ResponseWriter, r *http.Request) {

diff --git a/api/restHandler/UserRestHandler.go b/api/restHandler/UserRestHandler.go
@@ -20,6 +20,10 @@ package restHandler
 import (
 	"encoding/json"
 	"errors"
+	"net/http"
+	"strconv"
+	"strings"
+
 	"github.com/devtron-labs/devtron/api/bean"
 	"github.com/devtron-labs/devtron/client/pubsub"
 	"github.com/devtron-labs/devtron/internal/util"
@@ -30,9 +34,6 @@ import (
 	"github.com/gorilla/mux"
 	"go.uber.org/zap"
 	"gopkg.in/go-playground/validator.v9"
-	"net/http"
-	"strconv"
-	"strings"
 )
 
 type UserRestHandler interface {
@@ -117,7 +118,7 @@ func (handler UserRestHandlerImpl) CreateUser(w http.ResponseWriter, r *http.Req
 			return
 		}
 
-		if groupRoles != nil && len(groupRoles) > 0 {
+		if len(groupRoles) > 0 {
 			for _, groupRole := range groupRoles {
 				if len(groupRole.Team) > 0 {
 					if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionCreate, strings.ToLower(groupRole.Team)); !ok {
@@ -202,7 +203,7 @@ func (handler UserRestHandlerImpl) UpdateUser(w http.ResponseWriter, r *http.Req
 			return
 		}
 
-		if groupRoles != nil && len(groupRoles) > 0 {
+		if len(groupRoles) > 0 {
 			for _, groupRole := range groupRoles {
 				if len(groupRole.Team) > 0 {
 					if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionUpdate, strings.ToLower(groupRole.Team)); !ok {

diff --git a/client/argocdServer/Connection.go b/client/argocdServer/Connection.go
@@ -19,10 +19,11 @@ package argocdServer
 
 import (
 	"fmt"
+	"log"
+
 	"github.com/argoproj/argo-cd/util/settings"
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"google.golang.org/grpc"
-	"log"
 )
 
 func init() {
@@ -40,8 +41,7 @@ func GetConnection(token string, settings *settings.ArgoCDSettings) *grpc.Client
 	if len(token) > 0 {
 		option = append(option, grpc.WithPerRPCCredentials(TokenAuth{token: token}))
 	}
-	option = append(option, grpc.WithUnaryInterceptor(grpc_prometheus.UnaryClientInterceptor))
-	option = append(option, grpc.WithStreamInterceptor(grpc_prometheus.StreamClientInterceptor))
+	option = append(option, grpc.WithUnaryInterceptor(grpc_prometheus.UnaryClientInterceptor), grpc.WithStreamInterceptor(grpc_prometheus.StreamClientInterceptor))
 
 	//if conf.Environment=="DEV"{
 	//	option=append(option,grpc.WithInsecure())

diff --git a/client/argocdServer/application/Application.go b/client/argocdServer/application/Application.go
@@ -22,6 +22,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"time"
+
 	"github.com/argoproj/argo-cd/pkg/apiclient/application"
 	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/argo-cd/reposerver/apiclient"
@@ -32,7 +34,6 @@ import (
 	"google.golang.org/grpc"
 	v12 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
-	"time"
 )
 
 const (
@@ -585,9 +586,9 @@ func parseResult(resp *v1alpha1.ApplicationTree, query *application.ResourcesQue
 			startTime := time.Now()
 			res, err := asc.GetResource(ctx, &request)
 			if err != nil {
-				c.logger.Errorw("GRPC_GET_RESOURCE", "data", request, "timeTaken", time.Now().Sub(startTime), "err", err)
+				c.logger.Errorw("GRPC_GET_RESOURCE", "data", request, "timeTaken", time.Since(startTime), "err", err)
 			} else {
-				c.logger.Debugw("GRPC_GET_RESOURCE", "data", request, "timeTaken", time.Now().Sub(startTime))
+				c.logger.Debugw("GRPC_GET_RESOURCE", "data", request, "timeTaken", time.Since(startTime))
 			}
 			if res != nil || err != nil {
 				response <- Result{Response: res, Error: err, Request: &request}

diff --git a/client/grafana/GrafanaClient.go b/client/grafana/GrafanaClient.go
@@ -22,14 +22,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/caarlos0/env"
-	"github.com/devtron-labs/devtron/internal/util"
-	"github.com/devtron-labs/devtron/pkg/attributes"
-	"go.uber.org/zap"
 	"io/ioutil"
 	"net/http"
 	"strconv"
 	"strings"
+
+	"github.com/caarlos0/env"
+	"github.com/devtron-labs/devtron/internal/util"
+	"github.com/devtron-labs/devtron/pkg/attributes"
+	"go.uber.org/zap"
 )
 
 type GrafanaClientConfig struct {
@@ -163,7 +164,7 @@ func NewGrafanaClientImpl(logger *zap.SugaredLogger, client *http.Client, config
 }
 
 func (impl *GrafanaClientImpl) GetAllDatasource() ([]*GetPrometheusDatasourceResponse, error) {
-	if len(impl.config.DestinationURL) == 0 {
+	if impl.config.DestinationURL == "" {
 		hostUrl, err := impl.attributesService.GetByKey(attributes.HostUrlKey)
 		if err != nil {
 			return nil, err
@@ -208,7 +209,7 @@ func (impl *GrafanaClientImpl) GetAllDatasource() ([]*GetPrometheusDatasourceRes
 }
 
 func (impl *GrafanaClientImpl) GetDatasource(datasourceId int) (*GetPrometheusDatasourceResponse, error) {
-	if len(impl.config.DestinationURL) == 0 {
+	if impl.config.DestinationURL == "" {
 		hostUrl, err := impl.attributesService.GetByKey(attributes.HostUrlKey)
 		if err != nil {
 			return nil, err
@@ -252,7 +253,7 @@ func (impl *GrafanaClientImpl) GetDatasource(datasourceId int) (*GetPrometheusDa
 }
 
 func (impl *GrafanaClientImpl) UpdateDatasource(updateDatasourceRequest UpdateDatasourceRequest, datasourceId int) (*DatasourceResponse, error) {
-	if len(impl.config.DestinationURL) == 0 {
+	if impl.config.DestinationURL == "" {
 		hostUrl, err := impl.attributesService.GetByKey(attributes.HostUrlKey)
 		if err != nil {
 			return nil, err
@@ -305,7 +306,7 @@ func (impl *GrafanaClientImpl) UpdateDatasource(updateDatasourceRequest UpdateDa
 }
 
 func (impl *GrafanaClientImpl) deleteDatasource(updateDatasourceRequest CreateDatasourceRequest, datasourceId int) (*DatasourceResponse, error) {
-	if len(impl.config.DestinationURL) == 0 {
+	if impl.config.DestinationURL == "" {
 		hostUrl, err := impl.attributesService.GetByKey(attributes.HostUrlKey)
 		if err != nil {
 			return nil, err
@@ -357,7 +358,7 @@ func (impl *GrafanaClientImpl) deleteDatasource(updateDatasourceRequest CreateDa
 }
 
 func (impl *GrafanaClientImpl) CreateDatasource(createDatasourceRequest CreateDatasourceRequest) (*DatasourceResponse, error) {
-	if len(impl.config.DestinationURL) == 0 {
+	if impl.config.DestinationURL == "" {
 		hostUrl, err := impl.attributesService.GetByKey(attributes.HostUrlKey)
 		if err != nil {
 			return nil, err

diff --git a/client/telemetry/PosthogClient.go b/client/telemetry/PosthogClient.go
@@ -19,11 +19,12 @@ package telemetry
 
 import (
 	"encoding/base64"
+	"time"
+
 	"github.com/devtron-labs/devtron/util"
 	"github.com/patrickmn/go-cache"
 	"github.com/posthog/posthog-go"
 	"go.uber.org/zap"
-	"time"
 )
 
 type PosthogClient struct {
@@ -47,7 +48,7 @@ const (
 )
 
 func NewPosthogClient(logger *zap.SugaredLogger) (*PosthogClient, error) {
-	if len(PosthogApiKey) == 0 {
+	if PosthogApiKey == "" {
 		encodedApiKey, apiKey, err := getPosthogApiKey(TelemetryApiKeyEndpoint, logger)
 		if err != nil {
 			logger.Errorw("exception caught while getting api key", "err", err)