merging main

.golangci.yaml

@@ -1,5 +1,3 @@
-## golangci-lint v1.46.2
-
 # References:
 # - https://golangci-lint.run/usage/linters/
 # - https://gist.github.com/maratori/47a4d00457a92aa426dbd48a18776322
@@ -20,114 +18,23 @@ linters-settings:
 
   # Non-default
   cyclop:
-    # Top 3:
-    # (*SpectroClusterReconciler).reconcileOnPilot: 80
-    # (*SpectroClusterReconciler).reconcilePacks: 65
-    # clusterdeployer (*manager).Reconcile: 52
-    max-complexity: 80 # maximal code complexity to report; default 10
-    package-average: 16.0 # maximal average package complexity to report; default 0.0
+    max-complexity: 13 # maximal code complexity to report; default 10
+    package-average: 0.0 # maximal average package complexity to report; default 0.0
   gocognit:
-    # Top 3:
-    # (*SpectroClusterReconciler).reconcileOnPilot: 158
-    # (*SpectroClusterReconciler).reconcilePacks: 136
-    # clusterdeployer (*manager).Reconcile: 107
-    min-complexity: 158 # minimal code complexity to report; default: 30
+    min-complexity: 30 # minimal code complexity to report; default: 30
 
 linters:
   disable-all: true
   enable:
-    ## enabled by default
     - errcheck # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases
     - gosimple # Linter for Go source code that specializes in simplifying a code
     - govet # Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string
     - ineffassign # Detects when assignments to existing variables are not used
     - staticcheck # Staticcheck is a go vet on steroids, applying a ton of static analysis checks
     - typecheck # Like the front-end of a Go compiler, parses and type-checks Go code
     - unused # Checks Go code for unused constants, variables, functions and types
-    ## disabled by default
     - cyclop # checks function and package cyclomatic complexity
     - gocognit # Computes and checks the cognitive complexity of functions
