From c7aca42f1f88cd3f2a7144071b194a2e0071d8a5 Mon Sep 17 00:00:00 2001 From: Simone Gotti Date: Fri, 5 Jul 2019 18:34:40 +0200 Subject: [PATCH] variable create: read values from yaml file/stdin --- cmd/agola/cmd/projectgroupsecretcreate.go | 13 +++- cmd/agola/cmd/projectgroupvariablecreate.go | 28 +++++++- cmd/agola/cmd/projectvariablecreate.go | 73 ++++++++++++++++++--- 3 files changed, 98 insertions(+), 16 deletions(-) diff --git a/cmd/agola/cmd/projectgroupsecretcreate.go b/cmd/agola/cmd/projectgroupsecretcreate.go index 973099a..983a59b 100644 --- a/cmd/agola/cmd/projectgroupsecretcreate.go +++ b/cmd/agola/cmd/projectgroupsecretcreate.go @@ -20,7 +20,14 @@ import ( var cmdProjectGroupSecretCreate = &cobra.Command{ Use: "create", - Short: "create a project group secret", + Short: "create a project local secret", + Long: `create a project local secret + +The secret data should be provided by a yaml document. Examples: + +data01: secretvalue01 +data02: secretvalue02 +`, Run: func(cmd *cobra.Command, args []string) { if err := secretCreate(cmd, "projectgroup", args); err != nil { log.Fatalf("err: %v", err) @@ -33,7 +40,7 @@ func init() { flags.StringVar(&secretCreateOpts.parentRef, "projectgroup", "", "project group id or full path") flags.StringVarP(&secretCreateOpts.name, "name", "n", "", "secret name") - flags.StringVar(&secretCreateOpts.data, "data", "", "json map of secret data") + flags.StringVarP(&secretCreateOpts.file, "file", "f", "", `yaml file containing the secret data (use "-" to read from stdin`) if err := cmdProjectGroupSecretCreate.MarkFlagRequired("projectgroup"); err != nil { log.Fatal(err) @@ -41,7 +48,7 @@ func init() { if err := cmdProjectGroupSecretCreate.MarkFlagRequired("name"); err != nil { log.Fatal(err) } - if err := cmdProjectGroupSecretCreate.MarkFlagRequired("data"); err != nil { + if err := cmdProjectGroupSecretCreate.MarkFlagRequired("file"); err != nil { log.Fatal(err) } diff --git a/cmd/agola/cmd/projectgroupvariablecreate.go b/cmd/agola/cmd/projectgroupvariablecreate.go index d403f4b..d8c2a34 100644 --- a/cmd/agola/cmd/projectgroupvariablecreate.go +++ b/cmd/agola/cmd/projectgroupvariablecreate.go @@ -20,7 +20,29 @@ import ( var cmdProjectGroupVariableCreate = &cobra.Command{ Use: "create", - Short: "create a project variable", + Short: "create a project group variable", + Long: `create a project group variable + +The variable values should be provided by a yaml document. Examples: + +- secret_name: secret01 + secret_var: var01 + when: + branch: master + tag: + - v1.x + - v2.x +- secret_name: secret02 + secret_var: data02 + when: + ref: + include: + - '#/refs/pull/.*#' + - '#/refs/heads/devel.*#' + exclude: /refs/heads/develop + +The above yaml document defines a variable that can have two different values depending on the first matching condition. + `, Run: func(cmd *cobra.Command, args []string) { if err := variableCreate(cmd, "projectgroup", args); err != nil { log.Fatalf("err: %v", err) @@ -33,7 +55,7 @@ func init() { flags.StringVar(&variableCreateOpts.parentRef, "projectgroup", "", "project group id or full path") flags.StringVarP(&variableCreateOpts.name, "name", "n", "", "variable name") - flags.StringVar(&variableCreateOpts.values, "values", "", "json list of values and conditions") + flags.StringVarP(&variableCreateOpts.file, "file", "f", "", `yaml file containing the variable definition (use "-" to read from stdin`) if err := cmdProjectGroupVariableCreate.MarkFlagRequired("projectgroup"); err != nil { log.Fatal(err) @@ -41,7 +63,7 @@ func init() { if err := cmdProjectGroupVariableCreate.MarkFlagRequired("name"); err != nil { log.Fatal(err) } - if err := cmdProjectGroupVariableCreate.MarkFlagRequired("values"); err != nil { + if err := cmdProjectGroupVariableCreate.MarkFlagRequired("file"); err != nil { log.Fatal(err) } diff --git a/cmd/agola/cmd/projectvariablecreate.go b/cmd/agola/cmd/projectvariablecreate.go index 515a142..174b931 100644 --- a/cmd/agola/cmd/projectvariablecreate.go +++ b/cmd/agola/cmd/projectvariablecreate.go @@ -16,18 +16,41 @@ package cmd import ( "context" - "encoding/json" + "io/ioutil" + "os" + "agola.io/agola/internal/config" "agola.io/agola/internal/services/gateway/api" "agola.io/agola/internal/services/types" + "github.com/ghodss/yaml" "github.com/spf13/cobra" errors "golang.org/x/xerrors" ) var cmdProjectVariableCreate = &cobra.Command{ - Use: "create", - Short: "create a project variable", + Use: "create", + Short: `create a project variable +The variable values should be provided by a yaml document. Examples: + +- secret_name: secret01 + secret_var: var01 + when: + branch: master + tag: + - v1.x + - v2.x +- secret_name: secret02 + secret_var: data02 + when: + ref: + include: + - '#/refs/pull/.*#' + - '#/refs/heads/devel.*#' + exclude: /refs/heads/develop + +The above yaml document defines a variable that can have two different values depending on the first matching condition. + `, Run: func(cmd *cobra.Command, args []string) { if err := variableCreate(cmd, "project", args); err != nil { log.Fatalf("err: %v", err) @@ -38,7 +61,7 @@ var cmdProjectVariableCreate = &cobra.Command{ type variableCreateOptions struct { parentRef string name string - values string + file string } var variableCreateOpts variableCreateOptions @@ -48,7 +71,7 @@ func init() { flags.StringVar(&variableCreateOpts.parentRef, "project", "", "project id or full path") flags.StringVarP(&variableCreateOpts.name, "name", "n", "", "variable name") - flags.StringVar(&variableCreateOpts.values, "values", "", "json list of values and conditions") + flags.StringVarP(&variableCreateOpts.file, "file", "f", "", `yaml file containing the variable definition (use "-" to read from stdin`) if err := cmdProjectVariableCreate.MarkFlagRequired("project"); err != nil { log.Fatal(err) @@ -56,23 +79,53 @@ func init() { if err := cmdProjectVariableCreate.MarkFlagRequired("name"); err != nil { log.Fatal(err) } - if err := cmdProjectVariableCreate.MarkFlagRequired("values"); err != nil { + if err := cmdProjectVariableCreate.MarkFlagRequired("file"); err != nil { log.Fatal(err) } cmdProjectVariable.AddCommand(cmdProjectVariableCreate) } +type VariableValue struct { + SecretName string `json:"secret_name,omitempty"` + SecretVar string `json:"secret_var,omitempty"` + + When *config.When `json:"when,omitempty"` +} + func variableCreate(cmd *cobra.Command, ownertype string, args []string) error { gwclient := api.NewClient(gatewayURL, token) - var values []types.VariableValue - if err := json.Unmarshal([]byte(variableCreateOpts.values), &values); err != nil { - log.Fatalf("failed to unmarshall values: %v", err) + // "github.com/ghodss/yaml" doesn't provide a streaming decoder + var data []byte + var err error + if variableCreateOpts.file == "-" { + data, err = ioutil.ReadAll(os.Stdin) + if err != nil { + return err + } + } else { + data, err = ioutil.ReadFile(variableCreateOpts.file) + if err != nil { + return err + } + } + + var values []VariableValue + if err := yaml.Unmarshal(data, &values); err != nil { + log.Fatalf("failed to unmarshal values: %v", err) + } + rvalues := []types.VariableValue{} + for _, value := range values { + rvalues = append(rvalues, types.VariableValue{ + SecretName: value.SecretName, + SecretVar: value.SecretVar, + When: (*types.When)(value.When), + }) } req := &api.CreateVariableRequest{ Name: variableCreateOpts.name, - Values: values, + Values: rvalues, } switch ownertype {