pkg/values: export Mapper and MapperFunc

Author: joelanford

pkg/reconciler/internal/values/values.go

@@ -23,6 +23,8 @@ import (
 	"helm.sh/helm/v3/pkg/chartutil"
 	"helm.sh/helm/v3/pkg/strvals"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/joelanford/helm-operator/pkg/values"
 )
 
 type Values struct {
@@ -65,14 +67,4 @@ func (v *Values) ApplyOverrides(in map[string]string) error {
 	return nil
 }
 
-type Mapper interface {
-	Map(chartutil.Values) chartutil.Values
-}
-
-type MapperFunc func(chartutil.Values) chartutil.Values
-
-var DefaultMapper = MapperFunc(func(v chartutil.Values) chartutil.Values { return v })
-
-func (m MapperFunc) Map(v chartutil.Values) chartutil.Values {
-	return m(v)
-}
+var DefaultMapper = values.MapperFunc(func(v chartutil.Values) chartutil.Values { return v })

pkg/reconciler/reconciler.go

@@ -52,7 +52,8 @@ import (
 	"github.com/joelanford/helm-operator/pkg/reconciler/internal/conditions"
 	internalhook "github.com/joelanford/helm-operator/pkg/reconciler/internal/hook"
 	"github.com/joelanford/helm-operator/pkg/reconciler/internal/updater"
-	"github.com/joelanford/helm-operator/pkg/reconciler/internal/values"
+	internalvalues "github.com/joelanford/helm-operator/pkg/reconciler/internal/values"
+	"github.com/joelanford/helm-operator/pkg/values"
 )
 
 const uninstallFinalizer = "uninstall-helm-release"
@@ -245,7 +246,7 @@ func WithOverrideValues(overrides map[string]string) Option {
 		// Validate that overrides can be parsed and applied
 		// so that we fail fast during operator setup rather
 		// than during the first reconciliation.
-		m := values.New(map[string]interface{}{})
+		m := internalvalues.New(map[string]interface{}{})
 		if err := m.ApplyOverrides(overrides); err != nil {
 			return err
 		}
@@ -549,7 +550,7 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (res ctrl.Result, err error) {
 }
 
 func (r *Reconciler) getValues(obj *unstructured.Unstructured) (chartutil.Values, error) {
-	crVals, err := values.FromUnstructured(obj)
+	crVals, err := internalvalues.FromUnstructured(obj)
 	if err != nil {
 		return chartutil.Values{}, err
 	}
@@ -768,7 +769,7 @@ func (r *Reconciler) addDefaults(mgr ctrl.Manager, controllerName string) {
 		r.eventRecorder = mgr.GetEventRecorderFor(controllerName)
 	}
 	if r.valueMapper == nil {
-		r.valueMapper = values.DefaultMapper
+		r.valueMapper = internalvalues.DefaultMapper
 	}
 }
 

pkg/reconciler/reconciler_test.go

@@ -58,7 +58,7 @@ import (
 	"github.com/joelanford/helm-operator/pkg/internal/testutil"
 	"github.com/joelanford/helm-operator/pkg/reconciler/internal/conditions"
 	helmfake "github.com/joelanford/helm-operator/pkg/reconciler/internal/fake"
-	"github.com/joelanford/helm-operator/pkg/reconciler/internal/values"
+	"github.com/joelanford/helm-operator/pkg/values"
 )
 
 var _ = Describe("Reconciler", func() {

pkg/values/values.go

@@ -0,0 +1,31 @@
+/*
+Copyright 2020 The Operator-SDK Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package values
+
+import (
+	"helm.sh/helm/v3/pkg/chartutil"
+)
+
+type Mapper interface {
+	Map(chartutil.Values) chartutil.Values
+}
+
+type MapperFunc func(chartutil.Values) chartutil.Values
+
+func (m MapperFunc) Map(v chartutil.Values) chartutil.Values {
+	return m(v)
+}