From 07c0904ed488cb879da4dcdf4f322ac7ae742b53 Mon Sep 17 00:00:00 2001 From: azadeh khojandi Date: Thu, 4 Jul 2019 14:28:49 +1000 Subject: [PATCH 1/3] Update resource.go --- pkg/scaffold/v1/resource/resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/scaffold/v1/resource/resource.go b/pkg/scaffold/v1/resource/resource.go index d876153f0a4..c3a1f799d58 100644 --- a/pkg/scaffold/v1/resource/resource.go +++ b/pkg/scaffold/v1/resource/resource.go @@ -75,7 +75,7 @@ func (r *Resource) Validate() error { "version must match ^v\\d+(alpha\\d+|beta\\d+)?$ (was %s)", r.Version) } if r.Kind != flect.Pascalize(r.Kind) { - return fmt.Errorf("kind must be camelcase (expected %s was %s)", flect.Pascalize(r.Kind), r.Kind) + return fmt.Errorf("kind must be PascalCase (expected %s was %s)", flect.Pascalize(r.Kind), r.Kind) } return nil From ad021c96fa7a369b8074c15bd2954003b3d2824f Mon Sep 17 00:00:00 2001 From: azadeh khojandi Date: Thu, 4 Jul 2019 14:35:15 +1000 Subject: [PATCH 2/3] Update resource_test.go --- pkg/scaffold/v1/resource/resource_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/scaffold/v1/resource/resource_test.go b/pkg/scaffold/v1/resource/resource_test.go index c207e28cb9c..76554a541cf 100644 --- a/pkg/scaffold/v1/resource/resource_test.go +++ b/pkg/scaffold/v1/resource/resource_test.go @@ -78,7 +78,7 @@ var _ = Describe("Resource", func() { Expect(instance.Validate().Error()).To(ContainSubstring("kind cannot be empty")) }) - It("should fail if the Kind is not camel cased", func() { + It("should fail if the Kind is not pascal cased", func() { // Base case instance := &resource.Resource{Group: "crew", Kind: "FirstMate", Version: "v1"} Expect(instance.Validate()).To(Succeed()) @@ -90,12 +90,12 @@ var _ = Describe("Resource", func() { instance = &resource.Resource{Group: "crew", Kind: "firstMate", Version: "v1"} Expect(instance.Validate()).NotTo(Succeed()) Expect(instance.Validate().Error()).To(ContainSubstring( - `kind must be camelcase (expected FirstMate was firstMate)`)) + `kind must be PascalCase (expected FirstMate was firstMate)`)) instance = &resource.Resource{Group: "crew", Kind: "firstmate", Version: "v1"} Expect(instance.Validate()).NotTo(Succeed()) Expect(instance.Validate().Error()).To(ContainSubstring( - `kind must be camelcase (expected Firstmate was firstmate)`)) + `kind must be PascalCase (expected FirstMate was firstmate)`)) }) It("should default the Resource by pluralizing the Kind", func() { From 23aeb52f5fc0a0b95d8de27830c2f01b85217484 Mon Sep 17 00:00:00 2001 From: azadeh khojandi Date: Wed, 10 Jul 2019 15:39:16 +1000 Subject: [PATCH 3/3] Update resource_test.go --- pkg/scaffold/v1/resource/resource_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/scaffold/v1/resource/resource_test.go b/pkg/scaffold/v1/resource/resource_test.go index 76554a541cf..a471f08ee17 100644 --- a/pkg/scaffold/v1/resource/resource_test.go +++ b/pkg/scaffold/v1/resource/resource_test.go @@ -95,7 +95,7 @@ var _ = Describe("Resource", func() { instance = &resource.Resource{Group: "crew", Kind: "firstmate", Version: "v1"} Expect(instance.Validate()).NotTo(Succeed()) Expect(instance.Validate().Error()).To(ContainSubstring( - `kind must be PascalCase (expected FirstMate was firstmate)`)) + `kind must be PascalCase (expected Firstmate was firstmate)`)) }) It("should default the Resource by pluralizing the Kind", func() {