Resolves #404 - Add template support for attributes

elasticpath · Aug 11, 2024 · 340e039 · 340e039
1 parent 6e52542
commit 340e039
Show file tree

Hide file tree

Showing 14 changed files with 327 additions and 37 deletions.
diff --git a/cmd/create.go b/cmd/create.go
@@ -185,11 +185,12 @@ func NewCreateCommand(parentCmd *cobra.Command) func() {
 								})
 							} else { // This is an attribute value
 								return completion.Complete(completion.Request{
-									Type:       completion.CompleteAttributeValue,
-									Resource:   resource,
-									Verb:       completion.Create,
-									Attribute:  args[len(args)-1],
-									ToComplete: toComplete,
+									Type:           completion.CompleteAttributeValue,
+									Resource:       resource,
+									Verb:           completion.Create,
+									Attribute:      args[len(args)-1],
+									ToComplete:     toComplete,
+									AllowTemplates: true,
 								})
 							}
 						} else {

diff --git a/cmd/delete.go b/cmd/delete.go
@@ -161,11 +161,12 @@ func NewDeleteCommand(parentCmd *cobra.Command) func() {
 						})
 					} else { // This is an attribute value
 						return completion.Complete(completion.Request{
-							Type:       completion.CompleteAttributeValue,
-							Resource:   resource,
-							Verb:       completion.Delete,
-							Attribute:  args[len(args)-1],
-							ToComplete: toComplete,
+							Type:           completion.CompleteAttributeValue,
+							Resource:       resource,
+							Verb:           completion.Delete,
+							Attribute:      args[len(args)-1],
+							ToComplete:     toComplete,
+							AllowTemplates: true,
 						})
 					}
 				}

diff --git a/cmd/login.go b/cmd/login.go
@@ -428,11 +428,12 @@ var loginAccountManagement = &cobra.Command{
 				})
 			} else {
 				return completion.Complete(completion.Request{
-					Type:       completion.CompleteAttributeValue,
-					Verb:       completion.Create,
-					Resource:   res,
-					Attributes: usedAttributes,
-					ToComplete: toComplete,
+					Type:           completion.CompleteAttributeValue,
+					Verb:           completion.Create,
+					Resource:       res,
+					Attributes:     usedAttributes,
+					ToComplete:     toComplete,
+					AllowTemplates: true,
 				})
 			}
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -290,7 +290,6 @@ func Execute() {
 
 		os.Exit(1)
 	} else {
-
 		os.Exit(0)
 	}
 }

diff --git a/cmd/runbooks.go b/cmd/runbooks.go
@@ -421,11 +421,9 @@ func processRunbookVariablesOnCommand(runbookActionRunActionCommand *cobra.Comma
 			}
 		} else {
 			description := ""
-
 			if variable.Description != nil {
 				description = variable.Description.Short
 			}
-
 			runbookActionRunActionCommand.Flags().StringVar(runbookStringArguments[key], key, variable.Default, description)
 		}
 

