Merge branch 'main' into K8SPSMDB-1491-incremental-backup

Author: valmiranogueira

pkg/controller/perconaservermongodb/pbm.go

@@ -13,6 +13,7 @@ import (
 	"github.com/pkg/errors"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
+	"gopkg.in/yaml.v3"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
@@ -130,7 +131,7 @@ func (r *ReconcilePerconaServerMongoDB) reconcilePBMConfig(ctx context.Context,
 		return strings.Compare(a.Name, b.Name)
 	})
 
-	hash, err := hashPBMConfiguration(c)
+	hash, err := hashPBMConfiguration(c, cr)
 	if err != nil {
 		return errors.Wrap(err, "hash config")
 	}
@@ -196,12 +197,20 @@ func (r *ReconcilePerconaServerMongoDB) reconcilePBMConfig(ctx context.Context,
 	return nil
 }
 
-func hashPBMConfiguration(c []config.Config) (string, error) {
+func hashPBMConfiguration(c []config.Config, cr *psmdbv1.PerconaServerMongoDB) (string, error) {
+	// Use YAML marshaller so that even credentials are included
+	if cr.CompareVersion("1.22.0") >= 0 {
+		v, err := yaml.Marshal(c)
+		if err != nil {
+			return "", err
+		}
+		return sha256Hash(v), nil
+	}
+	// Use JSON for versions prior to 1.22.0
 	v, err := json.Marshal(c)
 	if err != nil {
 		return "", err
 	}
-
 	return sha256Hash(v), nil
 }
 

pkg/controller/perconaservermongodb/pbm_test.go

@@ -10,6 +10,9 @@ import (
 	"github.com/percona/percona-backup-mongodb/pbm/storage/gcs"
 	"github.com/percona/percona-backup-mongodb/pbm/storage/mio"
 	"github.com/percona/percona-backup-mongodb/pbm/storage/s3"
+	"github.com/stretchr/testify/require"
+
+	psmdbv1 "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
 )
 
 func TestIsResyncNeeded(t *testing.T) {
@@ -431,3 +434,32 @@ func TestIsResyncNeeded(t *testing.T) {
 		})
 	}
 }
+
+func TestHashPBMConfiguration(t *testing.T) {
+	t.Run("updating credentials changes hash", func(t *testing.T) {
+		cr := &psmdbv1.PerconaServerMongoDB{Spec: psmdbv1.PerconaServerMongoDBSpec{CRVersion: "1.22.0"}}
+		cfg := []config.Config{
+			{
+				Name: "test",
+				Storage: config.StorageConf{
+					S3: &s3.Config{
+						Bucket:      "operator-testing",
+						Region:      "us-east-1",
+						EndpointURL: "https://s3.amazonaws.com",
+						Prefix:      "prefix",
+					},
+				},
+			},
+		}
+		hash1, err := hashPBMConfiguration(cfg, cr)
+		require.NoError(t, err)
+
+		cfg[0].Storage.S3.Credentials = s3.Credentials{
+			AccessKeyID:     "some-access-key",
+			SecretAccessKey: "some-secret-key",
+		}
+		hash2, err := hashPBMConfiguration(cfg, cr)
+		require.NoError(t, err)
+		require.NotEqual(t, hash1, hash2)
+	})
+}