feat(pipeline): add dryccfile support

Author: duanhongyi

cmd/builds.go

@@ -43,33 +43,40 @@ func (d *DryccCmd) BuildsList(appID string, results int) error {
 }
 
 // BuildsCreate creates a build for an app.
-func (d *DryccCmd) BuildsCreate(appID, image, stack, procfile string) error {
+func (d *DryccCmd) BuildsCreate(appID, image, stack, procfile string, dryccfile string) error {
 	s, appID, err := load(d.ConfigFile, appID)
 
 	if err != nil {
 		return err
 	}
 
 	procfileMap := make(map[string]string)
+	if _, err := os.Stat(procfile); err == nil {
+		contents, err := os.ReadFile(procfile)
+		if err != nil {
+			return err
+		}
 
-	if procfile != "" {
-		if procfileMap, err = parseProcfile([]byte(procfile)); err != nil {
+		if procfileMap, err = parseProcfile(contents); err != nil {
 			return err
 		}
-	} else if _, err := os.Stat("Procfile"); err == nil {
-		contents, err := os.ReadFile("Procfile")
+	}
+
+	dryccfileMap := make(map[string]interface{})
+	if _, err := os.Stat(dryccfile); err == nil {
+		contents, err := os.ReadFile(dryccfile)
 		if err != nil {
 			return err
 		}
 
-		if procfileMap, err = parseProcfile(contents); err != nil {
+		if dryccfileMap, err = parseDryccfile(contents); err != nil {
 			return err
 		}
 	}
 
 	d.Print("Creating build... ")
 	quit := progress(d.WOut)
-	_, err = builds.New(s.Client, appID, image, stack, procfileMap)
+	_, err = builds.New(s.Client, appID, image, stack, procfileMap, dryccfileMap)
 	quit <- true
 	<-quit
 	if d.checkAPICompatibility(s.Client, err) != nil {
@@ -85,3 +92,8 @@ func parseProcfile(procfile []byte) (map[string]string, error) {
 	procfileMap := make(map[string]string)
 	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)
+}

cmd/builds_test.go

@@ -143,7 +143,7 @@ func TestBuildsCreate(t *testing.T) {
 		fmt.Fprintf(w, "{}")
 	})
 
-	err = cmdr.BuildsCreate("enterprise", "ncc/1701:A", "container", "")
+	err = cmdr.BuildsCreate("enterprise", "ncc/1701:A", "container", "", "")
 	assert.NoError(t, err)
 	assert.Equal(t, testutil.StripProgress(b.String()), "Creating build... done\n", "output")
 
@@ -163,9 +163,22 @@ func TestBuildsCreate(t *testing.T) {
 	})
 	b.Reset()
 
-	err = cmdr.BuildsCreate("bradbury", "nx/72307:latest", "container", `web: ./drive
-warp: ./warp 8
-`)
+	tmpDir, err := os.MkdirTemp("", "tmpdir")
+	if err != nil {
+		t.Fatalf("error creating temp directory (%s)", err)
+	}
+	data := `web: ./drive
+warp: ./warp 8`
+	if err := os.WriteFile(tmpDir+"/Procfile", []byte(data), 0644); err != nil {
+		t.Fatalf("error creating %s/Procfile (%s)", tmpDir, err)
+	}
+	defer func() {
+		if err := os.RemoveAll(tmpDir); err != nil {
+			t.Fatalf("failed to remove Procfile from %s (%s)", tmpDir, err)
+		}
+	}()
+
+	err = cmdr.BuildsCreate("bradbury", "nx/72307:latest", "container", tmpDir+"/Procfile", "")
 	assert.NoError(t, err)
 	assert.Equal(t, testutil.StripProgress(b.String()), "Creating build... done\n", "output")
 
@@ -178,6 +191,14 @@ warp: ./warp 8
 				"web":  "./drive",
 				"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"},
+					},
+				},
+			},
 		}, r)
 
 		w.WriteHeader(http.StatusCreated)
@@ -190,7 +211,18 @@ warp: ./warp 8
 `), os.ModePerm)
 	assert.NoError(t, err)
 
-	err = cmdr.BuildsCreate("franklin", "nx/326:latest", "container", "")
+	err = os.WriteFile("drycc.yaml", []byte(`
+deploy:
+  web:
+    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")
 	assert.NoError(t, err)
 	assert.Equal(t, testutil.StripProgress(b.String()), "Creating build... done\n", "output")
 

cmd/cmd.go