-    ## disabled
-    #- asciicheck # Simple linter to check that your code does not contain non-ASCII identifiers
-    #- bidichk # Checks for dangerous unicode character sequences
-    #- bodyclose # checks whether HTTP response body is closed successfully
-    #- containedctx # containedctx is a linter that detects struct contained context.Context field
-    #- contextcheck # check the function whether use a non-inherited context
-    #- decorder # check declaration order and count of types, constants, variables and functions
-    #- depguard # [replaced by gomodguard] Go linter that checks if package imports are in a list of acceptable packages
-    #- dogsled # Checks assignments with too many blank identifiers (e.g. x, _, _, _, := f())
-    #- dupl # Tool for code clone detection
-    #- durationcheck # check for two durations multiplied together
-    #- errchkjson # Checks types passed to the json encoding functions. Reports unsupported types and optionally reports occasions, where the check for the returned error can be omitted.
-    #- errname # Checks that sentinel errors are prefixed with the Err and error types are suffixed with the Error.
-    #- errorlint # errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13.
-    #- execinquery # execinquery is a linter about query string checker in Query function which reads your Go src files and warning it finds
-    #- exhaustive # check exhaustiveness of enum switch statements
-    #- exhaustivestruct # [deprecated, replaced by exhaustruct] Checks if all struct's fields are initialized
-    #- exhaustruct # [can be enabled, but have to be configured] Checks if all structure fields are initialized
-    #- exportloopref # checks for pointers to enclosing loop variables
-    #- forbidigo # Forbids identifiers
-    #- forcetypeassert # [replaced by errcheck] finds forced type assertions
-    #- funlen # Tool for detection of long functions
-    #- gci # Gci controls golang package import order and makes it always deterministic.
-    #- gocyclo # Computes and checks the cyclomatic complexity of functions
-    #- godox # Tool for detection of FIXME, TODO and other comment keywords
-    #- goerr113 # [too strict] Golang linter to check the errors handling expressions
-    #- gofmt # [replaced by goimports] Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification
-    #- gofumpt # [replaced by goimports, gofumports is not available yet] Gofumpt checks whether code was gofumpt-ed.
-    #- goheader # Checks is file header matches to pattern
-    #- golint # [deprecated, replaced by revive] Golint differs from gofmt. Gofmt reformats Go source code, whereas golint prints out style mistakes
-    #- grouper # An analyzer to analyze expression groups.
-    #- gochecknoglobals # check that no global variables exist
-    #- gochecknoinits # Checks that no init functions are present in Go code
-    #- goconst # Finds repeated strings that could be replaced by a constant
-    #- gocritic # Provides diagnostics that check for bugs, performance and style issues.
-    #- godot # Check if comments end in a period
-    #- goimports # In addition to fixing imports, goimports also formats your code in the same style as gofmt.
-    #- gomnd # An analyzer to detect magic numbers.
-    #- gomoddirectives # Manage the use of 'replace', 'retract', and 'excludes' directives in go.mod.
-    #- gomodguard # Allow and block list linter for direct Go module dependencies. This is different from depguard where there are different block types for example version constraints and module recommendations.
-    #- goprintffuncname # Checks that printf-like functions are named with f at the end
-    #- gosec # Inspects source code for security problems
-    #- ifshort # Checks that your code uses short syntax for if-statements whenever possible
-    #- importas # Enforces consistent import aliases
-    #- interfacer # [deprecated] Linter that suggests narrower interface types
-    #- ireturn # [good, but too strict] Accept Interfaces, Return Concrete Types
-    #- lll # Reports long lines
-    #- maintidx # maintidx measures the maintainability index of each function.
-    #- makezero # Finds slice declarations with non-zero initial length
-    #- maligned # [deprecated, replaced by govet fieldalignment] Tool to detect Go structs that would take less memory if their fields were sorted
-    #- misspell # [useless] Finds commonly misspelled English words in comments
-    #- nakedret # Finds naked returns in functions greater than a specified function length
-    #- nestif # Reports deeply nested if statements
-    #- nilerr # Finds the code that returns nil even if it checks that the error is not nil.
-    #- nilnil # Checks that there is no simultaneous return of nil error and an invalid value.
-    #- nlreturn # [too strict and mostly code is not more readable] nlreturn checks for a new line before return and branch statements to increase code clarity
-    #- noctx # noctx finds sending http request without context.Context
-    #- nolintlint # Reports ill-formed or insufficient nolint directives
-    #- nonamedreturns # Reports all named returns
-    #- nosprintfhostport # Checks for misuse of Sprintf to construct a host with port in a URL.
-    #- paralleltest # [too many false positives] paralleltest detects missing usage of t.Parallel() method in your Go test
-    #- prealloc # Finds slice declarations that could potentially be preallocated
-    #- predeclared # find code that shadows one of Go's predeclared identifiers
-    #- promlinter # Check Prometheus metrics naming via promlint
-    #- revive # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint.
-    #- rowserrcheck # checks whether Err of rows is checked successfully
-    #- scopelint # [deprecated, replaced by exportloopref] Scopelint checks for unpinned variables in go programs
-    #- sqlclosecheck # Checks that sql.Rows and sql.Stmt are closed.
-    #- stylecheck # Stylecheck is a replacement for golint
-    #- tagliatelle # Checks the struct tags.
-    #- tenv # tenv is analyzer that detects using os.Setenv instead of t.Setenv since Go1.17
-    #- testpackage # linter that makes you use a separate _test package
-    #- thelper # thelper detects golang test helpers without t.Helper() call and checks the consistency of test helpers
-    #- tparallel # tparallel detects inappropriate usage of t.Parallel() method in your Go test codes
-    #- unconvert # Remove unnecessary type conversions
-    #- unparam # Reports unused function parameters
-    #- varnamelen # [great idea, but too many false positives] checks that the length of a variable's name matches its scope
-    #- wastedassign # wastedassign finds wasted assignment statements.
-    #- whitespace # Tool for detection of leading and trailing whitespace
-    #- wrapcheck # [too strict] Checks that errors returned from external packages are wrapped
-    #- wsl # [too strict and mostly code is not more readable] Whitespace Linter - Forces you to use empty lines!
 
 issues:
   max-issues-per-linter: 0

Makefile

@@ -3,7 +3,7 @@
 
 .DEFAULT_GOAL:=help
 
-GOLANGCI_VERSION ?= 1.51.1
+GOLANGCI_VERSION ?= 1.54.2
 
 BIN_DIR ?= ./bin
 GOOS ?= $(shell go env GOOS)

client/account.go

