From 68681bf49de8597d5c8ba55b0a0f94235f9295d9 Mon Sep 17 00:00:00 2001 From: "Adam D. Cornett" Date: Thu, 15 Sep 2022 14:58:00 -0700 Subject: [PATCH] fix lint issues in main Signed-off-by: Adam D. Cornett --- cmd/check_container.go | 9 ++++----- cmd/check_container_test.go | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/cmd/check_container.go b/cmd/check_container.go index 794e5700..8e0a2180 100644 --- a/cmd/check_container.go +++ b/cmd/check_container.go @@ -2,7 +2,6 @@ package cmd import ( "context" - "errors" "fmt" "strings" @@ -29,7 +28,7 @@ func checkContainerCmd() *cobra.Command { Args: checkContainerPositionalArgs, // this fmt.Sprintf is in place to keep spacing consistent with cobras two spaces that's used in: Usage, Flags, etc Example: fmt.Sprintf(" %s", "preflight check container quay.io/repo-name/container-name:version"), - PreRunE: validateCertificationProjectId, + PreRunE: validateCertificationProjectID, RunE: checkContainerRunE, } @@ -211,16 +210,16 @@ func checkContainerPositionalArgs(cmd *cobra.Command, args []string) error { return nil } -// validateCertificationProjectId validates that the certification project id is in the proper format +// validateCertificationProjectID validates that the certification project id is in the proper format // and throws an error if the value provided is in a legacy format that is not usable to query pyxis -func validateCertificationProjectId(cmd *cobra.Command, args []string) error { +func validateCertificationProjectID(cmd *cobra.Command, args []string) error { certificationProjectID := viper.GetString("certification_project_id") // splitting the certification project id into parts. if there are more than 2 elements in the array, // we know they inputted a legacy project id, which can not be used to query pyxis parts := strings.Split(certificationProjectID, "-") if len(parts) > 2 { - return errors.New(fmt.Sprintf("certification project id: %s is improperly formatted see help command for instructions on obtaining proper value", certificationProjectID)) + return fmt.Errorf("certification project id: %s is improperly formatted see help command for instructions on obtaining proper value", certificationProjectID) } if parts[0] == "ospid" { diff --git a/cmd/check_container_test.go b/cmd/check_container_test.go index e72bcd53..6150ce28 100644 --- a/cmd/check_container_test.go +++ b/cmd/check_container_test.go @@ -536,7 +536,7 @@ certification_project_id: mycertid` viper.Set("certification_project_id", "123456789") }) It("should not change the flag value", func() { - err := validateCertificationProjectId(checkContainerCmd(), []string{"foo"}) + err := validateCertificationProjectID(checkContainerCmd(), []string{"foo"}) Expect(err).ToNot(HaveOccurred()) Expect(viper.GetString("certification_project_id")).To(Equal("123456789")) }) @@ -546,7 +546,7 @@ certification_project_id: mycertid` viper.Set("certification_project_id", "ospid-123456789") }) It("should strip ospid- from the flag value", func() { - err := validateCertificationProjectId(checkContainerCmd(), []string{"foo"}) + err := validateCertificationProjectID(checkContainerCmd(), []string{"foo"}) Expect(err).ToNot(HaveOccurred()) Expect(viper.GetString("certification_project_id")).To(Equal("123456789")) }) @@ -556,7 +556,7 @@ certification_project_id: mycertid` viper.Set("certification_project_id", "ospid-62423-f26c346-6cc1dc7fae92") }) It("should throw an error", func() { - err := validateCertificationProjectId(checkContainerCmd(), []string{"foo"}) + err := validateCertificationProjectID(checkContainerCmd(), []string{"foo"}) Expect(err).To(HaveOccurred()) }) }) @@ -565,7 +565,7 @@ certification_project_id: mycertid` viper.Set("certification_project_id", "62423-f26c346-6cc1dc7fae92") }) It("should throw an error", func() { - err := validateCertificationProjectId(checkContainerCmd(), []string{"foo"}) + err := validateCertificationProjectID(checkContainerCmd(), []string{"foo"}) Expect(err).To(HaveOccurred()) }) })