From 09f13c05e18ac1ec66c0dbd084e14a0791bf3b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20BIDON?= Date: Mon, 19 Dec 2022 14:26:13 +0100 Subject: [PATCH] fixed linting issues with minimal linters config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Frédéric BIDON --- cmd/completion/completion.go | 8 ++++---- core/cautils/customerloader.go | 5 +---- core/cautils/getter/getpoliciesutils.go | 7 ++++--- core/cautils/localgitrepository_test.go | 4 ++-- core/core/download.go | 6 +----- core/pkg/containerscan/containerscan_mock.go | 4 ++-- core/pkg/opaprocessor/processorhandlerutils.go | 14 ++++++++------ core/pkg/registryadaptors/gcp/v1/gcpadaptormock.go | 2 +- core/pkg/resourcehandler/k8sresources.go | 2 +- core/pkg/resourcehandler/remotegitutils.go | 6 +++--- 10 files changed, 27 insertions(+), 31 deletions(-) diff --git a/cmd/completion/completion.go b/cmd/completion/completion.go index 3a7ac1a5..453cb12b 100644 --- a/cmd/completion/completion.go +++ b/cmd/completion/completion.go @@ -9,11 +9,11 @@ import ( var completionCmdExamples = ` - # Enable BASH shell autocompletion - $ source <(kubescape completion bash) + # Enable BASH shell autocompletion + $ source <(kubescape completion bash) $ echo 'source <(kubescape completion bash)' >> ~/.bashrc - # Enable ZSH shell autocompletion + # Enable ZSH shell autocompletion $ source <(kubectl completion zsh) $ echo 'source <(kubectl completion zsh)' >> "${fpath[1]}/_kubectl" @@ -27,7 +27,7 @@ func GetCompletionCmd() *cobra.Command { Example: completionCmdExamples, DisableFlagsInUseLine: true, ValidArgs: []string{"bash", "zsh", "fish", "powershell"}, - Args: cobra.ExactValidArgs(1), + Args: cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs), Run: func(cmd *cobra.Command, args []string) { switch strings.ToLower(args[0]) { case "bash": diff --git a/core/cautils/customerloader.go b/core/cautils/customerloader.go index 733fb216..f45c9d8f 100644 --- a/core/cautils/customerloader.go +++ b/core/cautils/customerloader.go @@ -470,10 +470,7 @@ func (c *ClusterConfig) updateConfigMap() error { } func updateConfigFile(configObj *ConfigObj) error { - if err := os.WriteFile(ConfigFileFullPath(), configObj.Config(), 0664); err != nil { - return err - } - return nil + return os.WriteFile(ConfigFileFullPath(), configObj.Config(), 0664) //nolint:gosec } func (c *ClusterConfig) updateConfigData(configMap *corev1.ConfigMap) { diff --git a/core/cautils/getter/getpoliciesutils.go b/core/cautils/getter/getpoliciesutils.go index 7d822eb3..97e277f5 100644 --- a/core/cautils/getter/getpoliciesutils.go +++ b/core/cautils/getter/getpoliciesutils.go @@ -21,18 +21,19 @@ func SaveInFile(policy interface{}, pathStr string) error { if err != nil { return err } - err = os.WriteFile(pathStr, []byte(fmt.Sprintf("%v", string(encodedData))), 0644) + err = os.WriteFile(pathStr, encodedData, 0644) //nolint:gosec if err != nil { if os.IsNotExist(err) { pathDir := path.Dir(pathStr) - if err := os.Mkdir(pathDir, 0744); err != nil { + // pathDir could contain subdirectories + if err := os.MkdirAll(pathDir, 0755); err != nil { return err } } else { return err } - err = os.WriteFile(pathStr, []byte(fmt.Sprintf("%v", string(encodedData))), 0644) + err = os.WriteFile(pathStr, encodedData, 0644) //nolint:gosec if err != nil { return err } diff --git a/core/cautils/localgitrepository_test.go b/core/cautils/localgitrepository_test.go index 933aa10d..948c289a 100644 --- a/core/cautils/localgitrepository_test.go +++ b/core/cautils/localgitrepository_test.go @@ -27,7 +27,7 @@ func unzipFile(zipPath, destinationFolder string) (*zip.ReadCloser, error) { return nil, err } for _, f := range archive.File { - filePath := filepath.Join(destinationFolder, f.Name) + filePath := filepath.Join(destinationFolder, f.Name) //nolint:gosec if !strings.HasPrefix(filePath, filepath.Clean(destinationFolder)+string(os.PathSeparator)) { return nil, fmt.Errorf("invalid file path") } @@ -50,7 +50,7 @@ func unzipFile(zipPath, destinationFolder string) (*zip.ReadCloser, error) { return nil, err } - if _, err := io.Copy(dstFile, fileInArchive); err != nil { + if _, err := io.Copy(dstFile, fileInArchive); err != nil { //nolint:gosec return nil, err } diff --git a/core/core/download.go b/core/core/download.go index 49b355c2..bd7d8203 100644 --- a/core/core/download.go +++ b/core/core/download.go @@ -6,7 +6,6 @@ import ( "path/filepath" "strings" - "github.com/armosec/armoapi-go/armotypes" logger "github.com/kubescape/go-logger" "github.com/kubescape/go-logger/helpers" "github.com/kubescape/kubescape/v2/core/cautils/getter" @@ -114,13 +113,10 @@ func downloadConfigInputs(downloadInfo *metav1.DownloadInfo) error { } func downloadExceptions(downloadInfo *metav1.DownloadInfo) error { - var err error tenant := getTenantConfig(&downloadInfo.Credentials, "", "", getKubernetesApi()) - exceptionsGetter := getExceptionsGetter("", tenant.GetAccountID(), nil) - exceptions := []armotypes.PostureExceptionPolicy{} - exceptions, err = exceptionsGetter.GetExceptions(tenant.GetContextName()) + exceptions, err := exceptionsGetter.GetExceptions(tenant.GetContextName()) if err != nil { return err } diff --git a/core/pkg/containerscan/containerscan_mock.go b/core/pkg/containerscan/containerscan_mock.go index cac3471e..ba08017f 100644 --- a/core/pkg/containerscan/containerscan_mock.go +++ b/core/pkg/containerscan/containerscan_mock.go @@ -50,7 +50,7 @@ func randSeq(n int, bank []rune) string { b := make([]rune, n) for i := range b { - b[i] = bank[rand.Intn(len(bank))] + b[i] = bank[rand.Intn(len(bank))] //nolint:gosec } return string(b) } @@ -60,7 +60,7 @@ func GenerateContainerScanLayer(layer *ScanResultLayer) { layer.LayerHash = randSeq(32, hash) layer.Vulnerabilities = make(VulnerabilitiesList, 0) layer.Packages = make(LinuxPkgs, 0) - vuls := rand.Intn(10) + 1 + vuls := rand.Intn(10) + 1 //nolint:gosec for i := 0; i < vuls; i++ { v := Vulnerability{} diff --git a/core/pkg/opaprocessor/processorhandlerutils.go b/core/pkg/opaprocessor/processorhandlerutils.go index b468e668..89a74be0 100644 --- a/core/pkg/opaprocessor/processorhandlerutils.go +++ b/core/pkg/opaprocessor/processorhandlerutils.go @@ -15,9 +15,9 @@ import ( // updateResults updates the results objects and report objects. This is a critical function - DO NOT CHANGE // // The function: -// - removes sensible data -// - adds exceptions -// - summarizes results +// - removes sensible data +// - adds exceptions +// - summarizes results func (opap *OPAProcessor) updateResults() { // remove data from all objects @@ -117,9 +117,11 @@ func getKubernetesObjects(k8sResources *cautils.K8SResources, allResources map[s groupResources := k8sinterface.ResourceGroupToString(groups, version, resource) for _, groupResource := range groupResources { if k8sObj, ok := (*k8sResources)[groupResource]; ok { - if k8sObj == nil { - // logger.L().Debug("skipping", helpers.String("resource", groupResource)) - } + /* + if k8sObj == nil { + // logger.L().Debug("skipping", helpers.String("resource", groupResource)) + } + */ for i := range k8sObj { k8sObjects = append(k8sObjects, allResources[k8sObj[i]]) } diff --git a/core/pkg/registryadaptors/gcp/v1/gcpadaptormock.go b/core/pkg/registryadaptors/gcp/v1/gcpadaptormock.go index 1c936367..a95020eb 100644 --- a/core/pkg/registryadaptors/gcp/v1/gcpadaptormock.go +++ b/core/pkg/registryadaptors/gcp/v1/gcpadaptormock.go @@ -29,7 +29,7 @@ func (GCPAdaptorMock *GCPAdaptorMock) GetImagesVulnerabilities(imageIDs []regist resultList = append(resultList, *result) - return resultList, nil + return resultList, nil //nolint:staticcheck // we return at once and shorten the mocked result } GCPAdaptorMock.resultList = resultList diff --git a/core/pkg/resourcehandler/k8sresources.go b/core/pkg/resourcehandler/k8sresources.go index 72406c96..f1de0d20 100644 --- a/core/pkg/resourcehandler/k8sresources.go +++ b/core/pkg/resourcehandler/k8sresources.go @@ -247,7 +247,7 @@ func (k8sHandler *K8sResourceHandler) pullSingleResource(resource *schema.GroupV clientResource = k8sHandler.k8s.DynamicClient.Resource(*resource) } else if k8sinterface.IsNamespaceScope(resource) { clientResource = k8sHandler.k8s.DynamicClient.Resource(*resource).Namespace(namespace) - } else if k8sHandler.fieldSelector.GetClusterScope(*&resource) { + } else if k8sHandler.fieldSelector.GetClusterScope(resource) { clientResource = k8sHandler.k8s.DynamicClient.Resource(*resource) } else { continue diff --git a/core/pkg/resourcehandler/remotegitutils.go b/core/pkg/resourcehandler/remotegitutils.go index 8ab7b0c7..ce550bdc 100644 --- a/core/pkg/resourcehandler/remotegitutils.go +++ b/core/pkg/resourcehandler/remotegitutils.go @@ -15,12 +15,12 @@ import ( // To Check if the given repository is Public(No Authentication needed), send a HTTP GET request to the URL // If response code is 200, the repository is Public. -func isGitRepoPublic(URL string) bool { - resp, err := nethttp.Get(URL) - +func isGitRepoPublic(u string) bool { + resp, err := nethttp.Get(u) //nolint:gosec if err != nil { return false } + // if the status code is 200, our get request is successful. // It only happens when the repository is public. if resp.StatusCode == 200 {