chore(workflow): compatible with the latest dryccfile format

Author: duanhongyi

cmd/builds.go

@@ -56,7 +56,7 @@ func (d *DryccCmd) BuildsInfo(appID string, version int) error {
 }
 
 // BuildsCreate creates a build for an app.
-func (d *DryccCmd) BuildsCreate(appID, image, stack, procfile, dryccfile, confirm string) error {
+func (d *DryccCmd) BuildsCreate(appID, image, stack, procfile, dryccpath, confirm string) error {
 	s, appID, err := load(d.ConfigFile, appID)
 
 	if err != nil {
@@ -76,13 +76,8 @@ func (d *DryccCmd) BuildsCreate(appID, image, stack, procfile, dryccfile, confir
 	}
 
 	dryccfileMap := make(map[string]interface{})
-	if _, err := os.Stat(dryccfile); err == nil {
-		contents, err := os.ReadFile(dryccfile)
-		if err != nil {
-			return err
-		}
-
-		if dryccfileMap, err = parseDryccfile(contents); err != nil {
+	if info, err := os.Stat(dryccpath); err == nil && info.IsDir() {
+		if dryccfileMap, err = drycc.ParseDryccfile(dryccpath); err != nil {
 			return err
 		}
 	}
@@ -110,11 +105,6 @@ func parseProcfile(procfile []byte) (map[string]string, error) {
 	return procfileMap, yaml.Unmarshal(procfile, &procfileMap)
 }
 
-func parseDryccfile(dryccfile []byte) (map[string]interface{}, error) {
-	dryccfileMap := make(map[string]interface{})
-	return dryccfileMap, yaml.Unmarshal(dryccfile, &dryccfileMap)
-}
-
 func buildConfirmAction(c *drycc.Client, appID string, procfileMap map[string]string,
 	dryccfileMap map[string]interface{}, confirm string) error {
 
@@ -123,7 +113,7 @@ func buildConfirmAction(c *drycc.Client, appID string, procfileMap map[string]st
 	if ((len(build.Procfile) != 0 && len(procfileMap) == 0) || (len(build.Dryccfile) != 0 && len(dryccfileMap) == 0)) && (confirm == "" || confirm != "yes") {
 		// hint
 		fmt.Printf(` !    WARNING: Potentially Build Create Action
- !    The Procfile or drycc.yaml is empty, not last time
+ !    The Procfile or drycc file is empty, not last time
  !    To proceed, type "yes" !
 
 > `)

cmd/builds_test.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/drycc/controller-sdk-go/api"
@@ -146,10 +147,19 @@ warp: ./warp 8`
 					"warp": "./warp 8",
 				},
 				Dryccfile: map[string]interface{}{
-					"deploy": map[string]interface{}{
-						"web": map[string]interface{}{
-							"command": []string{"bash", "-c"},
-							"args":    []string{"bundle exec puma -C config/puma.rb"},
+					"pipeline": map[string]interface{}{
+						"web.yaml": map[string]interface{}{
+							"kind":  "pipeline",
+							"ptype": "web",
+							"deploy": map[string]interface{}{
+								"command": []string{
+									"bash",
+									"-c",
+								},
+								"args": []string{
+									"bundle exec puma -C config/puma.rb",
+								},
+							},
 						},
 					},
 				},
@@ -166,18 +176,22 @@ warp: ./warp 8
 `), os.ModePerm)
 	assert.NoError(t, err)
 
-	err = os.WriteFile("drycc.yaml", []byte(`
+	dryccpath := ".drycc"
+	os.MkdirAll(dryccpath, 0700)
+	defer os.RemoveAll(dryccpath)
+	err = os.WriteFile(filepath.Join(dryccpath, "web.yaml"), []byte(`
+kind: pipeline
+ptype: web
 deploy:
-  web:
-    command:
-    - bash
-    - -c
-    args:
-    - bundle exec puma -C config/puma.rb
+  command:
+  - bash
+  - -c
+  args:
+  - bundle exec puma -C config/puma.rb
 `), os.ModePerm)
 	assert.NoError(t, err)
 
-	err = cmdr.BuildsCreate("franklin", "nx/326:latest", "container", "Procfile", "drycc.yaml", "yes")
+	err = cmdr.BuildsCreate("franklin", "nx/326:latest", "container", "Procfile", dryccpath, "yes")
 	assert.NoError(t, err)
 	assert.Equal(t, testutil.StripProgress(b.String()), "Creating build... done\n", "output")
 

cmd/config.go

@@ -189,12 +189,7 @@ func (d *DryccCmd) ConfigPull(appID, ptype, group, fileName string, interactive
 	}
 
 	if interactive {
-		contents, err := os.ReadFile(fileName)
-		if err != nil {
-			return err
-		}
-		localConfigVars := strings.Split(string(contents), "\n")
-		configMap, err := parseEnv(localConfigVars[:len(localConfigVars)-1])
+		configMap, err := drycc.ParseEnv(fileName)
 		if err != nil {
 			return err
 		}
@@ -356,27 +351,6 @@ func parseConfig(ptype, group string, configVars []string) ([]api.ConfigValue, e
 	return configMap, nil
 }
 
-func parseEnv(configVars []string) (map[string]interface{}, error) {
-	configMap := make(map[string]interface{})
-
-	regex := regexp.MustCompile(`^([A-z0-9_\-\.]+)=([\s\S]*)$`)
-	for _, config := range configVars {
-		// Skip config that starts with an comment
-		if config[0] == '#' {
-			continue
-		}
-
-		if regex.MatchString(config) {
-			captures := regex.FindStringSubmatch(config)
-			configMap[captures[1]] = captures[2]
-		} else {
-			return nil, fmt.Errorf("'%s' does not match the pattern 'key=var', ex: MODE=test", config)
-		}
-	}
-
-	return configMap, nil
-}
-
 func formatEnv(configVars map[string]interface{}) string {
 	var formattedConfig string
 

go.mod

@@ -5,12 +5,12 @@ go 1.23
 require (
 	github.com/containerd/console v1.0.4
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
-	github.com/drycc/controller-sdk-go v0.0.0-20241210030451-bd35b03af548
+	github.com/drycc/controller-sdk-go v0.0.0-20250114084605-55b2a28ae6ee
 	github.com/drycc/pkg v0.0.0-20241028091700-8caca001c932
 	github.com/minio/selfupdate v0.6.0
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/schollz/progressbar/v3 v3.17.0
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
 	golang.org/x/net v0.33.0
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -9,8 +9,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-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/controller-sdk-go v0.0.0-20250114084605-55b2a28ae6ee h1:A8uiBnRTW4mY5zKnwku25Rf1YHAAexTAfyMSPiF3uX8=
+github.com/drycc/controller-sdk-go v0.0.0-20250114084605-55b2a28ae6ee/go.mod h1:lGJpGtKDE7WUVJhkxOgWQfd4GEulJ/NlcJycVZIzs5g=
 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/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -39,8 +39,8 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/schollz/progressbar/v3 v3.17.0 h1:Fv+vG6O6jnJwdjCelvfyYO7sF2jaUGQVmdH4CxcZdsQ=
 github.com/schollz/progressbar/v3 v3.17.0/go.mod h1:5H4fLgifX+KeQCsEJnZTOepgZLe1jFF1lpPXb68IJTA=
-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=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=

parser/apps.go

@@ -73,7 +73,7 @@ Options:
   --no-remote
     do not create a 'drycc' git remote.
   -r --remote REMOTE
-    name of remote to create. [default: drycc]
+    name of remote to create. [default: drycc].
 `
 
 	args, err := docopt.ParseArgs(usage, argv, "")
@@ -97,7 +97,7 @@ Usage: drycc apps:list [options]
 
 Options:
   -l --limit=<num>
-    the maximum number of results to display, defaults to config setting
+    the maximum number of results to display, defaults to config setting.
 `
 
 	args, err := docopt.ParseArgs(usage, argv, "")
@@ -204,7 +204,7 @@ Usage: drycc apps:run [--mount=<volume>:<path>...] [options] [--] <command>...
 
 Arguments:
   <volume>
-    the volume name
+    the volume name.
   <path>
     the filesystem path.
   <command>

parser/auth.go

@@ -51,7 +51,7 @@ Options:
   -p --password=<password>
     provide a password for the account.
   --ssl-verify=true
-    enables/disables SSL certificate verification for API requests
+    enables/disables SSL certificate verification for API requests.
 `
 
 	args, err := docopt.ParseArgs(usage, argv, "")
@@ -76,8 +76,6 @@ func authLogout(argv []string, cmdr cmd.Commander) error {
 Logs out from a controller and clears the user session.
 
 Usage: drycc auth:logout
-
-Options:
 `
 
 	if _, err := docopt.ParseArgs(usage, argv, ""); err != nil {

parser/autoscale.go

@@ -69,11 +69,11 @@ Arguments:
   <ptype>
     the process type to add to the application's autoscale settings.
   --min=<min>
-	minimum replicas to keep around
+	minimum replicas to keep around.
   --max=<max>
-	max replicas to scale up to
+	max replicas to scale up to.
   --cpu-percent=<cpu-percent>
-	target CPU utilization
+	target CPU utilization.
 
 Options:
   -a --app=<app>

parser/builds.go

@@ -10,7 +10,7 @@ func Builds(argv []string, cmdr cmd.Commander) error {
 	usage := `
 Valid commands for builds:
 
-builds:info        Print information about a specific build.
+builds:info        Print information about a specific build
 builds:create      imports an image and deploys as a new release
 
 Use 'drycc help [command]' to learn more.
@@ -86,8 +86,8 @@ Options:
     The stack name for the application, defaults to container.
   -p --procfile=<procfile>
     A YAML file used to supply a Procfile to the application.
-  -d --dryccfile=<dryccfile>
-    A YAML file used to supply a drycc.yaml to the application.
+  -d --dryccpath=<dryccpath>
+    Drycc config path to the application, default is '.drycc'.
   --confirm=yes
     To proceed, type "yes".
 `
@@ -100,13 +100,11 @@ Options:
 
 	app := safeGetString(args, "--app")
 	image := safeGetString(args, "<image>")
-	stack := safeGetString(args, "--stack")
 	confirm := safeGetString(args, "--confirm")
-	if stack == "" {
-		stack = "container"
-	}
+
+	stack := safeGetValue(args, "--stack", "container")
 	procfile := safeGetValue(args, "--procfile", "Procfile")
-	dryccfile := safeGetValue(args, "--dryccfile", "drycc.yaml")
+	dryccpath := safeGetValue(args, "--dryccpath", ".")
 
-	return cmdr.BuildsCreate(app, image, stack, procfile, dryccfile, confirm)
+	return cmdr.BuildsCreate(app, image, stack, procfile, dryccpath, confirm)
 }

parser/certs.go

@@ -107,7 +107,7 @@ Options:
 
 func certRemove(argv []string, cmdr cmd.Commander) error {
 	usage := `
-removes a certificate/key pair from the application.
+Remove a certificate/key pair from the application.
 
 Usage: drycc certs:remove <name> [options]
 
@@ -131,13 +131,13 @@ Options:
 
 func certInfo(argv []string, cmdr cmd.Commander) error {
 	usage := `
-fetch more detailed information about a certificate
+Fetch more detailed information about a certificate.
 
 Usage: drycc certs:info <name> [options]
 
 Arguments:
   <name>
-    the name of the cert to get information from
+    the name of the cert to get information from.
 
 Options:
   -a --app=<app>
@@ -155,15 +155,15 @@ Options:
 
 func certAttach(argv []string, cmdr cmd.Commander) error {
 	usage := `
-attach a certificate to a domain.
+Attach a certificate to a domain.
 
 Usage: drycc certs:attach <name> <domain> [options]
 
 Arguments:
   <name>
-    name of the certificate to attach domain to
+    name of the certificate to attach domain to.
   <domain>
-    common name of the domain to attach to (needs to already be in the system)
+    common name of the domain to attach to (needs to already be in the system).
 
 Options:
   -a --app=<app>
@@ -182,7 +182,7 @@ Options:
 
 func certDetach(argv []string, cmdr cmd.Commander) error {
 	usage := `
-detach a certificate from a domain.
+Detach a certificate from a domain.
 
 Usage: drycc certs:detach <name> <domain> [options]