Merge pull request #236 from evanli18/master

feat: support object,list(object) variable types

controllers/configuration/convert.go

@@ -95,19 +95,12 @@ func Interface2String(v interface{}) (string, error) {
 		value = fmt.Sprint(v)
 	case bool:
 		value = strconv.FormatBool(v)
-	case []interface{}:
-		var tmp string
-		for _, i := range v {
-			switch i.(type) {
-			case string:
-				tmp += fmt.Sprintf("\"%v\", ", i)
-			case int, bool:
-				tmp += fmt.Sprintf("%v, ", i)
-			}
-		}
-		value = fmt.Sprintf(`[%s]`, tmp)
 	default:
-		return "", fmt.Errorf("could not convert %v to string", v)
+		valuejson, err := json.Marshal(v)
+		if err != nil {
+			return "", fmt.Errorf("cloud not convert %v to string", v)
+		}
+		value = string(valuejson)
 	}
 	return value, nil
 }

controllers/configuration/convert_test.go

@@ -1,10 +1,11 @@
 package configuration
 
 import (
+	"testing"
+
 	"gotest.tools/assert"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/yaml"
-	"testing"
 )
 
 func TestRawExtension2Map(t *testing.T) {
@@ -97,17 +98,38 @@ func TestInterface2String(t *testing.T) {
 				err:    nil,
 			},
 		},
+		"NumberType": {
+			variable: 1024.1,
+			want: want{
+				result: "1024.1",
+				err:    nil,
+			},
+		},
 		"ListType1": {
 			variable: []interface{}{"Will", "Catherine"},
 			want: want{
-				result: "[\"Will\", \"Catherine\", ]",
+				result: `["Will","Catherine"]`,
 				err:    nil,
 			},
 		},
 		"ListType2": {
 			variable: []interface{}{123, 456},
 			want: want{
-				result: "[123, 456, ]",
+				result: `[123,456]`,
+				err:    nil,
+			},
+		},
+		"ObjectType": {
+			variable: struct{ Name string }{"Terraform"},
+			want: want{
+				result: `{"Name":"Terraform"}`,
+				err:    nil,
+			},
+		},
+		"ListObjectType": {
+			variable: []struct{ Name string }{{"Terraform"}, {"OAM"}, {"Vela"}},
+			want: want{
+				result: `[{"Name":"Terraform"},{"Name":"OAM"},{"Name":"Vela"}]`,
 				err:    nil,
 			},
 		},