chore(builder): modify config struct (#24)

Author: jianxiaoguo

go.mod

@@ -5,7 +5,7 @@ go 1.23
 require (
 	github.com/aws/aws-sdk-go v1.55.5
 	github.com/distribution/distribution/v3 v3.0.0-beta.1.0.20241022144144-c427f845035d
-	github.com/drycc/controller-sdk-go v0.0.0-20241122013249-f1d6fea5bf81
+	github.com/drycc/controller-sdk-go v0.0.0-20241210030451-bd35b03af548
 	github.com/drycc/pkg v0.0.0-20241028091700-8caca001c932
 	github.com/google/uuid v1.6.0
 	github.com/kelseyhightower/envconfig v1.4.0

go.sum

@@ -21,8 +21,8 @@ github.com/distribution/distribution/v3 v3.0.0-beta.1.0.20241022144144-c427f8450
 github.com/distribution/distribution/v3 v3.0.0-beta.1.0.20241022144144-c427f845035d/go.mod h1:Unn8+BXBntRw4BZHI7UVY9wJ7yGW/xtOspXPxo6hFIs=
 github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
 github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
-github.com/drycc/controller-sdk-go v0.0.0-20241122013249-f1d6fea5bf81 h1:y809MASIviVNxzUxP1CDU2EaB5AruRNAiFKjOMCx+0s=
-github.com/drycc/controller-sdk-go v0.0.0-20241122013249-f1d6fea5bf81/go.mod h1:F9ViuoVcZ/OG1WnfZBYH6j4v6mb5B+RW9FLaCopADoo=
+github.com/drycc/controller-sdk-go v0.0.0-20241210030451-bd35b03af548 h1:eU8e0vViXNIltGCRlIWcNMZ2YCrAkfDtYXaa/wdJI4Q=
+github.com/drycc/controller-sdk-go v0.0.0-20241210030451-bd35b03af548/go.mod h1:F9ViuoVcZ/OG1WnfZBYH6j4v6mb5B+RW9FLaCopADoo=
 github.com/drycc/pkg v0.0.0-20241028091700-8caca001c932 h1:tUfkfjmFmlm9n0dYp1NoHcFK6+APD/wHZ2We6CKXDSI=
 github.com/drycc/pkg v0.0.0-20241028091700-8caca001c932/go.mod h1:upGcZF/RCEqidGjSnWHh/txRC1I4GPsRGvF8/+bDfwU=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=

pkg/gitreceive/build_type_test.go

@@ -38,7 +38,7 @@ func TestGetStack(t *testing.T) {
 	config.Values = []api.ConfigValue{
 		{
 			Group: "global",
-			KV: api.KV{
+			ConfigVar: api.ConfigVar{
 				Name:  "DRYCC_STACK",
 				Value: "buildpack",
 			},
@@ -52,7 +52,7 @@ func TestGetStack(t *testing.T) {
 	config.Values = []api.ConfigValue{
 		{
 			Group: "global",
-			KV: api.KV{
+			ConfigVar: api.ConfigVar{
 				Name:  "DRYCC_STACK",
 				Value: "container",
 			},

pkg/gitreceive/k8s_util.go

@@ -143,14 +143,14 @@ func buildJob(
 	})
 
 	if len(job.Spec.Template.Spec.Containers) > 0 {
-		kvs := []api.KV{}
+		cvs := []api.ConfigVar{}
 		// only take the value of the global group
 		for _, v := range values {
 			if v.Group == "global" {
-				kvs = append(kvs, v.KV)
+				cvs = append(cvs, v.ConfigVar)
 			}
 		}
-		for _, v := range kvs {
+		for _, v := range cvs {
 			job.Spec.Template.Spec.Containers[0].Env = append(job.Spec.Template.Spec.Containers[0].Env, corev1.EnvVar{
 				Name:  v.Name,
 				Value: fmt.Sprintf("%v", v.Value),

pkg/gitreceive/k8s_util_test.go

@@ -49,7 +49,7 @@ func TestBuildJob(t *testing.T) {
 	values := []api.ConfigValue{
 		{
 			Group: "global",
-			KV: api.KV{
+			ConfigVar: api.ConfigVar{
 				Name:  "KEY",
 				Value: "VALUE",
 			},