pkg/annotation: unexport default annotation names

Author: joelanford

pkg/annotation/annotation.go

@@ -52,23 +52,23 @@ type InstallDisableHooks struct {
 var _ Install = &InstallDisableHooks{}
 
 const (
-	DefaultDomain                    = "helm.operator-sdk"
-	DefaultInstallDisableHooksName   = DefaultDomain + "/install-disable-hooks"
-	DefaultUpgradeDisableHooksName   = DefaultDomain + "/upgrade-disable-hooks"
-	DefaultUninstallDisableHooksName = DefaultDomain + "/uninstall-disable-hooks"
+	defaultDomain                    = "helm.operator-sdk"
+	defaultInstallDisableHooksName   = defaultDomain + "/install-disable-hooks"
+	defaultUpgradeDisableHooksName   = defaultDomain + "/upgrade-disable-hooks"
+	defaultUninstallDisableHooksName = defaultDomain + "/uninstall-disable-hooks"
 
-	DefaultUpgradeForceName = DefaultDomain + "/upgrade-force"
+	defaultUpgradeForceName = defaultDomain + "/upgrade-force"
 
-	DefaultInstallDescriptionName   = DefaultDomain + "/install-description"
-	DefaultUpgradeDescriptionName   = DefaultDomain + "/upgrade-description"
-	DefaultUninstallDescriptionName = DefaultDomain + "/uninstall-description"
+	defaultInstallDescriptionName   = defaultDomain + "/install-description"
+	defaultUpgradeDescriptionName   = defaultDomain + "/upgrade-description"
+	defaultUninstallDescriptionName = defaultDomain + "/uninstall-description"
 )
 
 func (i InstallDisableHooks) Name() string {
 	if i.CustomName != "" {
 		return i.CustomName
 	}
-	return DefaultInstallDisableHooksName
+	return defaultInstallDisableHooksName
 }
 
 func (i InstallDisableHooks) InstallOption(val string) helmclient.InstallOption {
@@ -92,7 +92,7 @@ func (u UpgradeDisableHooks) Name() string {
 	if u.CustomName != "" {
 		return u.CustomName
 	}
-	return DefaultUpgradeDisableHooksName
+	return defaultUpgradeDisableHooksName
 }
 
 func (u UpgradeDisableHooks) UpgradeOption(val string) helmclient.UpgradeOption {
@@ -116,7 +116,7 @@ func (u UpgradeForce) Name() string {
 	if u.CustomName != "" {
 		return u.CustomName
 	}
-	return DefaultUpgradeForceName
+	return defaultUpgradeForceName
 }
 
 func (u UpgradeForce) UpgradeOption(val string) helmclient.UpgradeOption {
@@ -140,7 +140,7 @@ func (u UninstallDisableHooks) Name() string {
 	if u.CustomName != "" {
 		return u.CustomName
 	}
-	return DefaultUninstallDisableHooksName
+	return defaultUninstallDisableHooksName
 }
 
 func (u UninstallDisableHooks) UninstallOption(val string) helmclient.UninstallOption {
@@ -164,7 +164,7 @@ func (i InstallDescription) Name() string {
 	if i.CustomName != "" {
 		return i.CustomName
 	}
-	return DefaultInstallDescriptionName
+	return defaultInstallDescriptionName
 }
 func (i InstallDescription) InstallOption(v string) helmclient.InstallOption {
 	return func(i *action.Install) error {
@@ -183,7 +183,7 @@ func (u UpgradeDescription) Name() string {
 	if u.CustomName != "" {
 		return u.CustomName
 	}
-	return DefaultUpgradeDescriptionName
+	return defaultUpgradeDescriptionName
 }
 func (u UpgradeDescription) UpgradeOption(v string) helmclient.UpgradeOption {
 	return func(upgrade *action.Upgrade) error {
@@ -202,7 +202,7 @@ func (u UninstallDescription) Name() string {
 	if u.CustomName != "" {
 		return u.CustomName
 	}
-	return DefaultUninstallDescriptionName
+	return defaultUninstallDescriptionName
 }
 func (u UninstallDescription) UninstallOption(v string) helmclient.UninstallOption {
 	return func(uninstall *action.Uninstall) error {

pkg/annotation/annotation_test.go

@@ -14,14 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package annotation_test
+package annotation
 
 import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"helm.sh/helm/v3/pkg/action"
-
-	"github.com/joelanford/helm-operator/pkg/annotation"
 )
 
 var _ = Describe("Annotation", func() {
@@ -33,14 +31,14 @@ var _ = Describe("Annotation", func() {
 		})
 
 		Describe("DisableHooks", func() {
-			var a annotation.InstallDisableHooks
+			var a InstallDisableHooks
 
 			BeforeEach(func() {
-				a = annotation.InstallDisableHooks{}
+				a = InstallDisableHooks{}
 			})
 
 			It("should return a default name", func() {
-				Expect(a.Name()).To(Equal(annotation.DefaultInstallDisableHooksName))
+				Expect(a.Name()).To(Equal(defaultInstallDisableHooksName))
 			})
 
 			It("should return a custom name", func() {
@@ -68,14 +66,14 @@ var _ = Describe("Annotation", func() {
 		})
 
 		Describe("Description", func() {
-			var a annotation.InstallDescription
+			var a InstallDescription
 
 			BeforeEach(func() {
-				a = annotation.InstallDescription{}
+				a = InstallDescription{}
 			})
 
 			It("should return a default name", func() {
-				Expect(a.Name()).To(Equal(annotation.DefaultInstallDescriptionName))
+				Expect(a.Name()).To(Equal(defaultInstallDescriptionName))
 			})
 
 			It("should return a custom name", func() {
@@ -99,14 +97,14 @@ var _ = Describe("Annotation", func() {
 		})
 
 		Describe("DisableHooks", func() {
-			var a annotation.UpgradeDisableHooks
+			var a UpgradeDisableHooks
 
 			BeforeEach(func() {
-				a = annotation.UpgradeDisableHooks{}
+				a = UpgradeDisableHooks{}
 			})
 
 			It("should return a default name", func() {
-				Expect(a.Name()).To(Equal(annotation.DefaultUpgradeDisableHooksName))
+				Expect(a.Name()).To(Equal(defaultUpgradeDisableHooksName))
 			})
 
 			It("should return a custom name", func() {
@@ -134,14 +132,14 @@ var _ = Describe("Annotation", func() {
 		})
 
 		Describe("Force", func() {
-			var a annotation.UpgradeForce
+			var a UpgradeForce
 
 			BeforeEach(func() {
-				a = annotation.UpgradeForce{}
+				a = UpgradeForce{}
 			})
 
 			It("should return a default name", func() {
-				Expect(a.Name()).To(Equal(annotation.DefaultUpgradeForceName))
+				Expect(a.Name()).To(Equal(defaultUpgradeForceName))
 			})
 
 			It("should return a custom name", func() {
@@ -169,14 +167,14 @@ var _ = Describe("Annotation", func() {
 		})
 
 		Describe("Description", func() {
-			var a annotation.UpgradeDescription
+			var a UpgradeDescription
 
 			BeforeEach(func() {
-				a = annotation.UpgradeDescription{}
+				a = UpgradeDescription{}
 			})
 
 			It("should return a default name", func() {
-				Expect(a.Name()).To(Equal(annotation.DefaultUpgradeDescriptionName))
+				Expect(a.Name()).To(Equal(defaultUpgradeDescriptionName))
 			})
 
 			It("should return a custom name", func() {
@@ -200,14 +198,14 @@ var _ = Describe("Annotation", func() {
 		})
 
 		Describe("DisableHooks", func() {
-			var a annotation.UninstallDisableHooks
+			var a UninstallDisableHooks
 
 			BeforeEach(func() {
-				a = annotation.UninstallDisableHooks{}
+				a = UninstallDisableHooks{}
 			})
 
 			It("should return a default name", func() {
-				Expect(a.Name()).To(Equal(annotation.DefaultUninstallDisableHooksName))
+				Expect(a.Name()).To(Equal(defaultUninstallDisableHooksName))
 			})
 
 			It("should return a custom name", func() {
@@ -235,14 +233,14 @@ var _ = Describe("Annotation", func() {
 		})
 
 		Describe("Description", func() {
-			var a annotation.UninstallDescription
+			var a UninstallDescription
 
 			BeforeEach(func() {
-				a = annotation.UninstallDescription{}
+				a = UninstallDescription{}
 			})
 
 			It("should return a default name", func() {
-				Expect(a.Name()).To(Equal(annotation.DefaultUninstallDescriptionName))
+				Expect(a.Name()).To(Equal(defaultUninstallDescriptionName))
 			})
 
 			It("should return a custom name", func() {