@@ -10,11 +10,6 @@ import (
 )
 
 func (h *V1Client) ListCloudAccounts(scope string) ([]*models.V1CloudAccountSummary, error) {
-	client, err := h.GetClusterClient()
-	if err != nil {
-		return nil, err
-	}
-
 	var params *clusterC.V1CloudAccountsListSummaryParams
 	switch scope {
 	case "project":
@@ -25,7 +20,7 @@ func (h *V1Client) ListCloudAccounts(scope string) ([]*models.V1CloudAccountSumm
 	}
 	var limit int64 = 0
 	params.Limit = &limit
-	resp, err := client.V1CloudAccountsListSummary(params)
+	resp, err := h.GetClusterClient().V1CloudAccountsListSummary(params)
 
 	var e *transport.TransportError
 	if errors.As(err, &e) && e.HttpCode == 404 {

client/account_aws.go

@@ -21,14 +21,8 @@ func toV1AwsCloudAccount(account *models.V1AwsAccount) *models.V1AwsCloudAccount
 }
 
 func (h *V1Client) CreateCloudAccountAws(account *models.V1AwsAccount, AccountContext string) (string, error) {
-	client, err := h.GetClusterClient()
-	if err != nil {
-		return "", err
-	}
-
 	// validate account
-	err = validateCloudAccountAws(account, h)
-	if err != nil {
+	if err := validateCloudAccountAws(account, h); err != nil {
 		return "", err
 	}
 
@@ -40,7 +34,7 @@ func (h *V1Client) CreateCloudAccountAws(account *models.V1AwsAccount, AccountCo
 		params = clusterC.NewV1CloudAccountsAwsCreateParams().WithBody(account)
 	}
 
-	success, err := client.V1CloudAccountsAwsCreate(params)
+	success, err := h.GetClusterClient().V1CloudAccountsAwsCreate(params)
 	if err != nil {
 		return "", err
 	}
@@ -49,22 +43,15 @@ func (h *V1Client) CreateCloudAccountAws(account *models.V1AwsAccount, AccountCo
 }
 
 func validateCloudAccountAws(account *models.V1AwsAccount, h *V1Client) error {
-	client, err := h.GetCloudClient()
-	if err != nil {
-		return err
-	}
-
-	PcgId := account.Metadata.Annotations[OverlordUID]
 	// check PCG
-	err = h.CheckPCG(PcgId)
-	if err != nil {
+	if err := h.CheckPCG(account.Metadata.Annotations[OverlordUID]); err != nil {
 		return err
 	}
 
 	// validate account
 	paramsValidate := cloudC.NewV1AwsAccountValidateParams()
 	paramsValidate = paramsValidate.WithAwsCloudAccount(toV1AwsCloudAccount(account))
-	_, err = client.V1AwsAccountValidate(paramsValidate)
+	_, err := h.GetCloudClient().V1AwsAccountValidate(paramsValidate)
 	if err != nil {
 		return err
 	}
@@ -73,54 +60,38 @@ func validateCloudAccountAws(account *models.V1AwsAccount, h *V1Client) error {
 }
 
 func (h *V1Client) UpdateCloudAccountAws(account *models.V1AwsAccount) error {
-	client, err := h.GetClusterClient()
-	if err != nil {
-		return err
-	}
-
 	// validate account
-	err = validateCloudAccountAws(account, h)
-	if err != nil {
+	if err := validateCloudAccountAws(account, h); err != nil {
 		return err
 	}
 
 	uid := account.Metadata.UID
 	params := clusterC.NewV1CloudAccountsAwsUpdateParamsWithContext(h.Ctx).WithUID(uid).WithBody(account)
-	_, err = client.V1CloudAccountsAwsUpdate(params)
+	_, err := h.GetClusterClient().V1CloudAccountsAwsUpdate(params)
 	return err
 }
 
 func (h *V1Client) DeleteCloudAccountAws(uid, AccountContext string) error {
-	client, err := h.GetClusterClient()
-	if err != nil {
-		return err
-	}
-
 	var params *clusterC.V1CloudAccountsAwsDeleteParams
 	switch AccountContext {
 	case "project":
 		params = clusterC.NewV1CloudAccountsAwsDeleteParamsWithContext(h.Ctx).WithUID(uid)
 	case "tenant":
 		params = clusterC.NewV1CloudAccountsAwsDeleteParams().WithUID(uid)
 	}
-	_, err = client.V1CloudAccountsAwsDelete(params)
+	_, err := h.GetClusterClient().V1CloudAccountsAwsDelete(params)
 	return err
 }
 
 func (h *V1Client) GetCloudAccountAws(uid, AccountContext string) (*models.V1AwsAccount, error) {
-	client, err := h.GetClusterClient()
-	if err != nil {
-		return nil, err
-	}
-
 	var params *clusterC.V1CloudAccountsAwsGetParams
 	switch AccountContext {
 	case "project":
 		params = clusterC.NewV1CloudAccountsAwsGetParamsWithContext(h.Ctx).WithUID(uid)
 	case "tenant":
 		params = clusterC.NewV1CloudAccountsAwsGetParams().WithUID(uid)
 	}
-	success, err := client.V1CloudAccountsAwsGet(params)
+	success, err := h.GetClusterClient().V1CloudAccountsAwsGet(params)
 
 	var e *transport.TransportError
 	if errors.As(err, &e) && e.HttpCode == 404 {
@@ -133,14 +104,9 @@ func (h *V1Client) GetCloudAccountAws(uid, AccountContext string) (*models.V1Aws
 }
 
 func (h *V1Client) GetCloudAccountsAws() ([]*models.V1AwsAccount, error) {
-	client, err := h.GetClusterClient()
-	if err != nil {
-		return nil, err
-	}
-
 	limit := int64(0)
 	params := clusterC.NewV1CloudAccountsAwsListParamsWithContext(h.Ctx).WithLimit(&limit)
-	response, err := client.V1CloudAccountsAwsList(params)
+	response, err := h.GetClusterClient().V1CloudAccountsAwsList(params)
 	if err != nil {
 		return nil, err
 	}