Distinguish between empty string and not provided (#541)

* Distinguish between empty string and not provided

* Format

* Missing file

pkg/apis/kudo/v1alpha1/operatorversion_types.go

@@ -83,7 +83,7 @@ type Parameter struct {
 	Required bool `json:"required,omitempty"`
 
 	// Default is a default value if no parameter is provided by the instance.
-	Default string `json:"default,omitempty"`
+	Default *string `json:"default,omitempty"`
 
 	// Trigger identifies the plan that gets executed when this parameter changes in the Instance object.
 	// Default is `update` if a plan with that name exists, otherwise it's `deploy`

pkg/controller/planexecution/planexecution_controller.go

@@ -22,6 +22,8 @@ import (
 	"log"
 	"strconv"
 
+	"github.com/kudobuilder/kudo/pkg/util/kudo"
+
 	apijson "k8s.io/apimachinery/pkg/util/json"
 
 	kudoengine "github.com/kudobuilder/kudo/pkg/engine"
@@ -310,7 +312,7 @@ func (r *ReconcilePlanExecution) Reconcile(request reconcile.Request) (reconcile
 				r.recorder.Event(planExecution, "Warning", "MissingParameter", fmt.Sprintf("Could not find required parameter (%v)", param.Name))
 				return reconcile.Result{}, err
 			}
-			params[param.Name] = param.Default
+			params[param.Name] = kudo.StringValue(param.Default)
 		}
 	}
 

pkg/kudoctl/bundle/package.go

@@ -6,6 +6,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/kudobuilder/kudo/pkg/util/kudo"
+
 	"k8s.io/apimachinery/pkg/util/rand"
 
 	"github.com/kudobuilder/kudo/pkg/apis/kudo/v1alpha1"
@@ -79,11 +81,15 @@ func parsePackageFile(filePath string, fileBytes []byte, currentPackage *Package
 
 				required = parsed
 			}
+			var defaultValue *string
+			if val, ok := param["default"]; ok {
+				defaultValue = kudo.String(val)
+			}
 
 			r := v1alpha1.Parameter{
 				Name:        paramName,
 				Description: param["description"],
-				Default:     param["default"],
+				Default:     defaultValue,
 				Trigger:     param["trigger"],
 				Required:    required,
 				DisplayName: param["displayName"],

pkg/kudoctl/cmd/install/install.go

@@ -201,7 +201,7 @@ func validateCrds(crds *bundle.PackageCRDs, skipInstance bool) error {
 	parameters := crds.OperatorVersion.Spec.Parameters
 	missingParameters := []string{}
 	for _, p := range parameters {
-		if p.Required && p.Default == "" {
+		if p.Required && p.Default == nil {
 			_, ok := crds.Instance.Spec.Parameters[p.Name]
 			if !ok {
 				missingParameters = append(missingParameters, p.Name)

pkg/kudoctl/cmd/install/install_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/kudobuilder/kudo/pkg/kudoctl/bundle"
+	util "github.com/kudobuilder/kudo/pkg/util/kudo"
 
 	"github.com/kudobuilder/kudo/pkg/apis/kudo/v1alpha1"
 	"github.com/kudobuilder/kudo/pkg/client/clientset/versioned/fake"
@@ -94,9 +95,9 @@ func TestParameterValidation_InstallCrds(t *testing.T) {
 		skipInstance      bool
 		err               string
 	}{
-		{"all parameters with defaults", []v1alpha1.Parameter{{Name: "param", Required: true, Default: "aaa"}}, map[string]string{}, false, ""},
+		{"all parameters with defaults", []v1alpha1.Parameter{{Name: "param", Required: true, Default: util.String("aaa")}}, map[string]string{}, false, ""},
 		{"missing parameter provided", []v1alpha1.Parameter{{Name: "param", Required: true}}, map[string]string{"param": "value"}, false, ""},
-		{"missing parameter", []v1alpha1.Parameter{{Name: "param", Required: true}}, map[string]string{}, false, "missing required parameters during installation: param"},
+		{"missing parameter", []v1alpha1.Parameter{{Name: "param", Required: true, Default: nil}}, map[string]string{}, false, "missing required parameters during installation: param"},
 		{"multiple missing parameter", []v1alpha1.Parameter{{Name: "param", Required: true}, {Name: "param2", Required: true}}, map[string]string{}, false, "missing required parameters during installation: param,param2"},
 		{"skip instance ignores missing parameter", []v1alpha1.Parameter{{Name: "param", Required: true}}, map[string]string{}, true, ""},
 	}

pkg/util/kudo/convert_types.go

@@ -0,0 +1,15 @@
+package kudo
+
+// String returns a pointer to the string value passed in.
+func String(v string) *string {
+	return &v
+}
+
+// StringValue returns the value of the string pointer passed in or
+// "" if the pointer is nil.
+func StringValue(v *string) string {
+	if v != nil {
+		return *v
+	}
+	return ""
+}