fix token list by auth method (#11196)

* add tests to OIDC authmethod and fix entMeta when retrieving auth-methods * fix oss compilation error
3 years ago · a5b09493ab
parent 8b002d086a
commit a5b09493ab
1 changed files with 3 additions and 1 deletions
--- a/agent/consul/state/acl.go
+++ b/agent/consul/state/acl.go
@ -528,7 +528,9 @@ func aclTokenSetTxn(tx WriteTxn, idx uint64, token *structs.ACLToken, opts ACLTo
 	}

 	if token.AuthMethod != "" && !opts.FromReplication {
-		method, err := getAuthMethodWithTxn(tx, nil, token.AuthMethod, token.ACLAuthMethodEnterpriseMeta.ToEnterpriseMeta())
+		methodMeta := token.ACLAuthMethodEnterpriseMeta.ToEnterpriseMeta()
+		methodMeta.Merge(&token.EnterpriseMeta)
+		method, err := getAuthMethodWithTxn(tx, nil, token.AuthMethod, methodMeta)
 		if err != nil {
 			return err
 		} else if method == nil {