feat(config): add typed_values

Author: duanhongyi

api/config.go

@@ -6,14 +6,19 @@ import (
 	"text/template"
 )
 
+// ConfigValues is the key, value for env
+type ConfigValues map[string]interface{}
+
 // ConfigSet is the definition of POST /v2/apps/<app id>/config/.
 type ConfigSet struct {
-	Values map[string]string `json:"values"`
+	Values      ConfigValues            `json:"values"`
+	TypedValues map[string]ConfigValues `json:"typed_values"`
 }
 
 // ConfigUnset is the definition of POST /v2/apps/<app id>/config/.
 type ConfigUnset struct {
-	Values map[string]interface{} `json:"values"`
+	Values      ConfigValues            `json:"values"`
+	TypedValues map[string]ConfigValues `json:"typed_values"`
 }
 
 // Config is the structure of an app's config.
@@ -23,7 +28,9 @@ type Config struct {
 	// App is the app name. It cannot be updated at all right now.
 	App string `json:"app,omitempty"`
 	// Values are exposed as environment variables to the app.
-	Values map[string]interface{} `json:"values,omitempty"`
+	Values ConfigValues `json:"values,omitempty"`
+	// Typed values are exposed as environment variables to the app.
+	TypedValues map[string]ConfigValues `json:"typed_values,omitempty"`
 	// Limits is used to set process resources limits. The key is the process name
 	// and the value is a limit plan. Ex: std1.xlarge.c1m1
 	Limits map[string]interface{} `json:"limits,omitempty"`

config/config_test.go

@@ -20,6 +20,11 @@ const configFixture string = `
       "TEST": "testing",
       "FOO": "bar"
     },
+    "typed_values": {
+		"web": {
+		  "PORT": "9000"
+		}
+	},
 	"limits": {
 	  "web": "std1.xlarge.c1m1"
 	},
@@ -40,6 +45,7 @@ const configUnsetFixture string = `
     "owner": "test",
     "app": "unset-test",
     "values": {},
+	"typed_values": {"web":{"PORT":null}},
     "limits": {},
     "tags": {},
 	"registry": {},
@@ -49,8 +55,8 @@ const configUnsetFixture string = `
 }
 `
 
-const configSetExpected string = `{"values":{"FOO":"bar","TEST":"testing"},"limits":{"web":"std1.xlarge.c1m1"},"tags":{"test":"tests"},"registry":{"username":"bob"}}`
-const configUnsetExpected string = `{"values":{"FOO":null,"TEST":null},"limits":{"web":null},"tags":{"test":null},"registry":{"username":null}}`
+const configSetExpected string = `{"values":{"FOO":"bar","TEST":"testing"},"typed_values":{"web":{"PORT":"9000"}},"limits":{"web":"std1.xlarge.c1m1"},"tags":{"test":"tests"},"registry":{"username":"bob"}}`
+const configUnsetExpected string = `{"values":{"FOO":null,"TEST":null},"typed_values":{"web":{"PORT":null}},"limits":{"web":null},"tags":{"test":null},"registry":{"username":null}}`
 
 type fakeHTTPServer struct{}
 
@@ -124,10 +130,13 @@ func TestConfigSet(t *testing.T) {
 	expected := api.Config{
 		Owner: "test",
 		App:   "example-go",
-		Values: map[string]interface{}{
+		Values: api.ConfigValues{
 			"TEST": "testing",
 			"FOO":  "bar",
 		},
+		TypedValues: map[string]api.ConfigValues{
+			"web": {"PORT": "9000"},
+		},
 		Limits: map[string]interface{}{
 			"web": "std1.xlarge.c1m1",
 		},
@@ -143,10 +152,13 @@ func TestConfigSet(t *testing.T) {
 	}
 
 	configVars := api.Config{
-		Values: map[string]interface{}{
+		Values: api.ConfigValues{
 			"TEST": "testing",
 			"FOO":  "bar",
 		},
+		TypedValues: map[string]api.ConfigValues{
+			"web": {"PORT": "9000"},
+		},
 		Limits: map[string]interface{}{
 			"web": "std1.xlarge.c1m1",
 		},
@@ -182,9 +194,12 @@ func TestConfigUnset(t *testing.T) {
 	}
 
 	expected := api.Config{
-		Owner:    "test",
-		App:      "unset-test",
-		Values:   map[string]interface{}{},
+		Owner:  "test",
+		App:    "unset-test",
+		Values: map[string]interface{}{},
+		TypedValues: map[string]api.ConfigValues{
+			"web": {"PORT": nil},
+		},
 		Limits:   map[string]interface{}{},
 		Tags:     map[string]interface{}{},
 		Registry: map[string]interface{}{},
@@ -198,6 +213,9 @@ func TestConfigUnset(t *testing.T) {
 			"TEST": nil,
 			"FOO":  nil,
 		},
+		TypedValues: map[string]api.ConfigValues{
+			"web": {"PORT": nil},
+		},
 		Limits: map[string]interface{}{
 			"web": nil,
 		},
@@ -239,6 +257,9 @@ func TestConfigList(t *testing.T) {
 			"TEST": "testing",
 			"FOO":  "bar",
 		},
+		TypedValues: map[string]api.ConfigValues{
+			"web": {"PORT": "9000"},
+		},
 		Limits: map[string]interface{}{
 			"web": "std1.xlarge.c1m1",
 		},

go.mod

@@ -4,7 +4,7 @@ go 1.22
 
 require (
 	github.com/stretchr/testify v1.9.0
-	golang.org/x/net v0.21.0
+	golang.org/x/net v0.23.0
 )
 
 require (

go.sum

@@ -4,8 +4,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=