Merge pull request #50 from FlowCI/develop

Develop

Author: gy2006

api/client.go

@@ -53,6 +53,7 @@ type (
 		CacheDownload(cacheId, workspace, file string, progress io.Writer)
 
 		GetSecret(name string) (domain.Secret, error)
+		GetConfig(name string) (domain.Config, error)
 
 		Close()
 	}
@@ -270,11 +271,9 @@ func (c *client) CacheDownload(cacheId, workspace, file string, progress io.Writ
 }
 
 func (c *client) GetSecret(name string) (secret domain.Secret, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			err = r.(error)
-		}
-	}()
+	defer util.RecoverPanic(func(e error) {
+		err = e
+	})
 
 	req, _ := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/secret/%s", c.server, name), nil)
 	req.Header.Set(util.HttpHeaderAgentToken, c.token)
@@ -294,7 +293,7 @@ func (c *client) GetSecret(name string) (secret domain.Secret, err error) {
 	util.PanicIfNil(body.Data, "secret data")
 
 	base := body.Data
-	baseRaw := &domain.SecretResponseRaw{}
+	baseRaw := &domain.ResponseRaw{}
 	err = json.Unmarshal(out, baseRaw)
 	util.PanicIfErr(err)
 
@@ -322,6 +321,50 @@ func (c *client) GetSecret(name string) (secret domain.Secret, err error) {
 	return nil, fmt.Errorf("secret '%s' category '%s' is unsupported", base.GetName(), base.GetCategory())
 }
 
+func (c *client) GetConfig(name string) (config domain.Config, err error) {
+	defer util.RecoverPanic(func(e error) {
+		err = e
+	})
+
+	req, _ := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/config/%s", c.server, name), nil)
+	req.Header.Set(util.HttpHeaderAgentToken, c.token)
+
+	resp, err := c.client.Do(req)
+	util.PanicIfErr(err)
+
+	defer resp.Body.Close()
+
+	out, err := ioutil.ReadAll(resp.Body)
+	util.PanicIfErr(err)
+
+	configResp, err := c.parseResponse(out, &domain.ConfigResponse{})
+	util.PanicIfErr(err)
+
+	body := configResp.(*domain.ConfigResponse)
+	util.PanicIfNil(body.Data, "config data")
+
+	base := body.Data
+	baseRaw := &domain.ResponseRaw{}
+	err = json.Unmarshal(out, baseRaw)
+	util.PanicIfErr(err)
+
+	if base.Category == domain.ConfigCategorySmtp {
+		auth := &domain.SmtpConfig{}
+		err = json.Unmarshal(baseRaw.Raw, auth)
+		util.PanicIfErr(err)
+		return auth, nil
+	}
+
+	if base.Category == domain.ConfigCategoryText {
+		rsa := &domain.TextConfig{}
+		err = json.Unmarshal(baseRaw.Raw, rsa)
+		util.PanicIfErr(err)
+		return rsa, nil
+	}
+
+	return nil, fmt.Errorf("config '%s' category '%s' is unsupported", base.GetName(), base.GetCategory())
+}
+
 func (c *client) Close() {
 	if c.conn != nil {
 		close(c.pending)

app.go

@@ -15,7 +15,7 @@ import (
 	"github/flowci/flow-agent-x/util"
 )
 
-const version = "0.21.21"
+const version = "1.21.33"
 
 func init() {
 	util.LogInit()

domain/cmd_shell.go

@@ -26,7 +26,8 @@ type (
 		Timeout      int             `json:"timeout"`
 		Inputs       Variables       `json:"inputs"`
 		EnvFilters   []string        `json:"envFilters"`
-		Secrets      []string        `json:"secrets"`
+		Secrets      []string        `json:"secrets"` // secret name list
+		Configs      []string        `json:"configs"` // config name list
 	}
 
 	ShellOut struct {
@@ -57,6 +58,10 @@ func (in *ShellIn) HasSecrets() bool {
 	return in.Secrets != nil && len(in.Secrets) > 0
 }
 
+func (in *ShellIn) HasConfigs() bool {
+	return in.Configs != nil && len(in.Configs) > 0
+}
+
 func (in *ShellIn) HasCache() bool {
 	return in.Cache != nil
 }

domain/config.go

@@ -0,0 +1,37 @@
+package domain
+
+const (
+	ConfigCategorySmtp = "SMTP"
+	ConfigCategoryText = "TEXT"
+)
+
+type (
+	Config interface {
+		GetName() string
+		GetCategory() string
+		ToEnvs() map[string]string
+		ConfigMarker()
+	}
+
+	ConfigBase struct {
+		Name     string
+		Category string
+	}
+
+	ConfigResponse struct {
+		Response
+		Data *ConfigBase `json:"data"`
+	}
+)
+
+func (c *ConfigBase) GetName() string {
+	return c.Name
+}
+
+func (c *ConfigBase) GetCategory() string {
+	return c.Category
+}
+
+func (c *ConfigBase) ConfigMarker() {
+	// placeholder
+}

domain/config_smtp.go

@@ -0,0 +1,19 @@
+package domain
+
+type SmtpConfig struct {
+	ConfigBase
+	Server     string
+	Port       int
+	SecureType string
+	Auth       *SimpleAuthPair
+}
+
+func (c *SmtpConfig) ToEnvs() map[string]string {
+	return map[string]string{
+		c.GetName() + "_SERVER":        c.Server,
+		c.GetName() + "_PORT":          string(rune(c.Port)),
+		c.GetName() + "_SECURE_TYPE":   c.SecureType,
+		c.GetName() + "_AUTH_USERNAME": c.Auth.Username,
+		c.GetName() + "_AUTH_PASSWORD": c.Auth.Password,
+	}
+}

domain/config_text.go

@@ -0,0 +1,12 @@
+package domain
+
+type TextConfig struct {
+	ConfigBase
+	Text string
+}
+
+func (c *TextConfig) ToEnvs() map[string]string {
+	return map[string]string{
+		c.GetName(): c.Text,
+	}
+}

domain/response.go

@@ -1,5 +1,7 @@
 package domain
 
+import "encoding/json"
+
 const (
 	ok = 200
 )
@@ -15,6 +17,10 @@ type (
 		Code    int
 		Message string
 	}
+
+	ResponseRaw struct {
+		Raw json.RawMessage `json:"data"`
+	}
 )
 
 func (r *Response) IsOk() bool {

domain/secret.go

@@ -1,7 +1,5 @@
 package domain
 
-import "encoding/json"
-
 const (
 	SecretCategoryAuth        = "AUTH"
 	SecretCategorySshRsa      = "SSH_RSA"
@@ -15,6 +13,7 @@ type (
 		GetName() string
 		GetCategory() string
 		ToEnvs() map[string]string
+		SecretMarker()
 	}
 
 	SecretBase struct {
@@ -28,11 +27,7 @@ type (
 
 	SecretResponse struct {
 		Response
-		Data *SecretBase     `json:"data"`
-	}
-
-	SecretResponseRaw struct {
-		Raw json.RawMessage     `json:"data"`
+		Data *SecretBase `json:"data"`
 	}
 )
 
@@ -43,3 +38,7 @@ func (s *SecretBase) GetName() string {
 func (s *SecretBase) GetCategory() string {
 	return s.Category
 }
+
+func (s *SecretBase) SecretMarker() {
+	// placeholder
+}

domain/secret_rsa.go

@@ -16,6 +16,5 @@ type (
 func (s *RSASecret) ToEnvs() map[string]string {
 	return map[string]string{
 		s.GetName() + "_PUBLIC_KEY":  s.Pair.PublicKey,
-		s.GetName() + "_PRIVATE_KEY": s.Pair.PrivateKey,
 	}
 }

executor/docker.go

@@ -402,6 +402,23 @@ func (d *dockerExecutor) handleErrors(err error) error {
 	return err
 }
 
+func (d *dockerExecutor) findImageLocally(image string) (bool, error) {
+	list, err := d.cli.ImageList(d.context, types.ImageListOptions{All: true})
+	if err != nil {
+		return false, err
+	}
+
+	for _, imageInfo := range list {
+		for _, t := range imageInfo.RepoTags {
+			if t == image {
+				return true, nil
+			}
+		}
+	}
+
+	return false, nil
+}
+
 func (d *dockerExecutor) pullImage() {
 	for _, c := range d.configs {
 		err := d.pullImageWithName(c.Config.Image, c.Auth)
@@ -410,10 +427,19 @@ func (d *dockerExecutor) pullImage() {
 }
 
 func (d *dockerExecutor) pullImageWithName(image string, auth *domain.SimpleAuthPair) (out error) {
+	if isOnLocal, err := d.findImageLocally(image); isOnLocal {
+		out = err
+		return
+	}
+
+	if util.HasError(out) {
+		return
+	}
+
 	fullRef := image
 
 	if isDockerHubImage(image) {
-		fullRef = "docker.io/library/" + image
+		fullRef = image
 		if strings.Contains(image, "/") {
 			fullRef = "docker.io/" + image
 		}