secret create: read values from yaml file/stdin

This commit is contained in:
Simone Gotti 2019-07-08 09:58:11 +02:00
parent 95f0df8576
commit 6508fd2b53
2 changed files with 37 additions and 11 deletions

View File

@ -16,18 +16,27 @@ package cmd
import ( import (
"context" "context"
"encoding/json" "io/ioutil"
"os"
"agola.io/agola/internal/services/gateway/api" "agola.io/agola/internal/services/gateway/api"
"agola.io/agola/internal/services/types" "agola.io/agola/internal/services/types"
"github.com/ghodss/yaml"
"github.com/spf13/cobra" "github.com/spf13/cobra"
errors "golang.org/x/xerrors" errors "golang.org/x/xerrors"
) )
var cmdProjectSecretCreate = &cobra.Command{ var cmdProjectSecretCreate = &cobra.Command{
Use: "create", Use: "create",
Short: "create a project 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) { Run: func(cmd *cobra.Command, args []string) {
if err := secretCreate(cmd, "project", args); err != nil { if err := secretCreate(cmd, "project", args); err != nil {
log.Fatalf("err: %v", err) log.Fatalf("err: %v", err)
@ -38,7 +47,7 @@ var cmdProjectSecretCreate = &cobra.Command{
type secretCreateOptions struct { type secretCreateOptions struct {
parentRef string parentRef string
name string name string
data string file string
} }
var secretCreateOpts secretCreateOptions var secretCreateOpts secretCreateOptions
@ -48,7 +57,7 @@ func init() {
flags.StringVar(&secretCreateOpts.parentRef, "project", "", "project id or full path") flags.StringVar(&secretCreateOpts.parentRef, "project", "", "project id or full path")
flags.StringVarP(&secretCreateOpts.name, "name", "n", "", "secret name") 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 := cmdProjectSecretCreate.MarkFlagRequired("project"); err != nil { if err := cmdProjectSecretCreate.MarkFlagRequired("project"); err != nil {
log.Fatal(err) log.Fatal(err)
@ -56,7 +65,7 @@ func init() {
if err := cmdProjectSecretCreate.MarkFlagRequired("name"); err != nil { if err := cmdProjectSecretCreate.MarkFlagRequired("name"); err != nil {
log.Fatal(err) log.Fatal(err)
} }
if err := cmdProjectSecretCreate.MarkFlagRequired("data"); err != nil { if err := cmdProjectSecretCreate.MarkFlagRequired("file"); err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -66,14 +75,29 @@ func init() {
func secretCreate(cmd *cobra.Command, ownertype string, args []string) error { func secretCreate(cmd *cobra.Command, ownertype string, args []string) error {
gwclient := api.NewClient(gatewayURL, token) gwclient := api.NewClient(gatewayURL, token)
var data map[string]string // "github.com/ghodss/yaml" doesn't provide a streaming decoder
if err := json.Unmarshal([]byte(secretCreateOpts.data), &data); err != nil { var data []byte
log.Fatalf("failed to unmarshall values: %v", err) var err error
if secretCreateOpts.file == "-" {
data, err = ioutil.ReadAll(os.Stdin)
if err != nil {
return err
}
} else {
data, err = ioutil.ReadFile(secretCreateOpts.file)
if err != nil {
return err
}
}
var secretData map[string]string
if err := yaml.Unmarshal(data, &secretData); err != nil {
log.Fatalf("failed to unmarshal secret: %v", err)
} }
req := &api.CreateSecretRequest{ req := &api.CreateSecretRequest{
Name: secretCreateOpts.name, Name: secretCreateOpts.name,
Type: types.SecretTypeInternal, Type: types.SecretTypeInternal,
Data: data, Data: secretData,
} }
switch ownertype { switch ownertype {

View File

@ -30,7 +30,9 @@ import (
var cmdProjectVariableCreate = &cobra.Command{ var cmdProjectVariableCreate = &cobra.Command{
Use: "create", 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: The variable values should be provided by a yaml document. Examples:
- secret_name: secret01 - secret_name: secret01