sneak/secret
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix revive package stuttering errors

Browse Source 
- Rename SecretMetadata to Metadata in secret package
- Rename SecretVersion to Version in secret package
- Update NewSecretVersion to NewVersion function
- Update all references across the codebase including:
  - vault package aliases
  - CLI usage
  - test files
  - method receivers and signatures
This commit is contained in:
Jeffrey Paul
2025-06-20 08:47:32 -07:00
parent efc9456948
commit e5b18202f3
10 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/vault/integration_version_test.go
View File

@@ -84,7 +84,7 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
assert.Equal(t, versions[0], currentVersion)
// Verify metadata
version := secret.NewSecretVersion(vault, secretName, versions[0])
version := secret.NewVersion(vault, secretName, versions[0])
err = version.LoadMetadata(ltIdentity)
require.NoError(t, err)
assert.NotNil(t, version.Metadata.CreatedAt)
@@ -120,13 +120,13 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
assert.Len(t, versions, 2)
// Verify first version metadata was updated with notAfter
firstVersion := secret.NewSecretVersion(vault, secretName, firstVersionName)
firstVersion := secret.NewVersion(vault, secretName, firstVersionName)
err = firstVersion.LoadMetadata(ltIdentity)
require.NoError(t, err)
assert.NotNil(t, firstVersion.Metadata.NotAfter)
// Verify second version metadata
secondVersion := secret.NewSecretVersion(vault, secretName, versions[0])
secondVersion := secret.NewVersion(vault, secretName, versions[0])
err = secondVersion.LoadMetadata(ltIdentity)
require.NoError(t, err)
assert.NotNil(t, secondVersion.Metadata.NotBefore)
@@ -199,7 +199,7 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
// Verify the version metadata hasn't changed
// (promoting shouldn't modify timestamps)
version := secret.NewSecretVersion(vault, secretName, oldestVersion)
version := secret.NewVersion(vault, secretName, oldestVersion)
err = version.LoadMetadata(ltIdentity)
require.NoError(t, err)
assert.NotNil(t, version.Metadata.NotAfter) // should still have its old notAfter

2
internal/vault/metadata.go
View File

@@ -16,7 +16,7 @@ import (
type (
VaultMetadata = secret.VaultMetadata
UnlockerMetadata = secret.UnlockerMetadata
SecretMetadata = secret.SecretMetadata
SecretMetadata = secret.Metadata
Configuration = secret.Configuration
)

10
internal/vault/secrets.go
View File

@@ -136,7 +136,7 @@ func (v *Vault) AddSecret(name string, value []byte, force bool) error {
// Handle existing secret case
now := time.Now()
var previousVersion *secret.SecretVersion
var previousVersion *secret.Version
if exists {
if !force {
@@ -147,7 +147,7 @@ func (v *Vault) AddSecret(name string, value []byte, force bool) error {
// Get the current version to update its notAfter timestamp
currentVersionName, err := secret.GetCurrentVersion(v.fs, secretDir)
if err == nil && currentVersionName != "" {
previousVersion = secret.NewSecretVersion(v, name, currentVersionName)
previousVersion = secret.NewVersion(v, name, currentVersionName)
// We'll need to load and update its metadata after we unlock the vault
}
} else {
@@ -170,7 +170,7 @@ func (v *Vault) AddSecret(name string, value []byte, force bool) error {
secret.Debug("Generated new version name", "version", versionName, "secret_name", name)
// Create new version
newVersion := secret.NewSecretVersion(v, name, versionName)
newVersion := secret.NewVersion(v, name, versionName)
// Set version timestamps
if previousVersion == nil {
@@ -226,7 +226,7 @@ func (v *Vault) AddSecret(name string, value []byte, force bool) error {
}
// updateVersionMetadata updates the metadata of an existing version
func updateVersionMetadata(fs afero.Fs, version *secret.SecretVersion, ltIdentity *age.X25519Identity) error {
func updateVersionMetadata(fs afero.Fs, version *secret.Version, ltIdentity *age.X25519Identity) error {
// Read the version's encrypted private key
encryptedPrivKeyPath := filepath.Join(version.Directory, "priv.age")
encryptedPrivKey, err := afero.ReadFile(fs, encryptedPrivKeyPath)
@@ -320,7 +320,7 @@ func (v *Vault) GetSecretVersion(name string, version string) ([]byte, error) {
}
// Create version object
secretVersion := secret.NewSecretVersion(v, name, version)
secretVersion := secret.NewVersion(v, name, version)
// Check if version exists
versionPath := filepath.Join(secretDir, "versions", version)

10
internal/vault/secrets_version_test.go
View File

@@ -196,7 +196,7 @@ func TestVaultVersionTimestamps(t *testing.T) {
require.NoError(t, err)
require.Len(t, versions, 1)
firstVersion := secret.NewSecretVersion(vault, secretName, versions[0])
firstVersion := secret.NewVersion(vault, secretName, versions[0])
err = firstVersion.LoadMetadata(ltIdentity)
require.NoError(t, err)
@@ -222,7 +222,7 @@ func TestVaultVersionTimestamps(t *testing.T) {
require.Len(t, versions, 2)
// Reload first version metadata (should have notAfter now)
firstVersion = secret.NewSecretVersion(vault, secretName, versions[1])
firstVersion = secret.NewVersion(vault, secretName, versions[1])
err = firstVersion.LoadMetadata(ltIdentity)
require.NoError(t, err)
@@ -231,7 +231,7 @@ func TestVaultVersionTimestamps(t *testing.T) {
assert.True(t, firstVersion.Metadata.NotAfter.Before(afterSecond.Add(time.Second)))
// Check second version timestamps
secondVersion := secret.NewSecretVersion(vault, secretName, versions[0])
secondVersion := secret.NewVersion(vault, secretName, versions[0])
err = secondVersion.LoadMetadata(ltIdentity)
require.NoError(t, err)
@@ -272,7 +272,7 @@ func TestUpdateVersionMetadata(t *testing.T) {
// Create a version manually to test updateVersionMetadata
secretName := "test/secret"
versionName := "20231215.001"
version := secret.NewSecretVersion(vault, secretName, versionName)
version := secret.NewVersion(vault, secretName, versionName)
// Set initial metadata
now := time.Now()
@@ -290,7 +290,7 @@ func TestUpdateVersionMetadata(t *testing.T) {
require.NoError(t, err)
// Load and verify
version2 := secret.NewSecretVersion(vault, secretName, versionName)
version2 := secret.NewVersion(vault, secretName, versionName)
err = version2.LoadMetadata(ltIdentity)
require.NoError(t, err)