diff --git a/internal/secret/version.go b/internal/secret/version.go index 9e3703f..f0a3c1c 100644 --- a/internal/secret/version.go +++ b/internal/secret/version.go @@ -17,12 +17,10 @@ import ( // VersionMetadata contains information about a secret version type VersionMetadata struct { - ID string `json:"id"` // ULID - SecretName string `json:"secretName"` // Parent secret name - CreatedAt *time.Time `json:"createdAt,omitempty"` // When version was created - NotBefore *time.Time `json:"notBefore,omitempty"` // When this version becomes active - NotAfter *time.Time `json:"notAfter,omitempty"` // When this version expires (nil = current) - Version string `json:"version"` // Version string (e.g., "20231215.001") + ID string `json:"id"` // ULID + CreatedAt *time.Time `json:"createdAt,omitempty"` // When version was created + NotBefore *time.Time `json:"notBefore,omitempty"` // When this version becomes active + NotAfter *time.Time `json:"notAfter,omitempty"` // When this version expires (nil = current) } // SecretVersion represents a version of a secret @@ -59,10 +57,8 @@ func NewSecretVersion(vault VaultInterface, secretName string, version string) * Directory: versionDir, vault: vault, Metadata: VersionMetadata{ - ID: ulid.Make().String(), - SecretName: secretName, - CreatedAt: &now, - Version: version, + ID: ulid.Make().String(), + CreatedAt: &now, }, } } diff --git a/internal/secret/version_test.go b/internal/secret/version_test.go index 3a575ac..e3fe985 100644 --- a/internal/secret/version_test.go +++ b/internal/secret/version_test.go @@ -136,7 +136,6 @@ func TestNewSecretVersion(t *testing.T) { assert.Contains(t, sv.Directory, "test%secret/versions/20231215.001") assert.NotEmpty(t, sv.Metadata.ID) assert.NotNil(t, sv.Metadata.CreatedAt) - assert.Equal(t, "20231215.001", sv.Metadata.Version) } func TestSecretVersionSave(t *testing.T) { @@ -213,8 +212,6 @@ func TestSecretVersionLoadMetadata(t *testing.T) { // Verify loaded metadata assert.Equal(t, sv.Metadata.ID, sv2.Metadata.ID) - assert.Equal(t, sv.Metadata.SecretName, sv2.Metadata.SecretName) - assert.Equal(t, sv.Metadata.Version, sv2.Metadata.Version) assert.NotNil(t, sv2.Metadata.NotBefore) assert.Equal(t, epochPlusOne.Unix(), sv2.Metadata.NotBefore.Unix()) assert.NotNil(t, sv2.Metadata.NotAfter) @@ -330,9 +327,7 @@ func TestSetCurrentVersion(t *testing.T) { func TestVersionMetadataTimestamps(t *testing.T) { // Test that all timestamp fields behave consistently as pointers vm := VersionMetadata{ - ID: "test-id", - SecretName: "test/secret", - Version: "20231215.001", + ID: "test-id", } // All should be nil initially