cmd/operator-sdk,internal: move HelmChartsDir constant to internal/pkg/scaffold/constants.go to avoid unnecessary dep imports in non-helm projects

Author: joelanford

cmd/operator-sdk/new/cmd.go

@@ -278,7 +278,7 @@ func doHelmScaffold() error {
 		return fmt.Errorf("failed to create helm chart: %s", err)
 	}
 
-	valuesPath := filepath.Join("<project_dir>", helm.HelmChartsDir, chart.GetMetadata().GetName(), "values.yaml")
+	valuesPath := filepath.Join("<project_dir>", scaffold.HelmChartsDir, chart.GetMetadata().GetName(), "values.yaml")
 	crSpec := fmt.Sprintf("# Default values copied from %s\n\n%s", valuesPath, chart.GetValues().GetRaw())
 
 	k8sCfg, err := config.GetConfig()

internal/pkg/scaffold/constants.go

@@ -35,5 +35,6 @@ const (
 	DeployDir      = "deploy"
 	OLMCatalogDir  = DeployDir + filePathSep + "olm-catalog"
 	CRDsDir        = DeployDir + filePathSep + "crds"
+	HelmChartsDir  = "helm-charts"
 	VersionDir     = "version"
 )

internal/pkg/scaffold/helm/chart.go

@@ -35,11 +35,6 @@ import (
 )
 
 const (
-
-	// HelmChartsDir is the relative directory within an SDK project where Helm
-	// charts are stored.
-	HelmChartsDir string = "helm-charts"
-
 	// DefaultAPIVersion is the Kubernetes CRD API Version used for fetched
 	// charts when the --api-version flag is not specified
 	DefaultAPIVersion string = "charts.helm.k8s.io/v1alpha1"
@@ -113,7 +108,7 @@ type CreateChartOptions struct {
 // CreateChart returns an error if an error occurs creating the scaffold.Resource or
 // creating the chart.
 func CreateChart(projectDir string, opts CreateChartOptions) (*scaffold.Resource, *chart.Chart, error) {
-	chartsDir := filepath.Join(projectDir, HelmChartsDir)
+	chartsDir := filepath.Join(projectDir, scaffold.HelmChartsDir)
 	err := os.MkdirAll(chartsDir, 0755)
 	if err != nil {
 		return nil, nil, err
@@ -135,7 +130,7 @@ func CreateChart(projectDir string, opts CreateChartOptions) (*scaffold.Resource
 		return nil, nil, err
 	}
 
-	relChartPath := filepath.Join(HelmChartsDir, c.GetMetadata().GetName())
+	relChartPath := filepath.Join(scaffold.HelmChartsDir, c.GetMetadata().GetName())
 	absChartPath := filepath.Join(projectDir, relChartPath)
 	if err := fetchChartDependencies(absChartPath); err != nil {
 		return nil, nil, err

internal/pkg/scaffold/helm/dockerfile.go

@@ -36,7 +36,7 @@ func (d *Dockerfile) GetInput() (input.Input, error) {
 	if d.Path == "" {
 		d.Path = filepath.Join(scaffold.BuildDir, scaffold.DockerfileFile)
 	}
-	d.HelmChartsDir = HelmChartsDir
+	d.HelmChartsDir = scaffold.HelmChartsDir
 	d.ImageTag = strings.TrimSuffix(version.Version, "+git")
 	d.TemplateBody = dockerFileHelmTmpl
 	return d.Input, nil

internal/pkg/scaffold/helm/watches.go

@@ -35,7 +35,7 @@ func (s *WatchesYAML) GetInput() (input.Input, error) {
 	if s.Path == "" {
 		s.Path = WatchesYamlFile
 	}
-	s.HelmChartsDir = HelmChartsDir
+	s.HelmChartsDir = scaffold.HelmChartsDir
 	s.TemplateBody = watchesYAMLTmpl
 	if s.ChartName == "" {
 		s.ChartName = s.Resource.LowerKind

internal/util/projutil/project_util.go

@@ -24,7 +24,6 @@ import (
 
 	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
-	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/helm"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -106,7 +105,7 @@ func GetOperatorType() OperatorType {
 	if stat, err := os.Stat(ansible.RolesDir); err == nil && stat.IsDir() {
 		return OperatorTypeAnsible
 	}
-	if stat, err := os.Stat(helm.HelmChartsDir); err == nil && stat.IsDir() {
+	if stat, err := os.Stat(scaffold.HelmChartsDir); err == nil && stat.IsDir() {
 		return OperatorTypeHelm
 	}
 	return OperatorTypeUnknown