refactor: remove prefix from event function and replace it with a constant

Author: ilijamt

internal/event/event.go

@@ -12,7 +12,9 @@ import (
 	"github.com/ilijamt/vault-plugin-secrets-gitlab/internal/errs"
 )
 
-func Event(ctx context.Context, b *framework.Backend, prefix, eventType string, metadata map[string]string) error {
+const Prefix = "gitlab"
+
+func Event(ctx context.Context, b *framework.Backend, eventType string, metadata map[string]string) error {
 	var err error
 	var ev *logical.EventData
 	if b == nil {
@@ -23,7 +25,7 @@ func Event(ctx context.Context, b *framework.Backend, prefix, eventType string,
 		metadataBytes, _ = json.Marshal(metadata)
 		ev.Metadata = &structpb.Struct{}
 		_ = ev.Metadata.UnmarshalJSON(metadataBytes)
-		err = b.SendEvent(ctx, logical.EventType(fmt.Sprintf("%s/%s", prefix, eventType)), ev)
+		err = b.SendEvent(ctx, logical.EventType(fmt.Sprintf("%s/%s", Prefix, eventType)), ev)
 	}
 	return err
 }

internal/event/event_test.go

@@ -39,7 +39,7 @@ func TestEvent(t *testing.T) {
 			event.Event(
 				t.Context(),
 				nil,
-				"test", "test",
+				"test",
 				map[string]string{"test": "test"},
 			),
 			errs.ErrNilValue,
@@ -53,7 +53,7 @@ func TestEvent(t *testing.T) {
 			event.Event(
 				t.Context(),
 				&framework.Backend{},
-				"test", "test",
+				"test",
 				map[string]string{"test": "test"},
 			),
 			framework.ErrNoEvents,
@@ -67,7 +67,7 @@ func TestEvent(t *testing.T) {
 		require.NoError(t,
 			event.Event(
 				t.Context(), b,
-				"test", "test",
+				"test",
 				map[string]string{"test": "test"},
 			),
 		)

path_config.go

@@ -95,7 +95,7 @@ func (b *Backend) pathConfigDelete(ctx context.Context, req *logical.Request, da
 		}
 
 		if err = req.Storage.Delete(ctx, fmt.Sprintf("%s/%s", PathConfigStorage, name)); err == nil {
-			_ = event.Event(ctx, b.Backend, operationPrefixGitlabAccessTokens, "config-delete", map[string]string{
+			_ = event.Event(ctx, b.Backend, "config-delete", map[string]string{
 				"path": fmt.Sprintf("%s/%s", PathConfigStorage, name),
 			})
 			b.SetClient(nil, name)
@@ -150,7 +150,7 @@ func (b *Backend) pathConfigPatch(ctx context.Context, req *logical.Request, dat
 	defer b.lockClientMutex.Unlock()
 	if err = saveConfig(ctx, config, req.Storage); err == nil {
 		lrd := config.LogicalResponseData(b.flags.ShowConfigToken)
-		_ = event.Event(ctx, b.Backend, operationPrefixGitlabAccessTokens, "config-patch", changes)
+		_ = event.Event(ctx, b.Backend, "config-patch", changes)
 		b.SetClient(nil, name)
 		b.Logger().Debug("Patched config", "lrd", lrd, "warnings", warnings)
 		lResp = &logical.Response{Data: lrd, Warnings: warnings}
@@ -209,7 +209,7 @@ func (b *Backend) pathConfigWrite(ctx context.Context, req *logical.Request, dat
 	var lResp *logical.Response
 
 	if err = saveConfig(ctx, config, req.Storage); err == nil {
-		_ = event.Event(ctx, b.Backend, operationPrefixGitlabAccessTokens, "config-write", map[string]string{
+		_ = event.Event(ctx, b.Backend, "config-write", map[string]string{
 			"path":               fmt.Sprintf("%s/%s", PathConfigStorage, name),
 			"auto_rotate_token":  strconv.FormatBool(config.AutoRotateToken),
 			"auto_rotate_before": config.AutoRotateBefore.String(),

path_config_rotate.go

@@ -108,7 +108,7 @@ func (b *Backend) pathConfigTokenRotate(ctx context.Context, request *logical.Re
 
 	lResp = &logical.Response{Data: config.LogicalResponseData(b.flags.ShowConfigToken)}
 	lResp.Data["token"] = config.Token
-	_ = event.Event(ctx, b.Backend, operationPrefixGitlabAccessTokens, "config-token-rotate", map[string]string{
+	_ = event.Event(ctx, b.Backend, "config-token-rotate", map[string]string{
 		"path":        fmt.Sprintf("%s/%s", PathConfigStorage, name),
 		"expires_at":  entryToken.ExpiresAt.Format(time.RFC3339),
 		"created_at":  entryToken.CreatedAt.Format(time.RFC3339),

path_flags.go

@@ -45,7 +45,7 @@ func (b *Backend) pathFlagsUpdate(ctx context.Context, req *logical.Request, dat
 		eventData["show_config_token"] = strconv.FormatBool(b.flags.ShowConfigToken)
 	}
 
-	_ = event.Event(ctx, b.Backend, operationPrefixGitlabAccessTokens, "flags-write", eventData)
+	_ = event.Event(ctx, b.Backend, "flags-write", eventData)
 
 	var flagData map[string]any
 	err = mapstructure.Decode(b.flags, &flagData)

path_role.go

@@ -168,7 +168,7 @@ func (b *Backend) pathRolesDelete(ctx context.Context, req *logical.Request, dat
 		return nil, fmt.Errorf("error deleting role: %w", err)
 	}
 
-	_ = event.Event(ctx, b.Backend, operationPrefixGitlabAccessTokens, "role-delete", map[string]string{
+	_ = event.Event(ctx, b.Backend, "role-delete", map[string]string{
 		"path":      "roles",
 		"role_name": roleName,
 	})
@@ -372,7 +372,7 @@ func (b *Backend) pathRolesWrite(ctx context.Context, req *logical.Request, data
 		return nil, err
 	}
 
-	_ = event.Event(ctx, b.Backend, operationPrefixGitlabAccessTokens, "role-write", map[string]string{
+	_ = event.Event(ctx, b.Backend, "role-write", map[string]string{
 		"path":        "roles",
 		"role_name":   roleName,
 		"config_name": role.ConfigName,

path_token_role.go

@@ -158,7 +158,7 @@ func (b *Backend) pathTokenRoleCreate(ctx context.Context, req *logical.Request,
 	}
 
 	_ = event.Event(
-		ctx, b.Backend, operationPrefixGitlabAccessTokens, "token-write",
+		ctx, b.Backend, "token-write",
 		token.Event(map[string]string{"path": fmt.Sprintf("%s/%s", PathRoleStorage, roleName)}),
 	)
 	return resp, nil

secret_access_tokens.go

@@ -128,7 +128,7 @@ func (b *Backend) secretAccessTokenRevoke(ctx context.Context, req *logical.Requ
 		}
 	}
 
-	_ = event.Event(ctx, b.Backend, operationPrefixGitlabAccessTokens, "token-revoke", map[string]string{
+	_ = event.Event(ctx, b.Backend, "token-revoke", map[string]string{
 		"lease_id":             secret.LeaseID,
 		"path":                 req.Secret.InternalData["path"].(string),
 		"name":                 req.Secret.InternalData["name"].(string),