cleanup: Remove and privatize methods

cmd/up_test.go

@@ -11,13 +11,13 @@ import (
 	"github.com/spf13/pflag"
 	blueprintv1alpha1 "github.com/windsorcli/cli/api/v1alpha1"
 	"github.com/windsorcli/cli/pkg/composer/blueprint"
+	"github.com/windsorcli/cli/pkg/di"
+	"github.com/windsorcli/cli/pkg/provisioner/kubernetes"
+	terraforminfra "github.com/windsorcli/cli/pkg/provisioner/terraform"
 	"github.com/windsorcli/cli/pkg/runtime/config"
 	envvars "github.com/windsorcli/cli/pkg/runtime/env"
 	"github.com/windsorcli/cli/pkg/runtime/shell"
 	"github.com/windsorcli/cli/pkg/runtime/tools"
-	"github.com/windsorcli/cli/pkg/di"
-	"github.com/windsorcli/cli/pkg/provisioner/kubernetes"
-	terraforminfra "github.com/windsorcli/cli/pkg/provisioner/terraform"
 )
 
 // =============================================================================
@@ -82,7 +82,6 @@ func setupUpTest(t *testing.T, opts ...*SetupOptions) *UpMocks {
 	mockBlueprintHandler.InitializeFunc = func() error { return nil }
 	mockBlueprintHandler.LoadBlueprintFunc = func() error { return nil }
 	mockBlueprintHandler.WriteFunc = func(overwrite ...bool) error { return nil }
-	mockBlueprintHandler.LoadConfigFunc = func() error { return nil }
 	testBlueprint := &blueprintv1alpha1.Blueprint{
 		Metadata: blueprintv1alpha1.Metadata{Name: "test"},
 	}

pkg/composer/blueprint/blueprint_handler.go

@@ -34,23 +34,12 @@ import (
 type BlueprintHandler interface {
 	Initialize() error
 	LoadBlueprint() error
-	LoadConfig() error
-	LoadData(data map[string]any, ociInfo ...*artifact.OCIArtifactInfo) error
 	Write(overwrite ...bool) error
-	SetRenderedKustomizeData(data map[string]any)
-	GetMetadata() blueprintv1alpha1.Metadata
-	GetSources() []blueprintv1alpha1.Source
-	GetRepository() blueprintv1alpha1.Repository
 	GetTerraformComponents() []blueprintv1alpha1.TerraformComponent
-	GetKustomizations() []blueprintv1alpha1.Kustomization
-	GetDefaultTemplateData(contextName string) (map[string][]byte, error)
 	GetLocalTemplateData() (map[string][]byte, error)
 	Generate() *blueprintv1alpha1.Blueprint
 }
 
-//go:embed templates/default.jsonnet
-var defaultJsonnetTemplate string
-
 type BaseBlueprintHandler struct {
 	BlueprintHandler
 	injector             di.Injector
@@ -146,12 +135,12 @@ func (b *BaseBlueprintHandler) LoadBlueprint() error {
 		for key, value := range templateData {
 			blueprintData[key] = string(value)
 		}
-		if err := b.LoadData(blueprintData, ociInfo); err != nil {
+		if err := b.loadData(blueprintData, ociInfo); err != nil {
 			return fmt.Errorf("failed to load default blueprint data: %w", err)
 		}
 	}
 
-	sources := b.GetSources()
+	sources := b.getSources()
 	if len(sources) > 0 {
 		artifactBuilder := b.injector.Resolve("artifactBuilder")
 		if artifactBuilder != nil {
@@ -179,62 +168,14 @@ func (b *BaseBlueprintHandler) LoadBlueprint() error {
 
 	blueprintPath := filepath.Join(configRoot, "blueprint.yaml")
 	if _, err := b.shims.Stat(blueprintPath); err == nil {
-		if err := b.LoadConfig(); err != nil {
+		if err := b.loadConfig(); err != nil {
 			return fmt.Errorf("failed to load blueprint config overrides: %w", err)
 		}
 	}
 
 	return nil
 }
 
-// LoadConfig reads blueprint configuration from blueprint.yaml file.
-// Returns an error if blueprint.yaml does not exist.
-// Template processing is now handled by the pkg/template package.
-func (b *BaseBlueprintHandler) LoadConfig() error {
-	configRoot, err := b.configHandler.GetConfigRoot()
-	if err != nil {
-		return fmt.Errorf("error getting config root: %w", err)
-	}
-
-	yamlPath := filepath.Join(configRoot, "blueprint.yaml")
-	if _, err := b.shims.Stat(yamlPath); err != nil {
-		return fmt.Errorf("blueprint.yaml not found at %s", yamlPath)
-	}
-
-	yamlData, err := b.shims.ReadFile(yamlPath)
-	if err != nil {
-		return err
-	}
-
-	if err := b.processBlueprintData(yamlData, &b.blueprint); err != nil {
-		return err
-	}
-
-	b.configLoaded = true
-	return nil
-}
-
-// LoadData loads blueprint configuration from a map containing blueprint data.
-// It marshals the input map to YAML, processes it as a Blueprint object, and updates the handler's blueprint state.
-// The ociInfo parameter optionally provides OCI artifact source information for source resolution and tracking.
-// If config is already loaded from YAML, this is a no-op to preserve resolved state.
-func (b *BaseBlueprintHandler) LoadData(data map[string]any, ociInfo ...*artifact.OCIArtifactInfo) error {
-	if b.configLoaded {
-		return nil
-	}
-
-	yamlData, err := b.shims.YamlMarshal(data)
-	if err != nil {
-		return fmt.Errorf("error marshalling blueprint data to yaml: %w", err)
-	}
-
-	if err := b.processBlueprintData(yamlData, &b.blueprint, ociInfo...); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 // Write persists the current blueprint state to blueprint.yaml in the configuration root directory.
 // If overwrite is true, the file is overwritten regardless of existence. If overwrite is false or omitted,
 // the file is only written if it does not already exist. The method ensures the target directory exists,
@@ -284,34 +225,6 @@ func (b *BaseBlueprintHandler) Write(overwrite ...bool) error {
 	return nil
 }
 
-// GetMetadata retrieves the current blueprint's metadata.
-func (b *BaseBlueprintHandler) GetMetadata() blueprintv1alpha1.Metadata {
-	resolvedBlueprint := b.blueprint
-	return resolvedBlueprint.Metadata
-}
-
-// GetRepository retrieves the current blueprint's repository configuration, ensuring
-// default values are set for empty fields.
-func (b *BaseBlueprintHandler) GetRepository() blueprintv1alpha1.Repository {
-	resolvedBlueprint := b.blueprint
-	repository := resolvedBlueprint.Repository
-
-	if repository.Url == "" {
-		repository.Url = ""
-	}
-	if repository.Ref == (blueprintv1alpha1.Reference{}) {
-		repository.Ref = blueprintv1alpha1.Reference{Branch: "main"}
-	}
-
-	return repository
-}
-
-// GetSources retrieves the current blueprint's source configurations.
-func (b *BaseBlueprintHandler) GetSources() []blueprintv1alpha1.Source {
-	resolvedBlueprint := b.blueprint
-	return resolvedBlueprint.Sources
-}
-
 // GetTerraformComponents retrieves the blueprint's Terraform components after resolving
 // their sources and paths to full URLs and filesystem paths respectively.
 func (b *BaseBlueprintHandler) GetTerraformComponents() []blueprintv1alpha1.TerraformComponent {
@@ -323,60 +236,13 @@ func (b *BaseBlueprintHandler) GetTerraformComponents() []blueprintv1alpha1.Terr
 	return resolvedBlueprint.TerraformComponents
 }
 
-// GetKustomizations returns the current blueprint's kustomization configurations with all default values resolved.
-// It copies the kustomizations from the blueprint, sets default values for Source, Path, Interval, RetryInterval,
-// Timeout, Wait, Force, and Destroy fields if unset, discovers and appends patches, and sets the PostBuild configuration.
-// This method ensures all kustomization fields are fully populated for downstream processing.
-func (b *BaseBlueprintHandler) GetKustomizations() []blueprintv1alpha1.Kustomization {
-	resolvedBlueprint := b.blueprint
-	kustomizations := make([]blueprintv1alpha1.Kustomization, len(resolvedBlueprint.Kustomizations))
-	copy(kustomizations, resolvedBlueprint.Kustomizations)
-
-	for i := range kustomizations {
-		if kustomizations[i].Source == "" {
-			kustomizations[i].Source = b.blueprint.Metadata.Name
-		}
-
-		if kustomizations[i].Path == "" {
-			kustomizations[i].Path = "kustomize"
-		} else {
-			kustomizations[i].Path = "kustomize/" + strings.ReplaceAll(kustomizations[i].Path, "\\", "/")
-		}
-
-		if kustomizations[i].Interval == nil || kustomizations[i].Interval.Duration == 0 {
-			kustomizations[i].Interval = &metav1.Duration{Duration: constants.DefaultFluxKustomizationInterval}
-		}
-		if kustomizations[i].RetryInterval == nil || kustomizations[i].RetryInterval.Duration == 0 {
-			kustomizations[i].RetryInterval = &metav1.Duration{Duration: constants.DefaultFluxKustomizationRetryInterval}
-		}
-		if kustomizations[i].Timeout == nil || kustomizations[i].Timeout.Duration == 0 {
-			kustomizations[i].Timeout = &metav1.Duration{Duration: constants.DefaultFluxKustomizationTimeout}
-		}
-		if kustomizations[i].Wait == nil {
-			defaultWait := constants.DefaultFluxKustomizationWait
-			kustomizations[i].Wait = &defaultWait
-		}
-		if kustomizations[i].Force == nil {
-			defaultForce := constants.DefaultFluxKustomizationForce
-			kustomizations[i].Force = &defaultForce
-		}
-		if kustomizations[i].Destroy == nil {
-			defaultDestroy := true
-			kustomizations[i].Destroy = &defaultDestroy
-		}
-
-	}
-
-	return kustomizations
-}
-
 // Generate returns the fully processed blueprint with all defaults resolved,
 // paths processed, and generation logic applied - equivalent to what would be deployed.
-// It applies the same processing logic as GetKustomizations() but for the entire blueprint structure.
+// It applies the same processing logic as getKustomizations() but for the entire blueprint structure.
 func (b *BaseBlueprintHandler) Generate() *blueprintv1alpha1.Blueprint {
 	generated := b.blueprint.DeepCopy()
 
-	// Process kustomizations with the same logic as GetKustomizations()
+	// Process kustomizations with the same logic as getKustomizations()
 	for i := range generated.Kustomizations {
 		if generated.Kustomizations[i].Source == "" {
 			generated.Kustomizations[i].Source = generated.Metadata.Name
@@ -418,21 +284,6 @@ func (b *BaseBlueprintHandler) Generate() *blueprintv1alpha1.Blueprint {
 	return generated
 }
 
-// SetRenderedKustomizeData stores rendered kustomize data for use during install.
-// This includes values and patches from template processing that should be composed with user-defined files.
-func (b *BaseBlueprintHandler) SetRenderedKustomizeData(data map[string]any) {
-	b.kustomizeData = data
-}
-
-// GetDefaultTemplateData generates default template data based on the provider configuration.
-// It uses the embedded default template to create a map of template files that can be
-// used by the init pipeline for generating context-specific configurations.
-func (b *BaseBlueprintHandler) GetDefaultTemplateData(contextName string) (map[string][]byte, error) {
-	return map[string][]byte{
-		"blueprint.jsonnet": []byte(defaultJsonnetTemplate),
-	}, nil
-}
-
 // GetLocalTemplateData returns template files from contexts/_template, merging values.yaml from
 // both _template and context dirs. All .jsonnet files are collected recursively with relative
 // paths preserved. If OCI artifact values exist, they are merged with local values, with local
@@ -507,6 +358,129 @@ func (b *BaseBlueprintHandler) GetLocalTemplateData() (map[string][]byte, error)
 // Private Methods
 // =============================================================================
 
+// loadConfig reads blueprint configuration from blueprint.yaml file.
+// Returns an error if blueprint.yaml does not exist.
+// Template processing is now handled by the pkg/template package.
+func (b *BaseBlueprintHandler) loadConfig() error {
+	configRoot, err := b.configHandler.GetConfigRoot()
+	if err != nil {
+		return fmt.Errorf("error getting config root: %w", err)
+	}
+
+	yamlPath := filepath.Join(configRoot, "blueprint.yaml")
+	if _, err := b.shims.Stat(yamlPath); err != nil {
+		return fmt.Errorf("blueprint.yaml not found at %s", yamlPath)
+	}
+
+	yamlData, err := b.shims.ReadFile(yamlPath)
+	if err != nil {
+		return err
+	}
+
+	if err := b.processBlueprintData(yamlData, &b.blueprint); err != nil {
+		return err
+	}
+
+	b.configLoaded = true
+	return nil
+}
+
+// loadData loads blueprint configuration from a map containing blueprint data.
+// It marshals the input map to YAML, processes it as a Blueprint object, and updates the handler's blueprint state.
+// The ociInfo parameter optionally provides OCI artifact source information for source resolution and tracking.
+// If config is already loaded from YAML, this is a no-op to preserve resolved state.
+func (b *BaseBlueprintHandler) loadData(data map[string]any, ociInfo ...*artifact.OCIArtifactInfo) error {
+	if b.configLoaded {
+		return nil
+	}
+
+	yamlData, err := b.shims.YamlMarshal(data)
+	if err != nil {
+		return fmt.Errorf("error marshalling blueprint data to yaml: %w", err)
+	}
+
+	if err := b.processBlueprintData(yamlData, &b.blueprint, ociInfo...); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// getMetadata retrieves the current blueprint's metadata.
+func (b *BaseBlueprintHandler) getMetadata() blueprintv1alpha1.Metadata {
+	resolvedBlueprint := b.blueprint
+	return resolvedBlueprint.Metadata
+}
+
+// getRepository retrieves the current blueprint's repository configuration, ensuring
+// default values are set for empty fields.
+func (b *BaseBlueprintHandler) getRepository() blueprintv1alpha1.Repository {
+	resolvedBlueprint := b.blueprint
+	repository := resolvedBlueprint.Repository
+
+	if repository.Url == "" {
+		repository.Url = ""
+	}
+	if repository.Ref == (blueprintv1alpha1.Reference{}) {
+		repository.Ref = blueprintv1alpha1.Reference{Branch: "main"}
+	}
+
+	return repository
+}
+
+// getSources retrieves the current blueprint's source configurations.
+func (b *BaseBlueprintHandler) getSources() []blueprintv1alpha1.Source {
+	resolvedBlueprint := b.blueprint
+	return resolvedBlueprint.Sources
+}
+
+// getKustomizations returns the current blueprint's kustomization configurations with all default values resolved.
+// It copies the kustomizations from the blueprint, sets default values for Source, Path, Interval, RetryInterval,
+// Timeout, Wait, Force, and Destroy fields if unset, discovers and appends patches, and sets the PostBuild configuration.
+// This method ensures all kustomization fields are fully populated for downstream processing.
+func (b *BaseBlueprintHandler) getKustomizations() []blueprintv1alpha1.Kustomization {
+	resolvedBlueprint := b.blueprint
+	kustomizations := make([]blueprintv1alpha1.Kustomization, len(resolvedBlueprint.Kustomizations))
+	copy(kustomizations, resolvedBlueprint.Kustomizations)
+
+	for i := range kustomizations {
+		if kustomizations[i].Source == "" {
+			kustomizations[i].Source = b.blueprint.Metadata.Name
+		}
+
+		if kustomizations[i].Path == "" {
+			kustomizations[i].Path = "kustomize"
+		} else {
+			kustomizations[i].Path = "kustomize/" + strings.ReplaceAll(kustomizations[i].Path, "\\", "/")
+		}
+
+		if kustomizations[i].Interval == nil || kustomizations[i].Interval.Duration == 0 {
+			kustomizations[i].Interval = &metav1.Duration{Duration: constants.DefaultFluxKustomizationInterval}
+		}
+		if kustomizations[i].RetryInterval == nil || kustomizations[i].RetryInterval.Duration == 0 {
+			kustomizations[i].RetryInterval = &metav1.Duration{Duration: constants.DefaultFluxKustomizationRetryInterval}
+		}
+		if kustomizations[i].Timeout == nil || kustomizations[i].Timeout.Duration == 0 {
+			kustomizations[i].Timeout = &metav1.Duration{Duration: constants.DefaultFluxKustomizationTimeout}
+		}
+		if kustomizations[i].Wait == nil {
+			defaultWait := constants.DefaultFluxKustomizationWait
+			kustomizations[i].Wait = &defaultWait
+		}
+		if kustomizations[i].Force == nil {
+			defaultForce := constants.DefaultFluxKustomizationForce
+			kustomizations[i].Force = &defaultForce
+		}
+		if kustomizations[i].Destroy == nil {
+			defaultDestroy := true
+			kustomizations[i].Destroy = &defaultDestroy
+		}
+
+	}
+
+	return kustomizations
+}
+
 // walkAndCollectTemplates traverses template directories to gather .jsonnet files.
 // It updates the provided templateData map with the relative paths and content of
 // the .jsonnet files found. The function handles directory recursion and file reading