diff --git a/buildscripts/rebrand-guard/compat-baseline.json b/buildscripts/rebrand-guard/compat-baseline.json index 84ee7a4bc..8ae0f32dc 100644 --- a/buildscripts/rebrand-guard/compat-baseline.json +++ b/buildscripts/rebrand-guard/compat-baseline.json @@ -631,6 +631,7 @@ "x-minio-replication-encrypted-multipart", "x-minio-replication-ready", "x-minio-replication-reset-status", + "x-minio-replication-server-side-encryption", "x-minio-replication-server-side-encryption-iv", "x-minio-replication-server-side-encryption-seal-algorithm", "x-minio-replication-server-side-encryption-sealed-key", diff --git a/cmd/replication-ssec-retransmit_test.go b/cmd/replication-ssec-retransmit_test.go index bbb8712b9..8d4186627 100644 --- a/cmd/replication-ssec-retransmit_test.go +++ b/cmd/replication-ssec-retransmit_test.go @@ -30,6 +30,7 @@ import ( "github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/crypto" xhttp "github.com/minio/minio/internal/http" + "github.com/minio/sio" ) // TestAPISSECReplicationTargetHead pins what the replication sender's target @@ -549,6 +550,7 @@ func testAPISSECReplicaRetransmitOverExistingVersion(obj ObjectLayer, instanceTy } assertRetransmittedVersion(t, obj, apiRouter, credentials, bucketName, object, srcInfo.VersionID, "retransmit=multipart", data, sseHeaders) }) + } // assertRetransmittedVersion checks that a retransmit landed on the addressed @@ -1718,8 +1720,15 @@ func testReplicaLockReconcileNullVersion(obj ObjectLayer, instanceType, bucketNa if err != nil { t.Fatal(err) } + // PutObjectPart now validates the DARE stream length (#119). This + // object-layer fixture needs an encrypted body before it can exercise + // the completion-time null-version metadata reconciliation. + var ciphertext bytes.Buffer + if _, err := sio.Encrypt(&ciphertext, bytes.NewReader([]byte("data")), sio.Config{Key: bytes.Repeat([]byte{1}, 32)}); err != nil { + t.Fatal(err) + } part, err := obj.PutObjectPart(ctx, bucketName, object, res.UploadID, 1, - mustGetPutObjReader(t, bytes.NewReader([]byte("data")), 4, "", ""), ObjectOptions{}) + mustGetPutObjReader(t, bytes.NewReader(ciphertext.Bytes()), int64(ciphertext.Len()), "", ""), ObjectOptions{}) if err != nil { t.Fatal(err) }