diff --git a/cmd/update.go b/cmd/update.go
@@ -161,11 +161,12 @@ func NewUpdateCommand(parentCmd *cobra.Command) func() {
 						})
 					} else { // This is an attribute value
 						return completion.Complete(completion.Request{
-							Type:       completion.CompleteAttributeValue,
-							Resource:   resource,
-							Verb:       completion.Update,
-							Attribute:  args[len(args)-1],
-							ToComplete: toComplete,
+							Type:           completion.CompleteAttributeValue,
+							Resource:       resource,
+							Verb:           completion.Update,
+							Attribute:      args[len(args)-1],
+							ToComplete:     toComplete,
+							AllowTemplates: true,
 						})
 					}
 				} else {

diff --git a/docs/runbook-development.md b/docs/runbook-development.md
@@ -171,17 +171,17 @@ description:
   short: "A hello world runbook"
 actions:
   sequential-sleeps:
-  variables:
-    count:
-      type: INT
-      default: 2
-      description:
-        short: "The number of sleeps"
-  commands:
-    - |2
-      {{- range untilStep 0 .count 1}}
-        - sleep 1
-      {{- end -}}
+    variables:
+      count:
+        type: INT
+        default: 2
+        description:
+          short: "The number of sleeps"
+    commands:
+      - |2
+        {{- range untilStep 0 .count 1}}
+          - sleep 1
+        {{- end -}}
   concurrent-sleeps:
     variables:
       count:

diff --git a/external/completion/completion.go b/external/completion/completion.go
@@ -1,9 +1,11 @@
 package completion
 
 import (
+	"fmt"
 	"github.com/elasticpath/epcc-cli/external/aliases"
 	"github.com/elasticpath/epcc-cli/external/resources"
 	"github.com/spf13/cobra"
+	"os"
 	"regexp"
 	"strconv"
 	"strings"
@@ -48,8 +50,9 @@ type Request struct {
 	QueryParam string
 	Header     string
 	// The current string argument being completed
-	ToComplete string
-	NoAliases  bool
+	ToComplete     string
+	NoAliases      bool
+	AllowTemplates bool
 }
 
 func Complete(c Request) ([]string, cobra.ShellCompDirective) {
@@ -295,6 +298,79 @@ func Complete(c Request) ([]string, cobra.ShellCompDirective) {
 					results = append(results, supportedFileTypes...)
 				}
 			}
+
+			if c.AllowTemplates {
+				lastPipe := strings.LastIndex(c.ToComplete, "|")
+				prefix := ""
+				if lastPipe == -1 {
+					prefix = "{{ "
+				} else {
+					prefix = c.ToComplete[0:lastPipe+1] + " "
+				}
+
+				myResults := []string{}
+				myResults = append(myResults,
+					prefix+"date",
+					prefix+"now",
+					prefix+"randAlphaNum",
+					prefix+"randAlpha",
+					prefix+"randAscii",
+					prefix+"randNumeric",
+					prefix+"randAlphaNum",
+					prefix+"randAlpha",
+					prefix+"randAscii",
+					prefix+"randNumeric",
+					prefix+"pseudoRandAlphaNum",
+					prefix+"pseudoRandAlpha",
+					prefix+"pseudoRandNumeric",
+					prefix+"pseudoRandString",
+					prefix+"pseudoRandInt",
+					prefix+"uuidv4",
+					prefix+"duration",
+				)
+
+				if prefix != "{{ " {
+					// Functions that make sense as continuations
+					myResults = append(myResults,
+						prefix+"trim",
+						prefix+"trimAll",
+						prefix+"trimSuffix",
+						prefix+"trimPrefix",
+						prefix+"upper",
+						prefix+"lower",
+						prefix+"title",
+						prefix+"repeat",
+						prefix+"substr",
+						prefix+"nospace",
+						prefix+"trunc",
+						prefix+"abbrev",
+						prefix+"initials",
+						prefix+"wrap",
+						prefix+"cat",
+						prefix+"replace",
+						prefix+"snakecase",
+						prefix+"camelcase",
+						prefix+"kebabcase",
+						prefix+"swapcase",
+						prefix+"shufflecase",
+					)
+				}
+
+				re := regexp.MustCompile(`env\s+[A-Za-z]*\s*$`)
+				if re.MatchString(c.ToComplete) {
+					for _, v := range os.Environ() {
+						myResults = append(myResults,
+							fmt.Sprintf("%venv \"%v\"", prefix, strings.Split(v, "=")[0]),
+						)
+					}
+				} else {
+					myResults = append(myResults, prefix+"env")
+				}
+				//myResults = append(myResults, strings.TrimSuffix(c.ToComplete, " ")+" }}", strings.TrimSuffix(c.ToComplete, " ")+" |")
+				for _, r := range myResults {
+					results = append(results, r+" |", r+" }}")
+				}
+			}
 		}
 	}
 

