Merge pull request #219 from banzaicloud/updates

sagikazarmark · web-flow · commit 7ee611fe1631 · 2020-03-24T14:27:14.000+01:00
Updates
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,7 +8,7 @@ jobs:
     build:
         docker:
             -
-                image: circleci/golang:1.12
+                image: circleci/golang:1.14
                 environment:
                     GOFLAGS: -mod=readonly
 
@@ -135,7 +135,7 @@ jobs:
     release:
         docker:
             -
-                image: circleci/golang:1.12
+                image: circleci/golang:1.14
                 environment:
                     GOFLAGS: -mod=readonly
 
diff --git a/.golangci.yml b/.golangci.yml
@@ -2,9 +2,12 @@ linters:
     enable-all: true
     disable:
         - funlen
+        - gomnd
         - maligned
+        - wsl
 
         # TODO: fix these
+        - stylecheck
         - bodyclose
         - deadcode
         - dupl
@@ -14,12 +17,14 @@ linters:
         - gochecknoinits
         - gocritic
         - gocyclo
+        - gocognit
         - gofmt
         - goimports
         - golint
         - lll
         - megacheck
         - varcheck
+        - godox
 
 linters-settings:
     golint:
diff --git a/Makefile b/Makefile
@@ -26,14 +26,14 @@ CLOUDINFO_VERSION = 0.7.8
 TELESCOPES_VERSION = 0.5.2
 
 # Dependency versions
-GOTESTSUM_VERSION = 0.3.5
-GOLANGCI_VERSION = 1.18.0
+GOTESTSUM_VERSION = 0.4.1
+GOLANGCI_VERSION = 1.24.0
 LICENSEI_VERSION = 0.1.0
 GORELEASER_VERSION = 0.112.2
 PACKR_VERSION = 2.6.0
 OPENAPI_GENERATOR_VERSION = v4.2.2
 
-GOLANG_VERSION = 1.12
+GOLANG_VERSION = 1.14
 
 # Add the ability to override some variables
 # Use with care
@@ -115,6 +115,11 @@ bin/golangci-lint-${GOLANGCI_VERSION}:
 lint: bin/golangci-lint ## Run linter
 	bin/golangci-lint run
 
+.PHONY: fix
+fix: export CGO_ENABLED = 1
+fix: bin/golangci-lint ## Fix lint violations
+	bin/golangci-lint run --fix
+
 bin/licensei: bin/licensei-${LICENSEI_VERSION}
 	@ln -sf licensei-${LICENSEI_VERSION} bin/licensei
 bin/licensei-${LICENSEI_VERSION}:
