Merge branch 'master' of github.com:seatgeek/hashi-helper

seatgeek · Sep 9, 2019 · 34684bd · 34684bd
2 parents dc4368f + 8eb9087
commit 34684bd
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/config/vault_mount.go b/config/vault_mount.go
@@ -86,7 +86,7 @@ func (c *Config) parseVaultMountStanza(list *ast.ObjectList, environment *Enviro
 	for _, mountAST := range list.Items {
 		x := mountAST.Val.(*ast.ObjectType).List
 
-		valid := []string{"config", "role", "type", "path", "max_lease_ttl", "default_lease_ttl", "force_no_cache"}
+		valid := []string{"config", "role", "type", "path", "max_lease_ttl", "default_lease_ttl", "force_no_cache", "description"}
 		if err := c.checkHCLKeys(x, valid); err != nil {
 			return err
 		}
@@ -148,6 +148,19 @@ func (c *Config) parseVaultMountStanza(list *ast.ObjectList, environment *Enviro
 			} else if len(forceNoCacheAST.Items) > 1 {
 				return fmt.Errorf("You can only specify force_no_cache once per mount in %s -> %s", environment.Name, mountName)
 			}
+			description := ""
+			descriptionAST := x.Filter("description")
+			if len(descriptionAST.Items) == 1 {
+				v := descriptionAST.Items[0].Val.(*ast.LiteralType).Token.Value()
+				switch t := v.(type) {
+				default:
+					return fmt.Errorf("unexpected type %T for %s -> %s -> description", environment.Name, mountName, t)
+				case string:
+					description = v.(string)
+				}
+			} else if len(descriptionAST.Items) > 1 {
+				return fmt.Errorf("You can only specify description once per mount in %s -> %s", environment.Name, mountName)
+			}
 
 			mount = &Mount{
 				Name:            mountName,
@@ -156,6 +169,7 @@ func (c *Config) parseVaultMountStanza(list *ast.ObjectList, environment *Enviro
 				MaxLeaseTTL:     mountMaxLeaseTTL,
 				DefaultLeaseTTL: mountDefaultLeaseTTL,
 				ForceNoCache:    mountForceNoCache,
+				Description:     description,
 			}
 		}
 
@@ -194,7 +208,7 @@ func (c *Config) parseMountConfig(list *ast.ObjectList) ([]*MountConfig, error)
 
 	for _, mountConfigAST := range list.Items {
 		if len(mountConfigAST.Keys) < 1 {
-			return nil, fmt.Errorf("Missing mount role name in line %+v", mountConfigAST.Keys[0].Pos())
+			return nil, fmt.Errorf("Missing mount role name in mount config stanza")
 		}
 
 		var m map[string]interface{}
@@ -218,7 +232,7 @@ func (c *Config) parseMountConfig(list *ast.ObjectList) ([]*MountConfig, error)
 func (c *Config) parseMountRole(list *ast.ObjectList, mount *Mount) error {
 	for _, config := range list.Items {
 		if len(config.Keys) < 1 {
-			return fmt.Errorf("Missing mount role name in line %+v", config.Keys[0].Pos())
+			return fmt.Errorf("Missing mount role name in mount config stanza")
 		}
 
 		var m map[string]interface{}