diff --git a/external/completion/completion_test.go b/external/completion/completion_test.go
@@ -1,6 +1,7 @@
 package completion
 
 import (
+	"github.com/elasticpath/epcc-cli/external/resources"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
 	"testing"
@@ -72,3 +73,73 @@ func TestHeaderValueWithNonNilValueCompletes(t *testing.T) {
 	require.Equal(t, compDir, cobra.ShellCompDirectiveNoFileComp)
 	require.Contains(t, completions, "USD")
 }
+
+func TestAttributeValueWithNoTemplating(t *testing.T) {
+	// Fixture Setup
+	toComplete := ""
+	acct := resources.MustGetResourceByName("password-profiles")
+	request := Request{
+		Type:       CompleteAttributeValue,
+		Verb:       Create,
+		ToComplete: toComplete,
+		Attribute:  "username_format",
+		Resource:   acct,
+	}
+
+	// Exercise SUT
+	completions, compDir := Complete(request)
+
+	// Verify Results
+	require.Equal(t, compDir, cobra.ShellCompDirectiveNoFileComp)
+	require.Contains(t, completions, "any")
+	require.Contains(t, completions, "email")
+	require.Equal(t, 2, len(completions))
+}
+
+func TestAttributeValueWithTemplating(t *testing.T) {
+	// Fixture Setup
+	toComplete := ""
+	acct := resources.MustGetResourceByName("password-profiles")
+	request := Request{
+		Type:           CompleteAttributeValue,
+		Verb:           Create,
+		ToComplete:     toComplete,
+		Attribute:      "username_format",
+		Resource:       acct,
+		AllowTemplates: true,
+	}
+
+	// Exercise SUT
+	completions, compDir := Complete(request)
+
+	// Verify Results
+	require.Equal(t, compDir, cobra.ShellCompDirectiveNoFileComp)
+	require.Contains(t, completions, "any")
+	require.Contains(t, completions, "email")
+	require.Contains(t, completions, `{{\ randAlphaNum\ |`)
+	require.Contains(t, completions, `{{\ randAlphaNum\ }}`)
+}
+
+func TestAttributeValueWithTemplatingAndPipe(t *testing.T) {
+	// Fixture Setup
+	toComplete := "{{ randAlphaNum 3 | "
+	acct := resources.MustGetResourceByName("password-profiles")
+	request := Request{
+		Type:           CompleteAttributeValue,
+		Verb:           Create,
+		ToComplete:     toComplete,
+		Attribute:      "username_format",
+		Resource:       acct,
+		AllowTemplates: true,
+	}
+
+	// Exercise SUT
+	completions, compDir := Complete(request)
+
+	// Verify Results
+	require.Equal(t, compDir, cobra.ShellCompDirectiveNoFileComp)
+	require.Contains(t, completions, "any")
+	require.Contains(t, completions, "email")
+	require.Contains(t, completions, `{{\ randAlphaNum\ 3\ |\ upper\ |`)
+	require.Contains(t, completions, `{{\ randAlphaNum\ 3\ |\ lower\ }}`)
+}
diff --git a/external/json/to_json.go b/external/json/to_json.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/elasticpath/epcc-cli/external/aliases"
 	"github.com/elasticpath/epcc-cli/external/resources"
+	"github.com/elasticpath/epcc-cli/external/templates"
 	"github.com/itchyny/gojq"
 	log "github.com/sirupsen/logrus"
 	"regexp"
@@ -53,6 +54,9 @@ func toJsonObject(args []string, noWrapping bool, compliant bool, attributes map
 		key := args[i]
 		val := args[i+1]
 
+		// Try and process the argument as a helm template
+		val = templates.Render(val)
+
 		jsonKey := key
 		switch {
 		case key == "type" || key == "id":
@@ -265,6 +269,10 @@ func formatValue(v string) string {
 	} else if match, _ := regexp.MatchString("^\\[\\]$", v); match {
 		return v
 	} else {
+		v = strings.ReplaceAll(v, "\\", "\\\\")
+		v = strings.ReplaceAll(v, "\n", "\\n")
+		v = strings.ReplaceAll(v, `"`, `\"`)
+
 		return fmt.Sprintf("\"%s\"", v)
 	}
 }
diff --git a/external/json/to_json_test.go b/external/json/to_json_test.go
@@ -54,6 +54,51 @@ func TestToJsonLegacyFormatSimpleKeyStringValue(t *testing.T) {
 	}
 }
 
+func TestToJsonLegacyFormatSimpleKeyStringValueWithQuotes(t *testing.T) {
+	// Fixture Setup
+	input := []string{"key", "val\"ue"}
+	expected := `{"data":{"key":"val\"ue"}}`
+
+	// Execute SUT
+	actual, err := ToJson(input, false, false, map[string]*resources.CrudEntityAttribute{}, true)
+
+	// Verification
+	require.NoError(t, err)
+	if actual != expected {
+		t.Fatalf("Testing json conversion of empty value %s did not match expected %s, actually: %s", input, expected, actual)
+	}
+}
+
+func TestToJsonLegacyFormatSimpleKeyStringValueWithNewLines(t *testing.T) {
+	// Fixture Setup
+	input := []string{"key", "val\nue"}
+	expected := `{"data":{"key":"val\nue"}}`
+
+	// Execute SUT
+	actual, err := ToJson(input, false, false, map[string]*resources.CrudEntityAttribute{}, true)
+
+	// Verification
+	require.NoError(t, err)
+	if actual != expected {
+		t.Fatalf("Testing json conversion of empty value %s did not match expected %s, actually: %s", input, expected, actual)
+	}
+}
+
+func TestToJsonLegacyFormatSimpleKeyStringValueWithBackslashes(t *testing.T) {
+	// Fixture Setup
+	input := []string{"key", "val\\nue"}
+	expected := `{"data":{"key":"val\\nue"}}`
+
+	// Execute SUT
+	actual, err := ToJson(input, false, false, map[string]*resources.CrudEntityAttribute{}, true)
+
+	// Verification
+	require.NoError(t, err)
+	if actual != expected {
+		t.Fatalf("Testing json conversion of empty value %s did not match expected %s, actually: %s", input, expected, actual)
+	}
+}
+
 func TestToJsonLegacyFormatSimpleNestedKeyValue(t *testing.T) {
 	// Fixture Setup
 	input := []string{"foo.bar", "val"}
-Original file line number
+Diff line change
@@ Expand Up / @@ -290,7 +290,6 @@ func Execute() { @@
     		os.Exit(1)
     	} else {
     		os.Exit(0)
     	}
     }
@@ Expand Down @@