refactor the source spec validation

This commit covers more failure scenarios with the redudant fields validaiton.
GoogleContainerTools · Feb 1, 2024 · b6924e5 · b6924e5
1 parent 2509692
commit b6924e5
Show file tree

Hide file tree

Showing 42 changed files with 543 additions and 476 deletions.
diff --git a/cmd/helm-sync/main.go b/cmd/helm-sync/main.go
@@ -46,8 +46,8 @@ var (
 	flIncludeCRDs = flag.String("include-crds", os.Getenv(reconcilermanager.HelmIncludeCRDs),
 		"include CRDs in the helm rendering output")
 	flAuth = flag.String("auth", util.EnvString(reconcilermanager.HelmAuthType, string(configsync.AuthNone)),
-		fmt.Sprintf("the authentication type for access to the Helm repository. Must be one of %s, %s, %s or %s. Defaults to %s",
-			configsync.AuthGCPServiceAccount, configsync.AuthToken, configsync.AuthGCENode, configsync.AuthNone, configsync.AuthNone))
+		fmt.Sprintf("the authentication type for access to the Helm repository. Must be one of %s. Defaults to %s",
+			configsync.SupportedAuthTypes(configsync.HelmSource), configsync.AuthNone))
 	flReleaseName = flag.String("release-name", os.Getenv(reconcilermanager.HelmReleaseName),
 		"the name of helm release")
 	flNamespace = flag.String("namespace", os.Getenv(reconcilermanager.HelmReleaseNamespace),

diff --git a/cmd/hydration-controller/main.go b/cmd/hydration-controller/main.go
@@ -23,7 +23,6 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/klog/v2/klogr"
 	"kpt.dev/configsync/pkg/api/configsync"
-	"kpt.dev/configsync/pkg/api/configsync/v1beta1"
 	"kpt.dev/configsync/pkg/hydrate"
 	"kpt.dev/configsync/pkg/importer/filesystem/cmpath"
 	"kpt.dev/configsync/pkg/kmetrics"
@@ -111,7 +110,7 @@ func main() {
 
 	hydrator := &hydrate.Hydrator{
 		DonePath:        absDonePath,
-		SourceType:      v1beta1.SourceType(*sourceType),
+		SourceType:      configsync.SourceType(*sourceType),
 		SourceRoot:      absSourceRootDir,
 		HydratedRoot:    absHydratedRootDir,
 		SourceLink:      *sourceLinkDir,

diff --git a/cmd/nomos/status/cluster_state.go b/cmd/nomos/status/cluster_state.go
@@ -25,6 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"kpt.dev/configsync/cmd/nomos/util"
 	v1 "kpt.dev/configsync/pkg/api/configmanagement/v1"
+	"kpt.dev/configsync/pkg/api/configsync"
 	"kpt.dev/configsync/pkg/api/configsync/v1beta1"
 	"kpt.dev/configsync/pkg/reposync"
 	"kpt.dev/configsync/pkg/rootsync"
@@ -75,7 +76,7 @@ func unavailableCluster(ref string) *ClusterState {
 type RepoState struct {
 	scope             string
 	syncName          string
-	sourceType        v1beta1.SourceType
+	sourceType        configsync.SourceType
 	git               *v1beta1.Git
 	oci               *v1beta1.Oci
 	helm              *v1beta1.HelmBase
@@ -133,13 +134,13 @@ func (r *RepoState) printRows(writer io.Writer) {
 	}
 }
 
-func sourceString(sourceType v1beta1.SourceType, git *v1beta1.Git, oci *v1beta1.Oci, helm *v1beta1.HelmBase) string {
+func sourceString(sourceType configsync.SourceType, git *v1beta1.Git, oci *v1beta1.Oci, helm *v1beta1.HelmBase) string {
 	switch sourceType {
-	case v1beta1.OciSource:
+	case configsync.OciSource:
 		return ociString(oci)
-	case v1beta1.HelmSource:
+	case configsync.HelmSource:
 		return helmString(helm)
-	case v1beta1.GitSource:
+	case configsync.GitSource:
 		return gitString(git)
 	}
 	return gitString(git)
@@ -307,7 +308,7 @@ func namespaceRepoStatus(rs *v1beta1.RepoSync, rg *unstructured.Unstructured, sy
 	repostate := &RepoState{
 		scope:      rs.Namespace,
 		syncName:   rs.Name,
-		sourceType: v1beta1.SourceType(rs.Spec.SourceType),
+		sourceType: configsync.SourceType(rs.Spec.SourceType),
 		git:        rs.Spec.Git,
 		oci:        rs.Spec.Oci,
 		helm:       reposync.GetHelmBase(rs.Spec.Helm),
@@ -409,7 +410,7 @@ func RootRepoStatus(rs *v1beta1.RootSync, rg *unstructured.Unstructured, syncing
 	repostate := &RepoState{
 		scope:      "<root>",
 		syncName:   rs.Name,
-		sourceType: v1beta1.SourceType(rs.Spec.SourceType),
+		sourceType: configsync.SourceType(rs.Spec.SourceType),
 		git:        rs.Spec.Git,
 		oci:        rs.Spec.Oci,
 		helm:       rootsync.GetHelmBase(rs.Spec.Helm),