From a4b0f428b886b544745f488711a3399fc9f928d0 Mon Sep 17 00:00:00 2001
From: Armando Ruocco <armando.ruocco@enterprisedb.com>
Date: Tue, 28 Apr 2026 10:09:00 +0200
Subject: [PATCH] refactor: rename label builder to BuildLabels, move into
 labels.go

The package is already named specs, the file content is label
construction, and a separate metadata package exists at
internal/cnpgi/metadata; labels.go describes the file directly
without the package-name collision. BuildLabels also matches
the verb convention already used elsewhere in the package
(BuildRole, BuildRoleBinding, BuildRoleRules).

No behavior change.

Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>
---
 internal/cnpgi/operator/rbac/ensure.go                      | 2 +-
 internal/cnpgi/operator/specs/{metadata.go => labels.go}    | 4 ++--
 .../operator/specs/{metadata_test.go => labels_test.go}     | 6 +++---
 internal/cnpgi/operator/specs/role.go                       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename internal/cnpgi/operator/specs/{metadata.go => labels.go} (88%)
 rename internal/cnpgi/operator/specs/{metadata_test.go => labels_test.go} (94%)

diff --git a/internal/cnpgi/operator/rbac/ensure.go b/internal/cnpgi/operator/rbac/ensure.go
index c23676c..1913ee7 100644
--- a/internal/cnpgi/operator/rbac/ensure.go
+++ b/internal/cnpgi/operator/rbac/ensure.go
@@ -61,7 +61,7 @@ func EnsureRole(
 		return err
 	}
 
-	return patchRole(ctx, c, roleKey, newRole.Rules, specs.GetRequiredLabels(cluster))
+	return patchRole(ctx, c, roleKey, newRole.Rules, specs.BuildLabels(cluster))
 }
 
 // EnsureRoleRules updates the rules of an existing Role to match
diff --git a/internal/cnpgi/operator/specs/metadata.go b/internal/cnpgi/operator/specs/labels.go
similarity index 88%
rename from internal/cnpgi/operator/specs/metadata.go
rename to internal/cnpgi/operator/specs/labels.go
index fc4c614..cdb1b9f 100644
--- a/internal/cnpgi/operator/specs/metadata.go
+++ b/internal/cnpgi/operator/specs/labels.go
@@ -28,8 +28,8 @@ import (
 	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
 )
 
-// GetRequiredLabels returns the labels that must be present on all plugin-managed objects for a given Cluster.
-func GetRequiredLabels(cluster *cnpgv1.Cluster) map[string]string {
+// BuildLabels returns the labels that must be present on all plugin-managed objects for a given Cluster.
+func BuildLabels(cluster *cnpgv1.Cluster) map[string]string {
 	requiredLabels := map[string]string{
 		metadata.ClusterLabelName: cluster.Name,
 		// Kubernetes recommended labels
diff --git a/internal/cnpgi/operator/specs/metadata_test.go b/internal/cnpgi/operator/specs/labels_test.go
similarity index 94%
rename from internal/cnpgi/operator/specs/metadata_test.go
rename to internal/cnpgi/operator/specs/labels_test.go
index bc53a25..a0cca62 100644
--- a/internal/cnpgi/operator/specs/metadata_test.go
+++ b/internal/cnpgi/operator/specs/labels_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
 )
 
-var _ = Describe("GetRequiredLabels", func() {
+var _ = Describe("BuildLabels", func() {
 	It("should return all expected labels for a cluster without an image", func() {
 		cluster := &cnpgv1.Cluster{
 			ObjectMeta: metav1.ObjectMeta{
@@ -37,7 +37,7 @@ var _ = Describe("GetRequiredLabels", func() {
 				Namespace: "default",
 			},
 		}
-		labels := GetRequiredLabels(cluster)
+		labels := BuildLabels(cluster)
 
 		Expect(labels).To(HaveKeyWithValue(metadata.ClusterLabelName, "my-cluster"))
 		Expect(labels).To(HaveKeyWithValue(utils.KubernetesAppLabelName, utils.AppName))
@@ -59,7 +59,7 @@ var _ = Describe("GetRequiredLabels", func() {
 				},
 			},
 		}
-		labels := GetRequiredLabels(cluster)
+		labels := BuildLabels(cluster)
 
 		Expect(labels).To(HaveKeyWithValue(utils.KubernetesAppVersionLabelName, "16"))
 		Expect(labels).To(HaveKeyWithValue(utils.KubernetesAppInstanceLabelName, "pg16-cluster"))
diff --git a/internal/cnpgi/operator/specs/role.go b/internal/cnpgi/operator/specs/role.go
index 86af92d..9d61a7b 100644
--- a/internal/cnpgi/operator/specs/role.go
+++ b/internal/cnpgi/operator/specs/role.go
@@ -40,7 +40,7 @@ func BuildRole(
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: cluster.Namespace,
 			Name:      GetRBACName(cluster.Name),
-			Labels:    GetRequiredLabels(cluster),
+			Labels:    BuildLabels(cluster),
 		},
 		Rules: BuildRoleRules(barmanObjects),
 	}
@@ -128,7 +128,7 @@ func BuildRoleBinding(
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: cluster.Namespace,
 			Name:      GetRBACName(cluster.Name),
-			Labels:    GetRequiredLabels(cluster),
+			Labels:    BuildLabels(cluster),
 		},
 		Subjects: []rbacv1.Subject{
 			{