Merge eefb45ca5a into 0111ed9f4d

chore: update serialize-javascript package to >= 7.0.5 (#866 )
Signed-off-by: Jonathan Gonzalez V. <jonathan.gonzalez@enterprisedb.com>
2026-07-09 11:12:21 +02:00 · 2026-04-21 12:35:40 +02:00 · 2026-04-21 10:44:56 +02:00 · 2026-04-20 17:13:03 +02:00 · 2026-02-03 15:01:30 -03:00
3 changed files with 41 additions and 39 deletions
--- a/internal/cnpgi/instance/recovery_window.go
+++ b/internal/cnpgi/instance/recovery_window.go
@ -33,7 +33,8 @@ import (
 )

 // updateRecoveryWindow updates the recovery window inside the object
-// store status subresource
+// store status subresource. It uses retry logic to handle concurrent
+// updates from backup completion and retention policy enforcement.
 func updateRecoveryWindow(
 	ctx context.Context,
 	c client.Client,
@ -41,24 +42,33 @@ func updateRecoveryWindow(
 	objectStore *barmancloudv1.ObjectStore,
 	serverName string,
 ) error {
-	// Set the recovery window inside the barman object store object
-	convertTime := func(t *time.Time) *metav1.Time {
-		if t == nil {
-			return nil
+	objectStoreKey := client.ObjectKeyFromObject(objectStore)
+
+	return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
+		var freshObjectStore barmancloudv1.ObjectStore
+		if err := c.Get(ctx, objectStoreKey, &freshObjectStore); err != nil {
+			return err
 		}
-		return ptr.To(metav1.NewTime(*t))
-	}

-	recoveryWindow := objectStore.Status.ServerRecoveryWindow[serverName]
-	recoveryWindow.FirstRecoverabilityPoint = convertTime(backupList.GetFirstRecoverabilityPoint())
-	recoveryWindow.LastSuccessfulBackupTime = convertTime(backupList.GetLastSuccessfulBackupTime())
+		// Set the recovery window inside the barman object store object
+		convertTime := func(t *time.Time) *metav1.Time {
+			if t == nil {
+				return nil
+			}
+			return ptr.To(metav1.NewTime(*t))
+		}

-	if objectStore.Status.ServerRecoveryWindow == nil {
-		objectStore.Status.ServerRecoveryWindow = make(map[string]barmancloudv1.RecoveryWindow)
-	}
-	objectStore.Status.ServerRecoveryWindow[serverName] = recoveryWindow
+		recoveryWindow := freshObjectStore.Status.ServerRecoveryWindow[serverName]
+		recoveryWindow.FirstRecoverabilityPoint = convertTime(backupList.GetFirstRecoverabilityPoint())
+		recoveryWindow.LastSuccessfulBackupTime = convertTime(backupList.GetLastSuccessfulBackupTime())

-	return c.Status().Update(ctx, objectStore)
+		if freshObjectStore.Status.ServerRecoveryWindow == nil {
+			freshObjectStore.Status.ServerRecoveryWindow = make(map[string]barmancloudv1.RecoveryWindow)
+		}
+		freshObjectStore.Status.ServerRecoveryWindow[serverName] = recoveryWindow
+
+		return c.Status().Update(ctx, &freshObjectStore)
+	})
 }

 // setLastFailedBackupTime sets the last failed backup time in the
--- a/web/package.json
+++ b/web/package.json
@ -43,9 +43,10 @@
    ]
  },
  "engines": {
-    "node": ">=18.0"
+    "node": ">=20.0.0"
  },
  "resolutions": {
-    "webpackbar": "^7.0.0"
+    "webpackbar": "^7.0.0",
+    "serialize-javascript": ">=7.0.5"
  }
 }
--- a/web/yarn.lock
+++ b/web/yarn.lock
@ -3389,12 +3389,12 @@ array-union@^2.1.0:
  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==

 asn1js@^3.0.6:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-3.0.7.tgz#15f1f2f59e60f80d5b43ef14047a294a969f824f"
-  integrity sha512-uLvq6KJu04qoQM6gvBfKFjlh6Gl0vOKQuR5cJMDHQkmwfMOQeN3F3SHCv9SNYSL+CRoHvOGFfllDlVz03GQjvQ==
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-3.0.10.tgz#df26c874c8a8b41ca605efea47b2ad07551013dd"
+  integrity sha512-S2s3aOytiKdFRdulw2qPE51MzjzVOisppcVv7jVFR+Kw0kxwvFrDcYA0h7Ndqbmj0HkMIXYWaoj7fli8kgx1eg==
  dependencies:
    pvtsutils "^1.3.6"
