From ed6662e390ad4fbe81ddbf14208c02910149354c Mon Sep 17 00:00:00 2001 From: Diogenes Fernandes Date: Fri, 10 Jan 2025 13:02:13 -0300 Subject: [PATCH] using metadata api directly Signed-off-by: Diogenes Fernandes --- src/cmd/verify-gpg-key/main.go | 13 ++++++++++--- src/cmd/verify-gpg-key/verify-key-in-providers.go | 12 +++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/cmd/verify-gpg-key/main.go b/src/cmd/verify-gpg-key/main.go index 2102766dad..9181877b32 100644 --- a/src/cmd/verify-gpg-key/main.go +++ b/src/cmd/verify-gpg-key/main.go @@ -12,6 +12,7 @@ import ( "github.com/ProtonMail/gopenpgp/v2/crypto" + "github.com/opentofu/libregistry/metadata" "github.com/opentofu/libregistry/metadata/storage/filesystem" "github.com/opentofu/registry-stable/internal/files" "github.com/opentofu/registry-stable/internal/github" @@ -171,8 +172,14 @@ func VerifyKey(ctx context.Context, providerDataDir string, location string, org return nil }) - storageAPI := filesystem.New(providerDataDir) - providers, err := listProviders(ctx, storageAPI, orgName) + dataAPI, err := metadata.New(filesystem.New(providerDataDir)) + if err != nil { + verifyStep.AddError(fmt.Errorf("failed to create a metadata API: %w", err)) + verifyStep.Status = verification.StatusFailure + return verifyStep + } + + providers, err := listProviders(ctx, dataAPI, orgName) if err != nil { verifyStep.AddError(fmt.Errorf("failed to list provider %s: %w", orgName, err)) @@ -180,7 +187,7 @@ func VerifyKey(ctx context.Context, providerDataDir string, location string, org return verifyStep } - keyVerification, err := buildKeyVerifier(storageAPI) + keyVerification, err := buildKeyVerifier(dataAPI) if err != nil { verifyStep.AddError(fmt.Errorf("failed to build key verifier: %w", err)) verifyStep.Status = verification.StatusFailure diff --git a/src/cmd/verify-gpg-key/verify-key-in-providers.go b/src/cmd/verify-gpg-key/verify-key-in-providers.go index 3e0bb713aa..8d88a4be18 100644 --- a/src/cmd/verify-gpg-key/verify-key-in-providers.go +++ b/src/cmd/verify-gpg-key/verify-key-in-providers.go @@ -7,29 +7,23 @@ import ( "time" "github.com/opentofu/libregistry/metadata" - "github.com/opentofu/libregistry/metadata/storage" "github.com/opentofu/libregistry/provider_verifier" "github.com/opentofu/libregistry/types/provider" ) -func buildKeyVerifier(storageAPI storage.API) (provider_verifier.KeyVerification, error) { +func buildKeyVerifier(dataAPI metadata.API) (provider_verifier.KeyVerification, error) { httpClient := http.Client{ Timeout: time.Second * 10, } - keyVerification, err := provider_verifier.New(httpClient, storageAPI) + keyVerification, err := provider_verifier.New(httpClient, dataAPI) if err != nil { return nil, err } return keyVerification, nil } -func listProviders(ctx context.Context, storageAPI storage.API, namespace string) ([]provider.Addr, error) { - dataAPI, err := metadata.New(storageAPI) - if err != nil { - return nil, err - } - +func listProviders(ctx context.Context, dataAPI metadata.API, namespace string) ([]provider.Addr, error) { providers, err := dataAPI.ListProvidersByNamespace(ctx, namespace, false) if err != nil { return nil, err