luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Move activityType to a constant, set precedence (#20738) 

Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
This commit is contained in:
Alexander Scheel 2023-05-24 12:29:47 -04:00 committed by GitHub
parent 04bb7eef15
commit c67546511d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/logical/pki/acme_billing_test.go
View File

@ -21,6 +21,7 @@ import (
"github.com/hashicorp/vault/builtin/logical/pki/dnstest" "github.com/hashicorp/vault/builtin/logical/pki/dnstest"
"github.com/hashicorp/vault/helper/constants" "github.com/hashicorp/vault/helper/constants"
"github.com/hashicorp/vault/helper/timeutil" "github.com/hashicorp/vault/helper/timeutil"
"github.com/hashicorp/vault/vault"
"github.com/hashicorp/vault/vault/activity" "github.com/hashicorp/vault/vault/activity"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -119,8 +120,8 @@ func validateAcmeClientTypes(t *testing.T, fragment *activity.LogFragment, expec
} }
for _, ac := range fragment.Clients { for _, ac := range fragment.Clients {
if ac.ClientType != "acme" { if ac.ClientType != vault.ACMEActivityType {
t.Fatalf("Couldn't find expected 'acme' client_type in %v", fragment.Clients) t.Fatalf("Couldn't find expected '%v' client_type in %v", vault.ACMEActivityType, fragment.Clients)
} }
} }
} }

12
vault/acme_billing_system_view.go
View File

@ -20,6 +20,15 @@ import (
// See comment in command/format.go // See comment in command/format.go
const hopeDelim = "♨" const hopeDelim = "♨"
// Modifying this constant will result in previous activities not being
// associated with future activities of this same type. A storage
// migration would need to occur to fix this.
//
// Suggested naming precedence: <plugin name>-<client type>. Since this
// comes from the builtin PKI plugin, and we're counting ACME certificates,
// this becomes pki-acme.
const ACMEActivityType = "pki-acme"
// acmeBillingImpl is the (single) implementation of the actual client // acmeBillingImpl is the (single) implementation of the actual client
// counting interface. It needs a reference to core (as per discussions // counting interface. It needs a reference to core (as per discussions
// with Mike, in the future the activityLog reference will no longer be // with Mike, in the future the activityLog reference will no longer be
@ -121,7 +130,6 @@ func (a *acmeBillingImpl) CreateActivityCountEventForIdentifiers(ctx context.Con
clientID := base64.RawURLEncoding.EncodeToString(identifiersHash[:]) clientID := base64.RawURLEncoding.EncodeToString(identifiersHash[:])
// Log so users can correlate ACME requests to client count tokens. // Log so users can correlate ACME requests to client count tokens.
activityType := "acme"
a.core.activityLogLock.RLock() a.core.activityLogLock.RLock()
activityLog := a.core.activityLog activityLog := a.core.activityLog
a.core.activityLogLock.RUnlock() a.core.activityLogLock.RUnlock()
@ -129,7 +137,7 @@ func (a *acmeBillingImpl) CreateActivityCountEventForIdentifiers(ctx context.Con
return nil return nil
} }
activityLog.logger.Debug(fmt.Sprintf("Handling ACME client count event for [%v] -> %v", identifiers, clientID)) activityLog.logger.Debug(fmt.Sprintf("Handling ACME client count event for [%v] -> %v", identifiers, clientID))
activityLog.AddActivityToFragment(clientID, a.entry.NamespaceID, time.Now().Unix(), activityType, a.entry.Accessor) activityLog.AddActivityToFragment(clientID, a.entry.NamespaceID, time.Now().Unix(), ACMEActivityType, a.entry.Accessor)
return nil return nil
} }