feat(auth): add support for DefaultAzureCredential

Signed-off-by: Gabriele Fedi <gabriele.fedi@enterprisedb.com>
This commit is contained in:
Gabriele Fedi 2025-11-13 18:06:00 +01:00
parent 316828cc73
commit 1c3dd8558f
7 changed files with 41 additions and 1 deletions

View File

@ -20,13 +20,17 @@ SPDX-License-Identifier: Apache-2.0
package common
import (
"context"
"fmt"
"path"
"strings"
barmanapi "github.com/cloudnative-pg/barman-cloud/pkg/api"
"github.com/cloudnative-pg/barman-cloud/pkg/command"
barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
pluginmetadata "github.com/cloudnative-pg/plugin-barman-cloud/pkg/metadata"
)
// TODO: refactor.
@ -97,3 +101,14 @@ func MergeEnv(env []string, incomingEnv []string) []string {
func BuildCertificateFilePath(objectStoreName string) string {
return path.Join(metadata.BarmanCertificatesPath, objectStoreName, metadata.BarmanCertificatesFileName)
}
// ContextWithProviderOptions enriches the context with cloud service provider specific options
// based on the ObjectStore resource
func ContextWithProviderOptions(ctx context.Context, objectStore barmancloudv1.ObjectStore) context.Context {
if objectStore.GetAnnotations()[pluginmetadata.UseDefaultAzureCredentialsAnnotationName] ==
pluginmetadata.UseDefaultAzureCredentialsTrueValue {
return command.ContextWithDefaultAzureCredentials(ctx, true)
}
return ctx
}

View File

@ -127,6 +127,8 @@ func (w WALServiceImplementation) Archive(
return nil, err
}
ctx = ContextWithProviderOptions(ctx, objectStore)
envArchive, err := barmanCredentials.EnvSetCloudCredentialsAndCertificates(
ctx,
w.Client,

View File

@ -87,6 +87,8 @@ func (b BackupServiceImplementation) Backup(
return nil, err
}
ctx = common.ContextWithProviderOptions(ctx, objectStore)
if err := fileutils.EnsureDirectoryExists(postgres.BackupTemporaryDirectory); err != nil {
contextLogger.Error(err, "Cannot create backup temporary directory", "err", err)
return nil, err

View File

@ -93,6 +93,8 @@ func (c *CatalogMaintenanceRunnable) cycle(ctx context.Context) (time.Duration,
return 0, err
}
ctx = common.ContextWithProviderOptions(ctx, barmanObjectStore)
if err := c.maintenance(ctx, &cluster, &barmanObjectStore); err != nil {
return 0, err
}

View File

@ -109,7 +109,7 @@ func (impl JobHookImpl) Restore(
}
if err := impl.checkBackupDestination(
ctx,
common.ContextWithProviderOptions(ctx, targetObjectStore),
configuration.Cluster,
&targetObjectStore.Spec.Configuration,
targetObjectStore.Name,
@ -118,6 +118,8 @@ func (impl JobHookImpl) Restore(
}
}
ctx = common.ContextWithProviderOptions(ctx, recoveryObjectStore)
// Detect the backup to recover
backup, env, err := loadBackupObjectFromExternalCluster(
ctx,

2
pkg/metadata/doc.go Normal file
View File

@ -0,0 +1,2 @@
// Package metadata provides metadata utilities for the Barman Cloud plugin
package metadata

View File

@ -0,0 +1,15 @@
package metadata
// MetadataNamespace is the namespace used for the Barman Cloud plugin metadata
const MetadataNamespace = "barmancloud.cnpg.io"
const (
// UseDefaultAzureCredentialsAnnotationName is an annotation that can be set
// on an ObjectStore resource to enable the use DefaultAzureCredentials
// to authenticate to Azure. This is meant to be used with inheritFromAzureAD enabled.
UseDefaultAzureCredentialsAnnotationName = MetadataNamespace + "/useDefaultAzureCredentials"
// UseDefaultAzureCredentialsTrueValue is the value for the annotation
// barmancloud.cnpg.io/useDefaultAzureCredentials to enable the use of DefaultAzureCredentials
UseDefaultAzureCredentialsTrueValue = "true"
)