@@ -24,7 +24,7 @@ type Commander interface {
 	Logout() error
 	Whoami(bool) error
 	BuildsList(string, int) error
-	BuildsCreate(string, string, string, string) error
+	BuildsCreate(string, string, string, string, string) error
 	CanaryInfo(string) error
 	CanaryCreate(string, []string) error
 	CanaryRemove(string, []string) error

cmd/releases.go

@@ -25,13 +25,13 @@ func (d *DryccCmd) ReleasesList(appID string, results int) error {
 	if count == 0 {
 		d.Println(fmt.Sprintf("No releases found in %s app.", appID))
 	} else {
-		table := d.getDefaultFormatTable([]string{"UUID", "OWNER", "VERSION", "CREATED", "SUMMARY"})
+		table := d.getDefaultFormatTable([]string{"UUID", "OWNER", "STATE", "VERSION", "CREATED", "SUMMARY"})
 		for _, r := range releases {
 			summary := r.Summary
 			if len(summary) > 64 {
 				summary = fmt.Sprintf("%s[...]", summary[:64])
 			}
-			table.Append([]string{r.UUID, r.Owner, fmt.Sprintf("v%d", r.Version), r.Created, summary})
+			table.Append([]string{r.UUID, r.Owner, r.State, fmt.Sprintf("v%d", r.Version), r.Created, summary})
 		}
 		table.Render()
 	}
@@ -53,6 +53,7 @@ func (d *DryccCmd) ReleasesInfo(appID string, version int) error {
 	table := d.getDefaultFormatTable([]string{})
 	table.Append([]string{"App:", r.App})
 	table.Append([]string{"UUID:", r.UUID})
+	table.Append([]string{"State:", r.State})
 	table.Append([]string{"Owner:", r.Owner})
 	table.Append([]string{"Build:", r.Build})
 	table.Append([]string{"Config:", r.Config})

cmd/releases_test.go

@@ -32,6 +32,7 @@ func TestReleasesList(t *testing.T) {
 			{
 					"uuid": "c4aed81c-d1ca-4ff1-ab89-d2151264e1a3",
 					"app": "numenor",
+					"state": "succeed",
 					"owner": "nazgul",
 					"created": "2016-08-22T17:40:16Z",
 					"updated": "2016-08-22T17:40:16Z",
@@ -42,6 +43,7 @@ func TestReleasesList(t *testing.T) {
 				},
 				{
 					"app": "numenor",
+					"state": "succeed",
 					"build": null,
 					"config": "95bd6dea-1685-4f78-a03d-fd7270b058d1",
 					"created": "2014-01-01T00:00:00UTC",
@@ -57,9 +59,9 @@ func TestReleasesList(t *testing.T) {
 
 	err = cmdr.ReleasesList("numenor", -1)
 	assert.NoError(t, err)
-	assert.Equal(t, b.String(), `UUID                                    OWNER     VERSION    CREATED                   SUMMARY                        
-c4aed81c-d1ca-4ff1-ab89-d2151264e1a3    nazgul    v2         2016-08-22T17:40:16Z      khamul added ANGMAR               
-de1bf5b5-4a72-4f94-a10c-d2a3741cdf75    nazgul    v1         2014-01-01T00:00:00UTC    nazgul created initial release    
+	assert.Equal(t, b.String(), `UUID                                    OWNER     STATE      VERSION    CREATED                   SUMMARY                        
+c4aed81c-d1ca-4ff1-ab89-d2151264e1a3    nazgul    succeed    v2         2016-08-22T17:40:16Z      khamul added ANGMAR               
+de1bf5b5-4a72-4f94-a10c-d2a3741cdf75    nazgul    succeed    v1         2014-01-01T00:00:00UTC    nazgul created initial release    
 `, "output")
 }
 
@@ -83,6 +85,7 @@ func TestReleasesListLimit(t *testing.T) {
 			{
 					"uuid": "c4aed81c-d1ca-4ff1-ab89-d2151264e1a3",
 					"app": "numenor",
+					"state": "succeed",
 					"owner": "nazgul",
 					"created": "2016-08-22T17:40:16Z",
 					"updated": "2016-08-22T17:40:16Z",
@@ -97,8 +100,8 @@ func TestReleasesListLimit(t *testing.T) {
 
 	err = cmdr.ReleasesList("numenor", 1)
 	assert.NoError(t, err)
-	assert.Equal(t, b.String(), `UUID                                    OWNER     VERSION    CREATED                 SUMMARY             
-c4aed81c-d1ca-4ff1-ab89-d2151264e1a3    nazgul    v2         2016-08-22T17:40:16Z    khamul added ANGMAR    
+	assert.Equal(t, b.String(), `UUID                                    OWNER     STATE      VERSION    CREATED                 SUMMARY             
+c4aed81c-d1ca-4ff1-ab89-d2151264e1a3    nazgul    succeed    v2         2016-08-22T17:40:16Z    khamul added ANGMAR    
 `, "output")
 }
 
@@ -117,6 +120,7 @@ func TestReleasesInfo(t *testing.T) {
 		fmt.Fprintf(w, `{
 			"uuid": "c4aed81c-d1ca-4ff1-ab89-d2151264e1a3",
 			"app": "numenor",
+			"state": "succeed",
 			"owner": "nazgul",
 			"created": "2016-08-22T17:40:16Z",
 			"updated": "2016-08-22T17:40:16Z",
@@ -131,6 +135,7 @@ func TestReleasesInfo(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, b.String(), `App:        numenor                                 
 UUID:       c4aed81c-d1ca-4ff1-ab89-d2151264e1a3    
+State:      succeed                                 
 Owner:      nazgul                                  
 Build:                                              
 Config:     3bb816b1-4fde-4b06-8afe-acd12f58a266    

cmd/resources_test.go

@@ -207,7 +207,7 @@ func TestResourceDelete(t *testing.T) {
 	err = cmdr.ResourceDelete("example-go", "mysql", "mysql")
 	assert.NoError(t, err)
 
-	assert.Equal(t, testutil.StripProgress(b.String()), "Deleting mysql from example-go... done\n", "output")
+	assert.Equal(t, testutil.StripProgress(b.String()), "Destroying mysql...\ndone\n", "output")
 }
 
 func TestResourcePut(t *testing.T) {

go.mod

@@ -5,7 +5,7 @@ go 1.22
 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-20240322070846-b558c520d745
+	github.com/drycc/controller-sdk-go v0.0.0-20240403162730-10676f2b328d
 	github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/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-20240322070846-b558c520d745 h1:eXYotkPeGfc7gmjle7v2ytiNGQzoV63BHHaWZh0SNGU=
-github.com/drycc/controller-sdk-go v0.0.0-20240322070846-b558c520d745/go.mod h1:RJ0QxVNWhximzfd08+FkZfKzrX7gOp2gsgXfpqVPJZQ=
+github.com/drycc/controller-sdk-go v0.0.0-20240403162730-10676f2b328d h1:qffye+xHsNTpn9/kD0YY/fkov6IBJTJIVXWxoXtXCrw=
+github.com/drycc/controller-sdk-go v0.0.0-20240403162730-10676f2b328d/go.mod h1:RJ0QxVNWhximzfd08+FkZfKzrX7gOp2gsgXfpqVPJZQ=
 github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f h1:kgjvUQJeAszDoU1Vo4vTTE92KI8Av3JPb6Qn890niXg=
 github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f/go.mod h1:n+QxGif6ha9CEoxVnlipxb9IdmerybcUSzTEDFkvjiA=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=

parser/builds.go

@@ -67,14 +67,14 @@ Options:
 func buildsCreate(argv []string, cmdr cmd.Commander) error {
 	usage := `
 Creates a new build of an application. Imports an <image> and deploys it to Drycc
-as a new release. If a Procfile is present in the current directory, it will be used
-as the default process types for this application.
+as a new release. If a Procfile or drycc.yaml is present in the current directory,
+it will be used as the default for this application.
 
 Usage: drycc builds:create <image> [options]
 
 Arguments:
   <image>
-    A fully-qualified container image, either from Drycc Registry (e.g. registry.drycc.cc/drycc/example-go:latest)
+    A default fully-qualified container image, either from Drycc Registry (e.g. registry.drycc.cc/drycc/example-go:latest)
     or from an in-house registry (e.g. myregistry.example.com:5000/example-go:latest).
     This image must include the tag.
 
@@ -84,7 +84,9 @@ Options:
   -s --stack=<stack>
     The stack name for the application, defaults to container.
   -p --procfile=<procfile>
-    A YAML string used to supply a Procfile to the application.
+    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.
 `
 
 	args, err := docopt.ParseArgs(usage, argv, "")
@@ -99,7 +101,8 @@ Options:
 	if stack == "" {
 		stack = "container"
 	}
-	procfile := safeGetString(args, "--procfile")
+	procfile := safeGetValue(args, "--procfile", "Procfile")
+	dryccfile := safeGetValue(args, "--dryccfile", "drycc.yaml")
 
-	return cmdr.BuildsCreate(app, image, stack, procfile)
+	return cmdr.BuildsCreate(app, image, stack, procfile, dryccfile)
 }

parser/builds_test.go

@@ -13,7 +13,7 @@ func (d FakeDryccCmd) BuildsList(string, int) error {
 	return errors.New("builds:list")
 }
 
-func (d FakeDryccCmd) BuildsCreate(string, string, string, string) error {
+func (d FakeDryccCmd) BuildsCreate(string, string, string, string, string) error {
 	return errors.New("builds:create")
 }