kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

client: change Consul client interface (#19140)

Browse Source 
DeriveSITokenWithJWT is a misleading method name, because it's used to derive
Consul ACL tokens for other purposes too.
This commit is contained in:
Piotr Kazmierczak
2023-11-21 16:01:26 +01:00
committed by GitHub
parent 2e254112f5
commit 711da2e653
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/allocrunner/consul_hook.go
View File

@@ -212,7 +212,7 @@ func (h *consulHook) getConsulTokens(cluster, identityName string, tokens map[st
}
// get consul acl tokens
t, err := client.DeriveSITokenWithJWT(req)
t, err := client.DeriveTokenWithJWT(req)
if err != nil {
return err
}

10
client/consul/consul.go
View File

@@ -51,9 +51,9 @@ type JWTLoginRequest struct {
// Client is the interface that the nomad client uses to interact with
// Consul.
type Client interface {
// DeriveSITokenWithJWT logs into Consul using JWT and retrieves a Consul
// SI ACL token.
DeriveSITokenWithJWT(map[string]JWTLoginRequest) (map[string]*consulapi.ACLToken, error)
// DeriveTokenWithJWT logs into Consul using JWT and retrieves a Consul ACL
// token.
DeriveTokenWithJWT(map[string]JWTLoginRequest) (map[string]*consulapi.ACLToken, error)
RevokeTokens([]*consulapi.ACLToken) error
}
@@ -101,9 +101,9 @@ func NewConsulClient(config *config.ConsulConfig, logger hclog.Logger) (Client,
return c, nil
}
// DeriveSITokenWithJWT takes a JWT from request and returns a consul token for
// DeriveTokenWithJWT takes a JWT from request and returns a consul token for
// each identity in the request
func (c *consulClient) DeriveSITokenWithJWT(reqs map[string]JWTLoginRequest) (map[string]*consulapi.ACLToken, error) {
func (c *consulClient) DeriveTokenWithJWT(reqs map[string]JWTLoginRequest) (map[string]*consulapi.ACLToken, error) {
tokens := make(map[string]*consulapi.ACLToken, len(reqs))
var mErr *multierror.Error

4
client/consul/consul_testing.go
View File

@@ -20,10 +20,10 @@ func NewMockConsulClient(config *config.ConsulConfig, logger hclog.Logger) (Clie
return &MockConsulClient{}, nil
}
// DeriveSITokenWithJWT returns ACLTokens with deterministic values for testing:
// DeriveTokenWithJWT returns ACLTokens with deterministic values for testing:
// the request ID for the AccessorID and the md5 checksum of the request ID for
// the SecretID
func (mc *MockConsulClient) DeriveSITokenWithJWT(reqs map[string]JWTLoginRequest) (map[string]*consulapi.ACLToken, error) {
func (mc *MockConsulClient) DeriveTokenWithJWT(reqs map[string]JWTLoginRequest) (map[string]*consulapi.ACLToken, error) {
if mc.tokens != nil && len(mc.tokens) > 0 {
return mc.tokens, nil
}