-    pvutils "^1.1.3"
+    pvutils "^1.1.5"
    tslib "^2.8.1"

 astring@^1.8.0:
@ -5849,9 +5849,9 @@ json5@^2.1.2, json5@^2.2.3:
  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==

 jsonfile@^6.0.1:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.2.0.tgz#7c265bd1b65de6977478300087c99f1c84383f62"
-  integrity sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.2.1.tgz#b6e31717f22cc37330b081ce0051ed5de53af2f6"
+  integrity sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==
  dependencies:
    universalify "^2.0.0"
  optionalDependencies:
@ -7832,7 +7832,7 @@ pvtsutils@^1.3.6:
  dependencies:
    tslib "^2.8.1"

-pvutils@^1.1.3:
+pvutils@^1.1.3, pvutils@^1.1.5:
  version "1.1.5"
  resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.5.tgz#84b0dea4a5d670249aa9800511804ee0b7c2809c"
  integrity sha512-KTqnxsgGiQ6ZAzZCVlJH5eOjSnvlyEgx1m8bkRJfOhmGRqfo5KLvmAlACQkrjEtOQ4B7wF9TdSLIs9O90MX9xA==
@ -7854,13 +7854,6 @@ quick-lru@^5.1.1:
  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==

-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
 range-parser@1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
@ -8296,7 +8289,7 @@ run-parallel@^1.1.9:
  dependencies:
    queue-microtask "^1.2.2"

-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@~5.2.0:
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@ -8402,12 +8395,10 @@ send@~0.19.0, send@~0.19.1:
    range-parser "~1.2.1"
    statuses "~2.0.2"

-serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
-  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
-  dependencies:
-    randombytes "^2.1.0"
+serialize-javascript@>=7.0.5, serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-7.0.5.tgz#c798cc0552ffbb08981914a42a8756e339d0d5b1"
+  integrity sha512-F4LcB0UqUl1zErq+1nYEEzSHJnIwb3AF2XWB94b+afhrekOUijwooAYqFyRbjYkm2PAKBabx6oYv/xDxNi8IBw==

 serve-handler@^6.1.7:
  version "6.1.7"
Author	SHA1	Message	Date
Gabriel José Mouallem Rodrigues	fe3b6feb3a	Merge `eefb45ca5a` into `0111ed9f4d`	2026-04-21 12:35:40 +02:00
Jonathan Gonzalez V.	0111ed9f4d	chore: update serialize-javascript package to >= 7.0.5 (#866 ) Some checks failed Deploy Docusaurus to GitHub Pages / build (push) Failing after 4s Details Deploy Docusaurus to GitHub Pages / deploy (push) Has been skipped Details release-please / release-please (push) Failing after 2s Details Signed-off-by: Jonathan Gonzalez V. <jonathan.gonzalez@enterprisedb.com>	2026-04-21 10:44:56 +02:00
renovate[bot]	742a0c0810	chore(deps): lock file maintenance (#864 ) Some checks failed Deploy Docusaurus to GitHub Pages / build (push) Failing after 3s Details Deploy Docusaurus to GitHub Pages / deploy (push) Has been skipped Details release-please / release-please (push) Failing after 2s Details This PR contains the following updates: \| Update \| Change \| \|---\|---\| \| lockFileMaintenance \| All locks refreshed \| --- > [!WARNING] > Some dependencies could not be looked up. Check the [Dependency Dashboard](../issues/7) for more information. 🔧 This Pull Request updates lock files to use the latest dependency versions. --- ### Configuration 📅 Schedule: (UTC) - Branch creation - "before 4am on monday" - Automerge - At any time (no schedule defined) 🚦 Automerge: Enabled. ♻ Rebasing: Never, or you tick the rebase/retry checkbox. 👻 Immortal: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/cloudnative-pg/plugin-barman-cloud). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4xMjMuOCIsInVwZGF0ZWRJblZlciI6IjQzLjEyMy44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJhdXRvbWF0ZWQiLCJuby1pc3N1ZSJdfQ==--> Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-20 17:13:03 +02:00
Gabriel Jose Mouallem Rodrigues	eefb45ca5a	fix: add retry logic to updateRecoveryWindow for concurrent status updates When backup completion and retention policy enforcement run concurrently, both call updateRecoveryWindow to update the ObjectStore status. This can cause "object has been modified" errors due to Kubernetes optimistic concurrency control. This change wraps the status update in retry.RetryOnConflict, matching the pattern already used in setLastFailedBackupTime in the same file. The retry logic fetches a fresh copy of the ObjectStore before each update attempt, ensuring the resourceVersion is current. Fixes #758 Signed-off-by: Gabriel Mouallem <gabriel@latitude.sh>	2026-02-03 15:01:30 -03:00