diff --git a/cmd/root.go b/cmd/root.go
@@ -67,7 +67,6 @@ func GetRootCommand() *cobra.Command {
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
-
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
diff --git a/go.mod b/go.mod
@@ -1,5 +1,7 @@
 module github.com/banzaicloud/banzai-cli
 
+go 1.14
+
 require (
 	emperror.dev/errors v0.4.2
 	github.com/AlecAivazis/survey/v2 v2.0.2
@@ -40,5 +42,3 @@ require (
 	k8s.io/client-go v11.0.0+incompatible
 	sigs.k8s.io/kind v0.4.0
 )
-
-go 1.13
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
@@ -267,7 +267,6 @@ func CheckPipelineEndpoint(endpoint string) (string, error, error) {
 		if err != nil {
 			return "", nil, errors.WrapIf(err, "failed to connect to Pipeline")
 		}
-
 	}
 
 	defer response.Body.Close()
diff --git a/internal/cli/command/cluster/context/context.go b/internal/cli/command/cluster/context/context.go
@@ -40,7 +40,6 @@ type clusterContext struct {
 const clusterIdKey = "cluster.id"
 
 func NewClusterContext(cmd *cobra.Command, banzaiCli cli.Cli, verb string) Context {
-
 	ctx := clusterContext{
 		banzaiCli: banzaiCli,
 	}
diff --git a/internal/cli/command/cluster/create.go b/internal/cli/command/cluster/create.go
@@ -518,7 +518,6 @@ func buildDefaultRequest(out map[string]interface{}) error {
 }
 
 func buildSecretChoice(banzaiCli cli.Cli, orgID int32, cloud string, out map[string]interface{}) (string, error) {
-
 	if id, ok := out["secretId"].(string); id != "" && ok {
 		return id, nil
 	}
@@ -535,7 +534,6 @@ func buildSecretChoice(banzaiCli cli.Cli, orgID int32, cloud string, out map[str
 
 	// get ID from Name + validate
 	if name, ok := out["secretName"].(string); name != "" && ok {
-
 		for _, secret := range secrets {
 			if secret.Name == name {
 				return secret.Id, nil
diff --git a/internal/cli/command/cluster/helm.go b/internal/cli/command/cluster/helm.go
@@ -56,7 +56,6 @@ func NewHelmCommand(banzaiCli cli.Cli) *cobra.Command {
 }
 
 func writeHelm(url, name string) error {
-
 	tgz, err := http.Get(url) // #nosec
 	if err != nil {
 		return errors.WrapIff(err, "failed to download helm from %q", url)
diff --git a/internal/cli/command/cluster/integratedservice/services/dns/common.go b/internal/cli/command/cluster/integratedservice/services/dns/common.go
@@ -90,7 +90,6 @@ func (ac actionContext) IsUpdate() bool {
 // assembleServiceRequest assembles the request for activate and update the ExternalDNS integrated service
 // if the input rawSpec is nil -> activate flow, otherwise update flow
 func assembleServiceRequest(banzaiCli cli.Cli, clusterCtx clustercontext.Context, spec ServiceSpec, actionContext actionContext) (map[string]interface{}, error) {
-
 	// select the provider
 	selectedProviderInfo, err := selectProvider(*spec.ExternalDNS.Provider)
 	if err != nil {
diff --git a/internal/cli/command/cluster/integratedservice/services/dns/manager.go b/internal/cli/command/cluster/integratedservice/services/dns/manager.go
@@ -52,7 +52,6 @@ func (Manager) ServiceName() string {
 }
 
 func (m Manager) BuildActivateRequestInteractively(clusterCtx clustercontext.Context) (pipeline.ActivateIntegratedServiceRequest, error) {
-
 	defaultSpec := ServiceSpec{
 		ExternalDNS: ExternalDNS{
 			Provider: &Provider{
@@ -72,7 +71,6 @@ func (m Manager) BuildActivateRequestInteractively(clusterCtx clustercontext.Con
 }
 
 func (m Manager) BuildUpdateRequestInteractively(clusterCtx clustercontext.Context, request *pipeline.UpdateIntegratedServiceRequest) error {
-
 	currentSpec := ServiceSpec{
 		ExternalDNS: ExternalDNS{
 			Provider: &Provider{},
@@ -206,7 +204,6 @@ func decorateProviderSecret(banzaiCLI cli.Cli, selectedProvider Provider) (Provi
 }
 
 func decorateProviderOptions(banzaiCLI cli.Cli, selectedProvider Provider) (Provider, error) {
-
 	// helper struct for requesting provider specific integratedservice-options
 	type providerOptions struct {
 		Project       string `json:"project,omitempty" mapstructure:"project"`
@@ -315,7 +312,6 @@ func decorateProviderOptions(banzaiCLI cli.Cli, selectedProvider Provider) (Prov
 
 //getGoogleProjectsMap retrieves google projects
 func getGoogleProjectsMap(banzaiCLI cli.Cli, provider Provider) (serviceutils.IdToNameMap, error) {
-
 	projects, _, err := banzaiCLI.Client().GoogleApi.ListProjects(
 		context.Background(),
 		banzaiCLI.Context().OrganizationID(),
@@ -334,7 +330,6 @@ func getGoogleProjectsMap(banzaiCLI cli.Cli, provider Provider) (serviceutils.Id
 
 //getGoogleProjectsMap retrieves google projects
 func getAzureResourceGroupMap(banzaiCLI cli.Cli, provider Provider) ([]string, error) {
-
 	resourceGroups, _, err := banzaiCLI.Client().InfoApi.GetResourceGroups(
 		context.Background(),
 		banzaiCLI.Context().OrganizationID(),
diff --git a/internal/cli/command/cluster/integratedservice/services/expiry/manager.go b/internal/cli/command/cluster/integratedservice/services/expiry/manager.go
@@ -89,7 +89,6 @@ func (Manager) ValidateSpec(spec map[string]interface{}) error {
 }
 
 func (Manager) WriteDetailsTable(details pipeline.IntegratedServiceDetails) map[string]map[string]interface{} {
-
 	const (
 		expiryTitle = "Expiry"
 		statusTitle = "Status"
diff --git a/internal/cli/command/cluster/integratedservice/services/logging/manager.go b/internal/cli/command/cluster/integratedservice/services/logging/manager.go
@@ -278,7 +278,6 @@ func askIngress(componentType string, defaults ingressSpec) (*ingressSpec, error
 	}
 
 	if isEnabled {
-
 		if err := input.DoQuestions([]input.QuestionMaker{
 			input.QuestionInput{
 				QuestionBase: input.QuestionBase{
@@ -298,7 +297,6 @@ func askIngress(componentType string, defaults ingressSpec) (*ingressSpec, error
 		}); err != nil {
 			return nil, errors.WrapIf(err, "error during asking ingress fields")
 		}
-
 	}
 
 	return &ingressSpec{
@@ -433,7 +431,6 @@ func askBuckets(banzaiCLI cli.Cli, bucketType, secretID, defaultValue string) (*
 }
 
 func askClusterOutput(banzaiCLI cli.Cli, defaults clusterOutputSpec) (*clusterOutputSpec, error) {
-
 	var isEnabled bool
 	if err := input.DoQuestions([]input.QuestionMaker{
 		input.QuestionConfirm{
diff --git a/internal/cli/command/cluster/integratedservice/services/monitoring/manager.go b/internal/cli/command/cluster/integratedservice/services/monitoring/manager.go
@@ -49,7 +49,6 @@ func (Manager) ServiceName() string {
 }
 
 func (m Manager) BuildActivateRequestInteractively(clusterCtx clustercontext.Context) (pipeline.ActivateIntegratedServiceRequest, error) {
-
 	grafana, err := askGrafana(m.banzaiCLI, grafanaSpec{
 		Enabled:    true,
 		Dashboards: true,
@@ -135,7 +134,6 @@ func (m Manager) BuildActivateRequestInteractively(clusterCtx clustercontext.Con
 }
 
 func (m Manager) BuildUpdateRequestInteractively(clusterCtx clustercontext.Context, request *pipeline.UpdateIntegratedServiceRequest) error {
-
 	var spec serviceSpec
 	if err := mapstructure.Decode(request.Spec, &spec); err != nil {
 		return errors.WrapIf(err, "service specification does not conform to schema")
@@ -364,7 +362,6 @@ func askIngress(compType string, defaults baseIngressSpec) (*baseIngressSpec, er
 		if err := input.DoQuestions(questions); err != nil {
 			return nil, errors.WrapIf(err, "error during asking ingress fields")
 		}
-
 	}
 	return &baseIngressSpec{
 		Enabled: isIngressEnabled,
@@ -577,7 +574,6 @@ func askAlertmanager(banzaiCLI cli.Cli, defaults alertmanagerSpec) (*alertmanage
 }
 
 func askSecret(banzaiCLI cli.Cli, secretType, DefaultValue string, withSkipOption bool) (string, error) {
-
 	orgID := banzaiCLI.Context().OrganizationID()
 	secrets, _, err := banzaiCLI.Client().SecretsApi.GetSecrets(
 		context.Background(),
diff --git a/internal/cli/command/cluster/integratedservice/services/securityscan/common.go b/internal/cli/command/cluster/integratedservice/services/securityscan/common.go
@@ -41,7 +41,6 @@ type ServiceSpec struct {
 
 // Validate validates the input security scan specification.
 func (s ServiceSpec) Validate() error {
-
 	var validationErrors error
 
 	if s.CustomAnchore.Enabled {
@@ -68,7 +67,6 @@ type anchoreSpec struct {
 }
 
 func (a anchoreSpec) Validate() error {
-
 	if a.Enabled {
 		if a.Url == "" && a.SecretID == "" {
 			return errors.New("both anchore url and secretId are required")
diff --git a/internal/cli/command/cluster/integratedservice/services/securityscan/manager.go b/internal/cli/command/cluster/integratedservice/services/securityscan/manager.go
@@ -51,7 +51,6 @@ func (Manager) ServiceName() string {
 }
 
 func (m Manager) BuildActivateRequestInteractively(clusterCtx clustercontext.Context) (pipeline.ActivateIntegratedServiceRequest, error) {
-
 	if err := isServiceEnabled(context.Background(), m.banzaiCLI); err != nil {
 		return pipeline.ActivateIntegratedServiceRequest{}, errors.WrapIf(err, "securityscan is not enabled")
 	}
@@ -207,7 +206,6 @@ func isServiceEnabled(ctx context.Context, banzaiCLI cli.Cli) error {
 }
 
 func askForAnchoreConfig(banzaiCLI cli.Cli, currentAnchoreSpec *anchoreSpec) (*anchoreSpec, error) {
-
 	if currentAnchoreSpec == nil {
 		currentAnchoreSpec = &anchoreSpec{}
 	}
@@ -320,7 +318,6 @@ func getNamespaces(ctx context.Context, banzaiCLI cli.Cli, orgID int32, clusterI
 
 // policies are statically stored, the selection is made from a "wired" list
 func askForPolicy(policySpecIn policySpec) (policySpec, error) {
-
 	defaultPolicyBundle := utils.NameForID(policyBundles, policySpecIn.PolicyID)
 	if defaultPolicyBundle == "" {
 		defaultPolicyBundle = "Default bundle"
@@ -346,7 +343,6 @@ func askForPolicy(policySpecIn policySpec) (policySpec, error) {
 }
 
 func askForWebHookConfig(ctx context.Context, banzaiCLI cli.Cli, orgID int32, clusterID int32, webhookSpecIn webHookConfigSpec) (webHookConfigSpec, error) {
-
 	qs := []*survey.Question{
 		{
 			Name: "Enabled",
@@ -429,7 +425,6 @@ func askForWebHookConfig(ctx context.Context, banzaiCLI cli.Cli, orgID int32, cl
 }
 
 func askForWhiteLists() ([]releaseSpec, error) {
-
 	addMore := true
 	releaseWhiteList := make([]releaseSpec, 0)
 
@@ -458,7 +453,6 @@ func askForWhiteLists() ([]releaseSpec, error) {
 }
 
 func askForWhiteListItem() (*releaseSpec, error) {
-
 	var releaseName string
 	if err := survey.AskOne(
 		&survey.Input{
@@ -497,7 +491,6 @@ func askForWhiteListItem() (*releaseSpec, error) {
 }
 
 func assembleServiceSpec(ctx context.Context, banzaiCLI cli.Cli, orgID int32, clusterID int32, serviceSpecIn ServiceSpec) (ServiceSpec, error) {
-
 	policy, err := askForPolicy(serviceSpecIn.Policy)
 	if err != nil {
 		return ServiceSpec{}, errors.WrapIf(err, "failed to assembele policy data")
@@ -506,7 +499,6 @@ func assembleServiceSpec(ctx context.Context, banzaiCLI cli.Cli, orgID int32, cl
 	webhookConfig, err := askForWebHookConfig(ctx, banzaiCLI, orgID, clusterID, serviceSpecIn.WebhookConfig)
 	if err != nil {
 		return ServiceSpec{}, errors.WrapIf(err, "failed to assembele webhook data")
-
 	}
 
 	return ServiceSpec{
diff --git a/internal/cli/command/cluster/integratedservice/services/update.go b/internal/cli/command/cluster/integratedservice/services/update.go
@@ -86,7 +86,6 @@ func runUpdate(
 		request pipeline.UpdateIntegratedServiceRequest
 	)
 	if options.filePath == "" && banzaiCLI.Interactive() {
-
 		// get integratedservice details
 		details, _, err := banzaiCLI.Client().IntegratedServicesApi.IntegratedServiceDetails(context.Background(), orgID, clusterID, m.ServiceName())
 		if err != nil {
@@ -103,7 +102,6 @@ func runUpdate(
 		if err := showUpdateEditor(m, &request); err != nil {
 			return errors.WrapIf(err, "failed during showing editor")
 		}
-
 	} else {
 		if err := readUpdateReqFromFileOrStdin(options.filePath, &request); err != nil {
 			return errors.WrapIf(err, fmt.Sprintf("failed to read %s cluster service specification", m.ReadableName()))
diff --git a/internal/cli/command/cluster/integratedservice/services/vault/manager.go b/internal/cli/command/cluster/integratedservice/services/vault/manager.go
@@ -88,7 +88,6 @@ func (m Manager) BuildActivateRequestInteractively(clusterCtx clustercontext.Con
 }
 
 func (m Manager) BuildUpdateRequestInteractively(clusterCtx clustercontext.Context, request *pipeline.UpdateIntegratedServiceRequest) error {
-
 	var spec specResponse
 	if err := mapstructure.Decode(request.Spec, &spec); err != nil {
 		return errors.WrapIf(err, "service specification does not conform to schema")
diff --git a/internal/cli/command/cluster/shell.go b/internal/cli/command/cluster/shell.go
@@ -127,11 +127,9 @@ func runShell(banzaiCli cli.Cli, options shellOptions, args []string) error {
 		case "bash":
 			commandArgs = []string{"-i"}
 		}
-
 	} else if len(args) == 1 {
 		// let the shell split arg to words
 		commandArgs = []string{"-c", args[0]}
-
 	} else {
 		// exec args as separate words
 		shell = args[0]
diff --git a/internal/cli/command/controlplane/init.go b/internal/cli/command/controlplane/init.go
@@ -401,7 +401,6 @@ func runInit(options initOptions, banzaiCli cli.Cli) error {
 			return errors.WrapIf(err, "failed to determine installer image hash")
 		}
 		installer["image"] = strings.TrimSpace(string(ref))
-
 	} else {
 		installer["image"] = options.installerImage()
 	}
@@ -448,7 +447,6 @@ func initImageValues(options initOptions, out map[string]interface{}) (image str
 }
 
 func initStateBackend(options *cpContext, values map[string]interface{}) error {
-
 	var stateData []byte
 
 	if stateValues, ok := values["state"]; ok {
diff --git a/internal/cli/command/controlplane/kind.go b/internal/cli/command/controlplane/kind.go
@@ -56,7 +56,6 @@ func findKINDPath(banzaiCli cli.Cli) (string, error) {
 }
 
 func downloadKIND(banzaiCli cli.Cli) error {
-
 	src := fmt.Sprintf("https://github.com/kubernetes-sigs/kind/releases/download/%s/kind-%s-amd64", version, runtime.GOOS)
 
 	binDir := filepath.Join(banzaiCli.Home(), "bin")
diff --git a/internal/cli/command/controlplane/pke.go b/internal/cli/command/controlplane/pke.go
@@ -62,7 +62,6 @@ func findPKEPath(banzaiCli cli.Cli) (string, error) {
 }
 
 func downloadPKE(banzaiCli cli.Cli) error {
-
 	const src = "https://banzaicloud.com/downloads/pke/latest"
 
 	binDir := filepath.Join(banzaiCli.Home(), "bin")
diff --git a/internal/cli/command/login/login.go b/internal/cli/command/login/login.go
diff --git a/internal/cli/command/login/oidc.go b/internal/cli/command/login/oidc.go
diff --git a/internal/cli/command/secret/create.go b/internal/cli/command/secret/create.go
diff --git a/internal/cli/command/secret/install.go b/internal/cli/command/secret/install.go
diff --git a/internal/cli/input/secret.go b/internal/cli/input/secret.go

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,6 @@ func CheckPipelineEndpoint(endpoint string) (string, error, error) {`
`267`	`267`	`if err != nil {`
`268`	`268`	`return "", nil, errors.WrapIf(err, "failed to connect to Pipeline")`
`269`	`269`	`}`
`270`		`-`
`271`	`270`	`}`
`272`	`271`
`273`	`272`	`defer response.Body.Close()`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ type clusterContext struct {`
`40`	`40`	`const clusterIdKey = "cluster.id"`
`41`	`41`
`42`	`42`	`func NewClusterContext(cmd *cobra.Command, banzaiCli cli.Cli, verb string) Context {`
`43`		`-`
`44`	`43`	`ctx := clusterContext{`
`45`	`44`	`banzaiCli: banzaiCli,`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,6 @@ func buildDefaultRequest(out map[string]interface{}) error {`
`518`	`518`	`}`
`519`	`519`
`520`	`520`	`func buildSecretChoice(banzaiCli cli.Cli, orgID int32, cloud string, out map[string]interface{}) (string, error) {`
`521`		`-`
`522`	`521`	`if id, ok := out["secretId"].(string); id != "" && ok {`
`523`	`522`	`return id, nil`
`524`	`523`	`}`
`@@ -535,7 +534,6 @@ func buildSecretChoice(banzaiCli cli.Cli, orgID int32, cloud string, out map[str`
`535`	`534`
`536`	`535`	`// get ID from Name + validate`
`537`	`536`	`if name, ok := out["secretName"].(string); name != "" && ok {`
`538`		`-`
`539`	`537`	`for _, secret := range secrets {`
`540`	`538`	`if secret.Name == name {`
`541`	`539`	`return secret.Id, nil`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ func NewHelmCommand(banzaiCli cli.Cli) *cobra.Command {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`func writeHelm(url, name string) error {`
`59`		`-`
`60`	`59`	`tgz, err := http.Get(url) // #nosec`
`61`	`60`	`if err != nil {`
`62`	`61`	`return errors.WrapIff(err, "failed to download helm from %q", url)`