Add Custom metadata field to alias (#12502)

* adding changes * removing q.Q * removing empty lines * testing * checking tests * fixing tests * adding changes * added requested changes * added requested changes * added policy templating changes and fixed tests * adding proto changes * making changes * adding unit tests * using suggested function
hashicorp · Sep 17, 2021 · d324066 · d324066
1 parent e2e4b50
commit d324066
Show file tree

Hide file tree

Showing 21 changed files with 335 additions and 112 deletions.
diff --git a/changelog/12502.txt b/changelog/12502.txt
@@ -0,0 +1,3 @@
+```release-note:feature
+core: adds custom_metadata field for aliases
+```
diff --git a/helper/forwarding/types.pb.go b/helper/forwarding/types.pb.go
diff --git a/helper/identity/identity.go b/helper/identity/identity.go
@@ -75,12 +75,13 @@ func ToSDKAlias(a *Alias) *logical.Alias {
 	}
 
 	return &logical.Alias{
-		Name:          a.Name,
-		ID:            a.ID,
-		MountAccessor: a.MountAccessor,
-		MountType:     a.MountType,
-		Metadata:      metadata,
-		NamespaceID:   a.NamespaceID,
+		Name:           a.Name,
+		ID:             a.ID,
+		MountAccessor:  a.MountAccessor,
+		MountType:      a.MountType,
+		Metadata:       metadata,
+		NamespaceID:    a.NamespaceID,
+		CustomMetadata: a.CustomMetadata,
 	}
 }
 

diff --git a/helper/identity/mfa/types.pb.go b/helper/identity/mfa/types.pb.go
diff --git a/helper/identity/types.pb.go b/helper/identity/types.pb.go
diff --git a/helper/identity/types.proto b/helper/identity/types.proto
@@ -172,6 +172,9 @@ message Alias {
 	// NamespaceID is the identifier of the namespace to which this alias
 	// belongs.
 	string namespace_id = 11;
+
+	// Custom Metadata represents the custom data tied to this alias
+	map<string, string> customMetadata = 12;
 }
 
 // Deprecated. Retained for backwards compatibility.

diff --git a/helper/storagepacker/types.pb.go b/helper/storagepacker/types.pb.go
diff --git a/physical/raft/types.pb.go b/physical/raft/types.pb.go
diff --git a/sdk/database/dbplugin/database.pb.go b/sdk/database/dbplugin/database.pb.go
diff --git a/sdk/database/dbplugin/v5/proto/database.pb.go b/sdk/database/dbplugin/v5/proto/database.pb.go
diff --git a/sdk/helper/identitytpl/templating.go b/sdk/helper/identitytpl/templating.go
@@ -178,6 +178,15 @@ func performTemplating(input string, p *PopulateStringInput) (string, error) {
 		case strings.HasPrefix(trimmed, "metadata."):
 			split := strings.SplitN(trimmed, ".", 2)
 			return p.templateHandler(alias.Metadata, split[1])
+
+		case trimmed == "custom_metadata":
+			return p.templateHandler(alias.CustomMetadata)
+
+		case strings.HasPrefix(trimmed, "custom_metadata."):
+
+			split := strings.SplitN(trimmed, ".", 2)
+			return p.templateHandler(alias.CustomMetadata, split[1])
+
 		}
 
 		return "", ErrTemplateValueNotFound
@@ -222,7 +231,7 @@ func performTemplating(input string, p *PopulateStringInput) (string, error) {
 				}
 
 				// An empty alias is sufficient for generating defaults
-				alias = &logical.Alias{Metadata: make(map[string]string)}
+				alias = &logical.Alias{Metadata: make(map[string]string), CustomMetadata: make(map[string]string)}
 			}
 			return performAliasTemplating(split[1], alias)
 		}