diff --git a/cmd/describe/ingress/cmd_test.go b/cmd/describe/ingress/cmd_test.go index 6cd70a0a7f..845d6dbc6e 100644 --- a/cmd/describe/ingress/cmd_test.go +++ b/cmd/describe/ingress/cmd_test.go @@ -139,7 +139,9 @@ Wildcard Policy: WildcardsAllowed Expect(err).ToNot(BeNil()) Expect( err.Error(), - ).To(Equal("ingress identifier 'A1b2' isn't valid: it must contain only letters or digits")) + ).To(Equal( + "Ingress identifier 'A1b2' isn't valid: it must contain between three and five lowercase letters or digits", + )) }) It("Cluster not ready", func() { diff --git a/cmd/describe/ingress/options.go b/cmd/describe/ingress/options.go index f17bd5e07a..0804539e84 100644 --- a/cmd/describe/ingress/options.go +++ b/cmd/describe/ingress/options.go @@ -33,7 +33,7 @@ func (i *DescribeIngressOptions) Bind(args DescribeIngressUserOptions) error { ingressKey := args.ingress if !ingressKeyRE.MatchString(ingressKey) { return fmt.Errorf( - "ingress identifier '%s' isn't valid: it must contain only letters or digits", + "Ingress identifier '%s' isn't valid: it must contain between three and five lowercase letters or digits", ingressKey, ) } diff --git a/cmd/dlt/ingress/cmd.go b/cmd/dlt/ingress/cmd.go index 10f009faad..df827c81d8 100644 --- a/cmd/dlt/ingress/cmd.go +++ b/cmd/dlt/ingress/cmd.go @@ -65,7 +65,7 @@ func run(_ *cobra.Command, argv []string) { ingressID := argv[0] if !ingressKeyRE.MatchString(ingressID) { r.Reporter.Errorf( - "Ingress identifier '%s' isn't valid: it must contain only four letters or digits", + "Ingress identifier '%s' isn't valid: it must contain between three and five lowercase letters or digits", ingressID, ) os.Exit(1) diff --git a/cmd/edit/ingress/cmd.go b/cmd/edit/ingress/cmd.go index dcfe5ef238..1050c12ec3 100644 --- a/cmd/edit/ingress/cmd.go +++ b/cmd/edit/ingress/cmd.go @@ -159,7 +159,7 @@ func run(cmd *cobra.Command, argv []string) { ingressKey := argv[0] if !ingressKeyRE.MatchString(ingressKey) { r.Reporter.Errorf( - "Ingress identifier '%s' isn't valid: it must contain only letters or digits", + "Ingress identifier '%s' isn't valid: it must contain between three and five lowercase letters or digits", ingressKey, ) os.Exit(1) diff --git a/tests/e2e/test_rosacli_ingress.go b/tests/e2e/test_rosacli_ingress.go index 3d7cdf6c69..1eb7abaeb7 100644 --- a/tests/e2e/test_rosacli_ingress.go +++ b/tests/e2e/test_rosacli_ingress.go @@ -175,7 +175,9 @@ var _ = Describe("Edit default ingress", By("Get cluster ingress with invalid/non-existing cluster id") out, err := rosaClient.Ingress.DescribeIngress(clusterID, "xxx") Expect(err).To(HaveOccurred()) - Expect(out.String()).Should(ContainSubstring("ERR: Failed to get ingress 'xxx' for cluster '%s'", clusterID)) + Expect( + out.String(), + ).Should(ContainSubstring("ERR: Failed to get ingress 'xxx' for cluster '%s'", clusterID)) }) It("change load balancer type - [id:64767]", @@ -278,7 +280,9 @@ var _ = Describe("Edit default ingress", defaultIngressRouteSelectorList := strings.Split(ingressConfig.DefaultIngressRouteSelector, ",") defaultIngressRouteSelector_1 := defaultIngressRouteSelectorList[1] + ", " + defaultIngressRouteSelectorList[0] defaultIngressRouteSelector_2 := defaultIngressRouteSelectorList[0] + ", " + defaultIngressRouteSelectorList[1] - Expect(ingress.RouteSelectors).To(Or(Equal(defaultIngressRouteSelector_1), Equal(defaultIngressRouteSelector_2))) + Expect( + ingress.RouteSelectors, + ).To(Or(Equal(defaultIngressRouteSelector_1), Equal(defaultIngressRouteSelector_2))) Expect(ingress.NamespaceOwnershipPolicy).To(Equal(ingressConfig.DefaultIngressNamespaceOwnershipPolicy)) Expect(ingress.WildcardPolicy).To(Equal(ingressConfig.DefaultIngressWildcardPolicy)) }) @@ -379,7 +383,9 @@ var _ = Describe("Edit default ingress", ) if profile.ClusterConfig.PrivateLink && !isHosted { Expect(err).To(HaveOccurred()) - Expect(output.String()).Should(ContainSubstring("Can't update listening mode on an AWS Private Link cluster")) + Expect( + output.String(), + ).Should(ContainSubstring("Can't update listening mode on an AWS Private Link cluster")) By("Edit label-match only") output, err = rosaClient.Ingress.EditIngress(clusterID, @@ -496,7 +502,7 @@ var _ = Describe("Edit ingress", ) Expect(err).To(HaveOccurred()) Expect(output.String()).Should( - ContainSubstring("Ingress identifier 'notexisting' isn't valid")) + ContainSubstring("Ingress identifier 'notexisting' isn't valid")) By("Edit ingress with invalid LB-type") output, err = ingressService.EditIngress(clusterID, "apps", @@ -569,7 +575,10 @@ var _ = Describe("Delete ingress validations", output, err = ingressService.DeleteIngress(clusterID, invalidIngress) Expect(err).To(HaveOccurred()) Expect(output.String()).Should( - ContainSubstring("identifier '%s' isn't valid: it must contain only four letters or digits", invalidIngress)) + ContainSubstring( + "identifier '%s' isn't valid: it must contain between three and five lowercase letters or digits", + invalidIngress, + )) }) })