chore(utils): add parse dryccfile

Author: duanhongyi

http.go

@@ -55,7 +55,7 @@ func (c *Client) Do(req *http.Request) (*http.Response, error) {
 	setControllerVersion(c, res.Header)
 
 	// Return results along with api compatibility error
-	return res, checkAPICompatibility(apiVersion, APIVersion)
+	return res, CheckAPICompatibility(apiVersion, APIVersion)
 }
 
 // NewRequest wraps [NewRequestWithContext] using [context.Background].
@@ -143,7 +143,7 @@ your drycc version is correct.`
 	c.ControllerAPIVersion = apiVersion
 	setControllerVersion(c, res.Header)
 
-	return checkAPICompatibility(apiVersion, APIVersion)
+	return CheckAPICompatibility(apiVersion, APIVersion)
 }
 
 // Healthcheck can be called to see if the controller is healthy
@@ -177,7 +177,7 @@ func (c *Client) Healthcheck() error {
 	c.ControllerAPIVersion = apiVersion
 	setControllerVersion(c, res.Header)
 
-	return checkAPICompatibility(apiVersion, APIVersion)
+	return CheckAPICompatibility(apiVersion, APIVersion)
 }
 
 func addUserAgent(headers *http.Header, userAgent string) {

utils.go

@@ -1,8 +1,81 @@
 package drycc
 
-import "strings"
+import (
+	"fmt"
+	"os"
+	"path"
+	"regexp"
+	"strings"
 
-func checkAPICompatibility(serverAPIVersion, clientAPIVersion string) error {
+	yaml "gopkg.in/yaml.v3"
+)
+
+func ParseEnv(fileame string) (map[string]interface{}, error) {
+	contents, err := os.ReadFile(fileame)
+	if err != nil {
+		return nil, err
+	}
+	configMap := make(map[string]interface{})
+	regex := regexp.MustCompile(`^([A-z0-9_\-\.]+)=([\s\S]*)$`)
+	for _, config := range strings.Split(string(contents), "\n") {
+		// Skip config that starts with an comment
+		if len(config) == 0 || 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 ParseDryccfile(dryccpath string) (map[string]interface{}, error) {
+	config := make(map[string]interface{})
+	if entries, err := os.ReadDir(path.Join(dryccpath, "config")); err == nil {
+		for _, entry := range entries {
+			if !entry.IsDir() {
+				if env, err := ParseEnv(path.Join(dryccpath, "config", entry.Name())); err == nil {
+					config[entry.Name()] = env
+				} else {
+					return nil, err
+				}
+			}
+		}
+	}
+	pipeline := make(map[string]interface{})
+	if entries, err := os.ReadDir(dryccpath); err == nil {
+		for _, entry := range entries {
+			if !entry.IsDir() && (strings.HasSuffix(entry.Name(), ".yaml") || strings.HasSuffix(entry.Name(), ".yml")) {
+				data := make(map[string]interface{})
+				if bytes, err := os.ReadFile(path.Join(dryccpath, entry.Name())); err == nil {
+					if err = yaml.Unmarshal([]byte(bytes), data); err == nil {
+						pipeline[entry.Name()] = data
+					} else {
+						return nil, err
+					}
+				} else {
+					return nil, err
+				}
+			}
+		}
+	}
+
+	dryccfile := make(map[string]interface{})
+	if len(config) > 0 {
+		dryccfile["config"] = config
+	}
+	if len(pipeline) > 0 {
+		dryccfile["pipeline"] = pipeline
+	}
+	return dryccfile, nil
+}
+
+func CheckAPICompatibility(serverAPIVersion, clientAPIVersion string) error {
 	sVersion := strings.Split(serverAPIVersion, ".")
 	aVersion := strings.Split(clientAPIVersion, ".")
 

utils_test.go

@@ -1,6 +1,11 @@
 package drycc
 
-import "testing"
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"testing"
+)
 
 type versionComparison struct {
 	Client string
@@ -17,10 +22,135 @@ func TestCheckAPIVersions(t *testing.T) {
 	}
 
 	for _, check := range comparisons {
-		err := checkAPICompatibility(check.Client, check.Server)
+		err := CheckAPICompatibility(check.Client, check.Server)
 
 		if err != check.Error {
 			t.Errorf("%v: Expected %v, Got %v", check, check.Error, err)
 		}
 	}
 }
+
+func TestParseEnv(t *testing.T) {
+	expects := map[string]string{
+		"F1": "111",
+		"F2": "222",
+		"F3": "333",
+	}
+
+	f, err := os.CreateTemp("", "env")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(f.Name())
+	for key, value := range expects {
+		f.WriteString(fmt.Sprintf("%s=%s\n", key, value))
+	}
+	f.Seek(0, 0)
+
+	config, err := ParseEnv(f.Name())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(config) != 3 {
+		t.Errorf("Expected %d, Got %d", 3, len(config))
+	}
+	for key, value := range expects {
+		if v, ok := config[key]; !ok || config[key] != value {
+			t.Errorf("Expected %s, Got %s", v, value)
+		}
+	}
+}
+
+func TestParseDryccfile(t *testing.T) {
+	webPipeline := `
+kind: pipeline
+ptype: web
+build:
+  docker: Dockerfile
+  arg:
+    CODENAME: bookworm
+env:
+  VERSION: 1.2.1
+run:
+  command:
+  - ./deployment-tasks.sh
+  image: worker
+  timeout: 100
+config:
+- jvmconfig
+deploy:
+  command:
+  - bash
+  - -ec
+  args:
+  - bundle exec puma -C config/puma.rb
+`
+	taskPipeline := `
+kind: pipeline
+ptype: task
+build:
+  docker: Dockerfile
+  arg:
+    CODENAME: bookworm
+env:
+  VERSION: 1.2.1
+run:
+  command:
+  - ./deployment-tasks.sh
+  image: worker
+  timeout: 100
+config:
+- jvmconfig
+deploy:
+  command:
+  - bash
+  - -ec
+  args:
+  - bundle exec puma -C config/puma.rb
+`
+
+	tmp, err := os.MkdirTemp("", "drycc")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tmp)
+
+	configDir := filepath.Join(tmp, "config")
+	os.MkdirAll(configDir, 0777)
+	os.WriteFile(filepath.Join(tmp, "web.yml"), []byte(webPipeline), 0777)
+	os.WriteFile(filepath.Join(tmp, "task.yaml"), []byte(taskPipeline), 0777)
+	os.WriteFile(filepath.Join(configDir, "global"), []byte("DEBUG=true\n"), 0777)
+	os.WriteFile(filepath.Join(configDir, "web"), []byte("PORT=8000\nJVM_OPTIONS=-Xms16G\n"), 0777)
+
+	dryccfile, err := ParseDryccfile(tmp)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if config, ok := dryccfile["config"]; ok {
+		webConfig := config.(map[string]interface{})["web"].(map[string]interface{})
+		globalConfig := config.(map[string]interface{})["global"].(map[string]interface{})
+
+		if globalConfig["DEBUG"] != "true" {
+			t.Errorf("Expected %s, Got %s", "true", globalConfig["DEBUG"])
+		}
+		if webConfig["PORT"].(string) != "8000" {
+			t.Errorf("Expected %s, Got %s", "8000", webConfig["PORT"])
+		}
+		if webConfig["JVM_OPTIONS"].(string) != "-Xms16G" {
+			t.Errorf("Expected %s, Got %s", "-Xms16G", webConfig["JVM_OPTIONS"])
+		}
+	} else {
+		t.Error("Config not found")
+	}
+
+	if pipeline, ok := dryccfile["pipeline"]; ok {
+		if _, ok := pipeline.(map[string]interface{})["web.yml"]; !ok {
+			t.Error("web.yml not found")
+		}
+		if _, ok := pipeline.(map[string]interface{})["task.yaml"]; !ok {
+			t.Error("task.yaml not found")
+		}
+	} else {
+		t.Error("Pipeline not found")
+	}
+}