playbook supports string list (#539)

Signed-off-by: YujiOshima <[email protected]>

Author: YujiOshima

docs/playbooks/intro/aws/provision-group.yml

@@ -7,7 +7,7 @@
 {{ $image := flag "image-id" "string" "Image ID" | prompt "Image to boot?" "string" "ami-4926fd29" }}
 {{ $instanceType := flag "instance-type" "string" "Instance type" | prompt "Instance type?" "string" "t2.micro"}}
 {{ $sshKey := flag "ssh-key" "string" "SSH key name" | prompt "SSH key?" "string" "" }}
-{{ $SecurityGroupId := flag "security-group-id" "string" "Security group ID" | prompt "Names of security group ID?" "string" "" }}
+{{ $SecurityGroupId := listflag "security-group-id" "string" "Security group ID ( Comma-separated )" | listprompt "Names of security group ID ( Comma-separated )?" "string" "" }}
 {{ $project := var "/project" | flag "project" "string" "Project name" | prompt "Project?" "string" "myproject" }}
 
 - Plugin: group
@@ -36,6 +36,8 @@
             InstanceType: {{ $instanceType }}
             KeyName: {{ $sshKey }}
             SecurityGroupIds:
-              - {{ $SecurityGroupId }}
+              {{range $SecurityGroupId}}
+              - {{ . }}
+              {{end}}
           Tags:
               Name: {{ $groupName }}

pkg/cli/context.go

@@ -251,6 +251,30 @@ func (c *Context) Funcs() []template.Function {
 				return c.defineFlag(n, ftype, desc, defaultValue)
 			},
 		},
+		{
+			Name: "listflag",
+			Func: func(n, ftype, desc string, optional ...interface{}) ([]string, error) {
+				if ftype == "" {
+					return nil, fmt.Errorf("missing type for variable %v", n)
+				}
+				if ftype != "string" {
+					return nil, fmt.Errorf("list flag only support string %v", n)
+				}
+				var defaultValue interface{}
+				if len(optional) > 0 {
+					defaultValue = optional[0]
+				}
+				if c.exec {
+					d, err := c.cmd.Flags().GetString(n)
+					return strings.Split(d, ","), err
+				}
+
+				// Defining a flag never returns a printable value that can mess up the template rendering
+				d, err := c.defineFlag(n, ftype, desc, defaultValue)
+				dl := strings.Split(d.(string), ",")
+				return dl, err
+			},
+		},
 		{
 			Name: "fetch",
 			Func: func(p string, opt ...interface{}) (string, error) {
@@ -358,6 +382,47 @@ func (c *Context) Funcs() []template.Function {
 				return Prompt(c.input, prompt, ftype, optional...)
 			},
 		},
+		{
+			Name: "listprompt",
+			Func: func(prompt, ftype string, optional ...interface{}) ([]string, error) {
+
+				if ftype == "" {
+					return nil, fmt.Errorf("missing type for variable prompted")
+				}
+				if ftype == "" {
+					return nil, fmt.Errorf("listprompt only support string")
+				}
+				var pl []string
+				if !c.exec {
+					return pl, nil
+				}
+
+				if len(optional) > 0 {
+					end := optional[len(optional)-1]
+					if cond, is := end.(func() (bool, interface{})); is {
+						ok, last := cond()
+						if !ok {
+							return pl, nil
+						}
+						// if the condition evaluates to true, then we'd continue
+						// so the trailing arg must look like the cond was not
+						// inserted before this -- hence using the value from
+						// stage before the cond as the end
+						end = last
+					}
+
+					// The last value in the optional var args is the value from the previous
+					// pipeline.
+					if len(end.([]string)) > 1 {
+						return end.([]string), nil
+					}
+
+				}
+				p, err := Prompt(c.input, prompt, ftype, optional...)
+				pl = strings.Split(p.(string), ",")
+				return pl, err
+			},
+		},
 	}
 }
 

pkg/cli/context_test.go

@@ -33,6 +33,7 @@ func TestContext(t *testing.T) {
 {{ $clusterName := flag "cluster-name" "string" "the name of the cluster" "swarm" }}
 {{ $clusterSize := flag "size" "int" "the size of the cluster" 20 }}
 {{ $floatValue := flag "param" "float" "some float param" 25.5 }}
+{{ $listValue := listflag "tags" "string" "some string tags (Comma-separated)" "test" }}
 
 {{ $user := prompt "Please enter your user name" "string" }}
 
@@ -46,7 +47,8 @@ func TestContext(t *testing.T) {
   "username" : "{{$user}}",
   "doCommit" : {{$doCommit}},
   "instanceType" : "{{$instanceType}}",
-  "param" : {{$floatValue}}
+  "param" : {{$floatValue}},
+  "tags" : "{{$listValue}}"
 }
 `
 
@@ -67,7 +69,7 @@ func TestContext(t *testing.T) {
 		require.NotNil(t, c.cmd.Flag(n))
 	}
 
-	err = c.cmd.Flags().Parse(strings.Split("--param 75.0 --cluster-name swarm1 --commit true --size 20 --instance-type large", " "))
+	err = c.cmd.Flags().Parse(strings.Split("--param 75.0 --cluster-name swarm1 --tags dev,infrakit --commit true --size 20 --instance-type large", " "))
 	require.NoError(t, err)
 
 	err = c.Execute()
@@ -85,6 +87,7 @@ func TestContext(t *testing.T) {
 		"username":     "username",
 		"doCommit":     true,
 		"instanceType": "large",
+		"tags":         "[dev infrakit]",
 	}).String(), types.AnyValueMust(m).String())
 }