Rename VersionAPIEntry->Entry

Signed-off-by: Daniel Weiße <[email protected]>

cli/internal/cmd/configfetchmeasurements_test.go

@@ -204,8 +204,8 @@ func (f stubVerifyFetcher) FetchAndVerifyMeasurements(_ context.Context, _ strin
 
 type stubAttestationFetcher struct{}
 
-func (f stubAttestationFetcher) FetchLatestVersion(_ context.Context, _ variant.Variant) (attestationconfigapi.VersionAPIEntry, error) {
-	return attestationconfigapi.VersionAPIEntry{
+func (f stubAttestationFetcher) FetchLatestVersion(_ context.Context, _ variant.Variant) (attestationconfigapi.Entry, error) {
+	return attestationconfigapi.Entry{
 		SEVSNPVersion: testCfg,
 	}, nil
 }

cli/internal/cmd/iamupgradeapply_test.go

@@ -171,6 +171,6 @@ type stubConfigFetcher struct {
 	fetchLatestErr error
 }
 
-func (s *stubConfigFetcher) FetchLatestVersion(context.Context, variant.Variant) (attestationconfigapi.VersionAPIEntry, error) {
-	return attestationconfigapi.VersionAPIEntry{}, s.fetchLatestErr
+func (s *stubConfigFetcher) FetchLatestVersion(context.Context, variant.Variant) (attestationconfigapi.Entry, error) {
+	return attestationconfigapi.Entry{}, s.fetchLatestErr
 }

internal/api/attestationconfigapi/cli/client/client.go

@@ -93,7 +93,7 @@ func (c Client) List(ctx context.Context, attestation variant.Variant) (attestat
 func (c Client) deleteVersion(versions attestationconfigapi.List, versionStr string) (ops []crudCmd, err error) {
 	versionStr = versionStr + ".json"
 	ops = append(ops, deleteCmd{
-		apiObject: attestationconfigapi.VersionAPIEntry{
+		apiObject: attestationconfigapi.Entry{
 			Variant: versions.Variant,
 			Version: versionStr,
 		},

internal/api/attestationconfigapi/cli/client/client_test.go

@@ -23,7 +23,7 @@ func TestDeleteAzureSEVSNPVersions(t *testing.T) {
 	assert := assert.New(t)
 	assert.NoError(err)
 	assert.Contains(ops, deleteCmd{
-		apiObject: attestationconfigapi.VersionAPIEntry{
+		apiObject: attestationconfigapi.Entry{
 			Version: "2021-01-01.json",
 		},
 	})

internal/api/attestationconfigapi/fetcher.go

@@ -20,7 +20,7 @@ const cosignPublicKey = constants.CosignPublicKeyReleases
 
 // Fetcher fetches config API resources without authentication.
 type Fetcher interface {
-	FetchLatestVersion(ctx context.Context, attestation variant.Variant) (VersionAPIEntry, error)
+	FetchLatestVersion(ctx context.Context, attestation variant.Variant) (Entry, error)
 }
 
 // fetcher fetches AttestationCfg API resources without authentication.
@@ -60,10 +60,10 @@ func newFetcherWithClientAndVerifier(client apifetcher.HTTPClient, cosignVerifie
 }
 
 // FetchLatestVersion returns the latest versions of the given type.
-func (f *fetcher) FetchLatestVersion(ctx context.Context, variant variant.Variant) (VersionAPIEntry, error) {
+func (f *fetcher) FetchLatestVersion(ctx context.Context, variant variant.Variant) (Entry, error) {
 	list, err := f.fetchVersionList(ctx, variant)
 	if err != nil {
-		return VersionAPIEntry{}, err
+		return Entry{}, err
 	}
 
 	// latest version is first in list
@@ -84,14 +84,14 @@ func (f *fetcher) fetchVersionList(ctx context.Context, variant variant.Variant)
 }
 
 // fetchVersion fetches the version information from the config API.
-func (f *fetcher) fetchVersion(ctx context.Context, version string, variant variant.Variant) (VersionAPIEntry, error) {
-	obj := VersionAPIEntry{
+func (f *fetcher) fetchVersion(ctx context.Context, version string, variant variant.Variant) (Entry, error) {
+	obj := Entry{
 		Version: version,
 		Variant: variant,
 	}
 	fetchedVersion, err := apifetcher.FetchAndVerify(ctx, f.HTTPClient, f.cdnURL, obj, f.verifier)
 	if err != nil {
-		return VersionAPIEntry{}, fmt.Errorf("fetching version %q: %w", version, err)
+		return Entry{}, fmt.Errorf("fetching version %q: %w", version, err)
 	}
 
 	// Set the attestation variant of the list as it is not part of the marshalled JSON retrieved by FetchAndVerify

internal/api/attestationconfigapi/fetcher_test.go

@@ -22,23 +22,23 @@ import (
 )
 
 func TestFetchLatestSEVSNPVersion(t *testing.T) {
-	latestVersionSNP := VersionAPIEntry{
+	latestVersionSNP := Entry{
 		SEVSNPVersion: SEVSNPVersion{
 			Microcode:  93,
 			TEE:        0,
 			SNP:        6,
 			Bootloader: 2,
 		},
 	}
-	olderVersionSNP := VersionAPIEntry{
+	olderVersionSNP := Entry{
 		SEVSNPVersion: SEVSNPVersion{
 			Microcode:  1,
 			TEE:        0,
 			SNP:        1,
 			Bootloader: 1,
 		},
 	}
-	latestVersionTDX := VersionAPIEntry{
+	latestVersionTDX := Entry{
 		TDXVersion: TDXVersion{
 			QESVN:      2,
 			PCESVN:     3,
@@ -47,7 +47,7 @@ func TestFetchLatestSEVSNPVersion(t *testing.T) {
 			XFAM:       [8]byte{6},
 		},
 	}
-	olderVersionTDX := VersionAPIEntry{
+	olderVersionTDX := Entry{
 		TDXVersion: TDXVersion{
 			QESVN:      1,
 			PCESVN:     2,
@@ -64,30 +64,30 @@ func TestFetchLatestSEVSNPVersion(t *testing.T) {
 		timeAtTest      time.Time
 		wantErr         bool
 		attestation     variant.Variant
-		expectedVersion VersionAPIEntry
-		olderVersion    VersionAPIEntry
-		latestVersion   VersionAPIEntry
+		expectedVersion Entry
+		olderVersion    Entry
+		latestVersion   Entry
 	}{
 		"get latest version azure-sev-snp": {
 			fetcherVersions: []string{latestStr, olderStr},
 			attestation:     variant.AzureSEVSNP{},
-			expectedVersion: func() VersionAPIEntry { tmp := latestVersionSNP; tmp.Variant = variant.AzureSEVSNP{}; return tmp }(),
-			olderVersion:    func() VersionAPIEntry { tmp := olderVersionSNP; tmp.Variant = variant.AzureSEVSNP{}; return tmp }(),
-			latestVersion:   func() VersionAPIEntry { tmp := latestVersionSNP; tmp.Variant = variant.AzureSEVSNP{}; return tmp }(),
+			expectedVersion: func() Entry { tmp := latestVersionSNP; tmp.Variant = variant.AzureSEVSNP{}; return tmp }(),
+			olderVersion:    func() Entry { tmp := olderVersionSNP; tmp.Variant = variant.AzureSEVSNP{}; return tmp }(),
+			latestVersion:   func() Entry { tmp := latestVersionSNP; tmp.Variant = variant.AzureSEVSNP{}; return tmp }(),
 		},
 		"get latest version aws-sev-snp": {
 			fetcherVersions: []string{latestStr, olderStr},
 			attestation:     variant.AWSSEVSNP{},
-			expectedVersion: func() VersionAPIEntry { tmp := latestVersionSNP; tmp.Variant = variant.AWSSEVSNP{}; return tmp }(),
-			olderVersion:    func() VersionAPIEntry { tmp := olderVersionSNP; tmp.Variant = variant.AWSSEVSNP{}; return tmp }(),
-			latestVersion:   func() VersionAPIEntry { tmp := latestVersionSNP; tmp.Variant = variant.AWSSEVSNP{}; return tmp }(),
+			expectedVersion: func() Entry { tmp := latestVersionSNP; tmp.Variant = variant.AWSSEVSNP{}; return tmp }(),
+			olderVersion:    func() Entry { tmp := olderVersionSNP; tmp.Variant = variant.AWSSEVSNP{}; return tmp }(),
+			latestVersion:   func() Entry { tmp := latestVersionSNP; tmp.Variant = variant.AWSSEVSNP{}; return tmp }(),
 		},
 		"get latest version azure-tdx": {
 			fetcherVersions: []string{latestStr, olderStr},
 			attestation:     variant.AzureTDX{},
-			expectedVersion: func() VersionAPIEntry { tmp := latestVersionTDX; tmp.Variant = variant.AzureTDX{}; return tmp }(),
-			olderVersion:    func() VersionAPIEntry { tmp := olderVersionTDX; tmp.Variant = variant.AzureTDX{}; return tmp }(),
-			latestVersion:   func() VersionAPIEntry { tmp := latestVersionTDX; tmp.Variant = variant.AzureTDX{}; return tmp }(),
+			expectedVersion: func() Entry { tmp := latestVersionTDX; tmp.Variant = variant.AzureTDX{}; return tmp }(),
+			olderVersion:    func() Entry { tmp := olderVersionTDX; tmp.Variant = variant.AzureTDX{}; return tmp }(),
+			latestVersion:   func() Entry { tmp := latestVersionTDX; tmp.Variant = variant.AzureTDX{}; return tmp }(),
 		},
 	}
 	for name, tc := range testCases {
@@ -119,9 +119,9 @@ type fakeConfigAPIHandler struct {
 	attestation   variant.Variant
 	versions      []string
 	latestDate    string
-	latestVersion VersionAPIEntry
+	latestVersion Entry
 	olderDate     string
-	olderVersion  VersionAPIEntry
+	olderVersion  Entry
 }
 
 // RoundTrip resolves the request and returns a dummy response.

internal/api/attestationconfigapi/version.go

@@ -45,33 +45,33 @@ type TDXVersion struct {
 	XFAM [8]byte `json:"xfam"`
 }
 
-// VersionAPIEntry is the request to get the version information of the specific version in the config api.
+// Entry is the request to get the version information of the specific version in the config api.
 //
 // TODO: Because variant is not part of the marshalled JSON, fetcher and client methods need to fill the variant property.
 // In API v2 we should embed the variant in the object and remove some code from fetcher & client.
 // That would remove the possibility of some fetcher/client code forgetting to set the variant.
-type VersionAPIEntry struct {
+type Entry struct {
 	Version string          `json:"-"`
 	Variant variant.Variant `json:"-"`
 	SEVSNPVersion
 	TDXVersion
 }
 
 // JSONPath returns the path to the JSON file for the request to the config api.
-func (i VersionAPIEntry) JSONPath() string {
+func (i Entry) JSONPath() string {
 	return path.Join(AttestationURLPath, i.Variant.String(), i.Version)
 }
 
 // ValidateRequest validates the request.
-func (i VersionAPIEntry) ValidateRequest() error {
+func (i Entry) ValidateRequest() error {
 	if !strings.HasSuffix(i.Version, ".json") {
 		return fmt.Errorf("version has no .json suffix")
 	}
 	return nil
 }
 
 // Validate is a No-Op at the moment.
-func (i VersionAPIEntry) Validate() error {
+func (i Entry) Validate() error {
 	return nil
 }
 

internal/config/config_test.go

@@ -1051,8 +1051,8 @@ func getConfigAsMap(conf *Config, t *testing.T) (res configMap) {
 
 type stubAttestationFetcher struct{}
 
-func (f stubAttestationFetcher) FetchLatestVersion(_ context.Context, _ variant.Variant) (attestationconfigapi.VersionAPIEntry, error) {
-	return attestationconfigapi.VersionAPIEntry{
+func (f stubAttestationFetcher) FetchLatestVersion(_ context.Context, _ variant.Variant) (attestationconfigapi.Entry, error) {
+	return attestationconfigapi.Entry{
 		SEVSNPVersion: testCfg,
 	}, nil
 }

terraform-provider-constellation/internal/provider/attestation_data_source.go

@@ -162,7 +162,7 @@ func (d *AttestationDataSource) Read(ctx context.Context, req datasource.ReadReq
 
 	insecureFetch := data.Insecure.ValueBool()
 
-	latestVersions := attestationconfigapi.VersionAPIEntry{}
+	latestVersions := attestationconfigapi.Entry{}
 	if attestationVariant.Equal(variant.AWSSEVSNP{}) ||
 		attestationVariant.Equal(variant.AzureSEVSNP{}) ||
 		attestationVariant.Equal(variant.AzureTDX{}) ||

terraform-provider-constellation/internal/provider/convert.go

@@ -138,7 +138,7 @@ func convertFromTfAttestationCfg(tfAttestation attestationAttribute, attestation
 }
 
 // convertToTfAttestationCfg converts the constellation attestation config to the related terraform structs.
-func convertToTfAttestation(attVar variant.Variant, latestVersions attestationconfigapi.VersionAPIEntry) (tfAttestation attestationAttribute, err error) {
+func convertToTfAttestation(attVar variant.Variant, latestVersions attestationconfigapi.Entry) (tfAttestation attestationAttribute, err error) {
 	tfAttestation = attestationAttribute{
 		Variant: attVar.String(),
 	}