feat(pipeline): add dryccfile support

Author: duanhongyi

go.mod

@@ -5,11 +5,11 @@ go 1.22
 require (
 	github.com/aws/aws-sdk-go v1.50.25
 	github.com/distribution/distribution/v3 v3.0.0-alpha.1.0.20240215070122-62aa44edfde0
-	github.com/drycc/controller-sdk-go v0.0.0-20240304053455-0352ebbb02dc
+	github.com/drycc/controller-sdk-go v0.0.0-20240403162730-10676f2b328d
 	github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f
 	github.com/google/uuid v1.6.0
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.9.0
 	github.com/urfave/cli/v2 v2.27.1
 	golang.org/x/crypto v0.19.0
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -18,8 +18,8 @@ github.com/distribution/distribution/v3 v3.0.0-alpha.1.0.20240215070122-62aa44ed
 github.com/distribution/distribution/v3 v3.0.0-alpha.1.0.20240215070122-62aa44edfde0/go.mod h1:wEFrX2NpxlKzg7JIqU/xYPgbzTR35TAlT4KJSdqRKcI=
 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-20240304053455-0352ebbb02dc h1:tRMSrNX3qFzQsfVhij1pO2pwHIWTdSvCbrAcsX+wwrQ=
-github.com/drycc/controller-sdk-go v0.0.0-20240304053455-0352ebbb02dc/go.mod h1:EAzlvB5kQq4pFP+h+zl0mx2q1GUlHgzdQ92tlYtDQfQ=
+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/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
@@ -146,8 +146,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+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/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
 github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=

pkg/gitreceive/build.go

@@ -249,6 +249,10 @@ func build(
 	if err != nil {
 		return err
 	}
+	dryccfile, err := getDryccfile(tmpDir)
+	if err != nil {
+		return err
+	}
 	dockerfile, err := getDockerfile(tmpDir, stack)
 	if err != nil {
 		return err
@@ -257,7 +261,7 @@ func build(
 
 	quit := progress("...", conf.SessionIdleInterval())
 	log.Info("Launching App...")
-	release, err := hooks.CreateBuild(client, conf.Username, conf.App(), imageName, stack["name"], gitSha.Short(), procfile, dockerfile)
+	release, err := hooks.CreateBuild(client, conf.Username, conf.App(), imageName, stack["name"], gitSha.Short(), procfile, dryccfile, dockerfile)
 	quit <- true
 	<-quit
 	if controller.CheckAPICompat(client, err) != nil {
@@ -301,25 +305,41 @@ func prettyPrintJSON(data interface{}) (string, error) {
 
 func getProcfile(dirName string) (dryccAPI.ProcessType, error) {
 	procfile := dryccAPI.ProcessType{}
-	if _, err := os.Stat(fmt.Sprintf("%s/Procfile", dirName)); err == nil {
-		rawProcFile, err := os.ReadFile(fmt.Sprintf("%s/Procfile", dirName))
+	file := fmt.Sprintf("%s/Procfile", dirName)
+	if _, err := os.Stat(file); err == nil {
+		rawProcFile, err := os.ReadFile(file)
 		if err != nil {
-			return nil, fmt.Errorf("error in reading %s/Procfile (%s)", dirName, err)
+			return nil, fmt.Errorf("error in reading %s (%s)", file, err)
 		}
 		if err := yaml.Unmarshal(rawProcFile, &procfile); err != nil {
-			return nil, fmt.Errorf("procfile %s/ProcFile is malformed (%s)", dirName, err)
+			return nil, fmt.Errorf("procfile %s is malformed (%s)", file, err)
+		}
+	}
+	return procfile, nil
+}
+
+func getDryccfile(dirName string) (map[string]interface{}, error) {
+	dryccfile := map[string]interface{}{}
+	file := fmt.Sprintf("%s/drycc.yaml", dirName)
+	if _, err := os.Stat(file); err == nil {
+		rawDryccfile, err := os.ReadFile(file)
+		if err != nil {
+			return nil, fmt.Errorf("error in reading %s (%s)", file, err)
+		}
+		if err := yaml.Unmarshal(rawDryccfile, &dryccfile); err != nil {
+			return nil, fmt.Errorf("drycc.yaml %s is malformed (%s)", file, err)
 		}
-		return procfile, nil
 	}
-	return nil, fmt.Errorf("no Procfile can be matched in (%s)", dirName)
+	return dryccfile, nil
 }
 
 func getDockerfile(dirName string, stack map[string]string) (string, error) {
 	if stack["name"] == "container" {
-		if _, err := os.Stat(fmt.Sprintf("%s/Dockerfile", dirName)); err == nil {
-			rawDockerfile, err := os.ReadFile(fmt.Sprintf("%s/Dockerfile", dirName))
+		file := fmt.Sprintf("%s/Dockerfile", dirName)
+		if _, err := os.Stat(file); err == nil {
+			rawDockerfile, err := os.ReadFile(file)
 			if err != nil {
-				return "", fmt.Errorf("error in reading %s/Dockerfile (%s)", dirName, err)
+				return "", fmt.Errorf("error in reading %s (%s)", file, err)
 			}
 			return string(rawDockerfile), nil
 		}

pkg/gitreceive/build_test.go

@@ -3,7 +3,6 @@ package gitreceive
 import (
 	"bytes"
 	"context"
-	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -96,6 +95,59 @@ func TestRepoCmd(t *testing.T) {
 	}
 }
 
+func TestGetDryccfileFromRepoSuccess(t *testing.T) {
+	tmpDir, err := os.MkdirTemp("", "tmpdir")
+	if err != nil {
+		t.Fatalf("error creating temp directory (%s)", err)
+	}
+
+	data := `
+build:
+  docker:
+    web: Dockerfile
+    worker: worker/Dockerfile
+  config:
+    RAILS_ENV: development
+    FOO: bar
+run:
+  command:
+  - ./deployment-tasks.sh
+  image: worker
+deploy:
+  web:
+    command:
+    - bash
+    - -c
+    args: bundle exec puma -C config/puma.rb
+  worker:
+    command:
+    - bash
+    - -c
+    args:
+    - python myworker.py
+  asset-syncer:
+    command:
+    - bash
+    - -c
+    args:
+    - python asset-syncer.py
+    image: worker
+`
+	if err := os.WriteFile(tmpDir+"/drycc.yaml", []byte(data), 0644); err != nil {
+		t.Fatalf("error creating %s/drycc.yaml (%s)", tmpDir, err)
+	}
+	defer func() {
+		if err := os.RemoveAll(tmpDir); err != nil {
+			t.Fatalf("failed to remove drycc.yaml from %s (%s)", tmpDir, err)
+		}
+	}()
+	dryccfile, err := getDryccfile(tmpDir)
+	actualData := map[string]interface{}{}
+	yaml.Unmarshal([]byte(data), &actualData)
+	assert.Equal(t, err, nil)
+	assert.Equal(t, dryccfile, actualData, "data")
+}
+
 func TestGetProcfileFromRepoSuccess(t *testing.T) {
 	tmpDir, err := os.MkdirTemp("", "tmpdir")
 	if err != nil {
@@ -110,10 +162,6 @@ func TestGetProcfileFromRepoSuccess(t *testing.T) {
 			t.Fatalf("failed to remove Procfile from %s (%s)", tmpDir, err)
 		}
 	}()
-	config := api.Config{}
-	config.Values = map[string]interface{}{
-		"DRYCC_STACK": "buildpack",
-	}
 	procType, err := getProcfile(tmpDir)
 	actualData := api.ProcessType{}
 	yaml.Unmarshal(data, &actualData)
@@ -135,36 +183,17 @@ func TestGetProcfileFromRepoFailure(t *testing.T) {
 			t.Fatalf("failed to remove Procfile from %s (%s)", tmpDir, err)
 		}
 	}()
-	config := api.Config{}
-	config.Values = map[string]interface{}{
-		"DRYCC_STACK": "buildpack",
-	}
 	_, err = getProcfile(tmpDir)
 
 	assert.True(t, err != nil, "no error received when there should have been")
 }
 
 func TestGetProcfileFromServerSuccess(t *testing.T) {
-	data := []byte("web: example-go")
-	config := api.Config{}
-	config.Values = map[string]interface{}{
-		"DRYCC_STACK": "buildpack",
-	}
-
-	_, err := getProcfile("")
+	data := []byte("")
+	expect, _ := getProcfile("")
 	actualData := api.ProcessType{}
 	yaml.Unmarshal(data, &actualData)
-	assert.Error(t, err, fmt.Errorf("no Procfile can be matched in (%s)", ""))
-}
-
-func TestGetProcfileFromServerFailure(t *testing.T) {
-	config := api.Config{}
-	config.Values = map[string]interface{}{
-		"DRYCC_STACK": "buildpack",
-	}
-	_, err := getProcfile("")
-	assert.Error(t, err, fmt.Errorf("no Procfile can be matched in (%s)", ""))
-	assert.True(t, err != nil, "no error received when there should have been")
+	assert.Equal(t, expect, actualData)
 }
 
 func TestPrettyPrintJSON(t *testing.T) {