chore(deps): Bump mdast-util-to-hast from 13.2.0 to 13.2.1 in /web

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Install Dagger
         env:
           # renovate: datasource=github-tags depName=dagger/dagger versioning=semver
-          DAGGER_VERSION: 0.18.5
+          DAGGER_VERSION: 0.18.10
         run: |
           curl -L https://dl.dagger.io/dagger/install.sh | BIN_DIR=$HOME/.local/bin sh
       - name: Run CI task

.github/workflows/release-please.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install Dagger
         env:
           # renovate: datasource=github-tags depName=dagger/dagger versioning=semver
-          DAGGER_VERSION: 0.18.5
+          DAGGER_VERSION: 0.18.10
         run: |
           curl -L https://dl.dagger.io/dagger/install.sh | BIN_DIR=$HOME/.local/bin sh
       - name: Create image and manifest

.github/workflows/release-publish.yml

@@ -3,7 +3,9 @@ on:
   release:
     types: [published]
 
-permissions: read-all
+permissions:
+  contents: read
+  packages: write
 
 jobs:
   release-publish-artifacts:
@@ -21,7 +23,7 @@ jobs:
       - name: Install Dagger
         env:
           # renovate: datasource=github-tags depName=dagger/dagger versioning=semver
-          DAGGER_VERSION: 0.18.5
+          DAGGER_VERSION: 0.18.10
         run: |
           curl -L https://dl.dagger.io/dagger/install.sh | BIN_DIR=$HOME/.local/bin sh
       - name: Create image and manifest

.golangci.yml

@@ -78,7 +78,7 @@ formatters:
       sections:
         - standard
         - default
-        - prefix(github.com/cloudnative-pg/plugin-barman-cloud)
+        - prefix(github.com/edkadigital/plugin-barman-cloud)
         - blank
         - dot
   exclusions:

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.5.0"
+  ".": "0.6.0"
 }

Makefile

@@ -80,11 +80,11 @@ lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes
 
 .PHONY: build
 build: manifests generate fmt vet ## Build manager binary.
-	go build -o bin/manager cmd/main.go
+	go build -o bin/manager cmd/manager/main.go
 
 .PHONY: run
 run: manifests generate fmt vet ## Run a controller from your host.
-	go run ./cmd/main.go
+	go run ./cmd/manager/main.go
 
 # If you wish to build the manager image targeting other platforms you can use the --platform flag.
 # (i.e. docker build --platform linux/arm64). However, you must enable docker buildKit for it.
@@ -159,9 +159,9 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.4.3
-CONTROLLER_TOOLS_VERSION ?= v0.16.1
+CONTROLLER_TOOLS_VERSION ?= v0.18.0
 ENVTEST_VERSION ?= release-0.19
-GOLANGCI_LINT_VERSION ?= v1.64.8
+GOLANGCI_LINT_VERSION ?= v1.62.2
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

PROJECT

@@ -6,7 +6,7 @@ domain: cnpg.io
 layout:
 - go.kubebuilder.io/v4
 projectName: plugin-barman-cloud
-repo: github.com/cloudnative-pg/plugin-barman-cloud
+repo: github.com/edkadigital/plugin-barman-cloud
 resources:
 - api:
     crdVersion: v1
@@ -15,6 +15,6 @@ resources:
   domain: cnpg.io
   group: barmancloud
   kind: ObjectStore
-  path: github.com/cloudnative-pg/plugin-barman-cloud/api/v1
+  path: github.com/edkadigital/plugin-barman-cloud/api/v1
   version: v1
 version: "3"

Taskfile.yml

@@ -201,7 +201,7 @@ tasks:
       - start-build-network
     vars:
       # renovate: datasource=github-tags depName=dagger/dagger versioning=semver
-      DAGGER_VERSION: 0.18.5
+      DAGGER_VERSION: 0.18.10
       DAGGER_ENGINE_IMAGE: registry.dagger.io/engine:v{{ .DAGGER_VERSION }}
     cmds:
       - >
@@ -402,7 +402,7 @@ tasks:
       - controller-gen
     desc: Generate the manifest for the main branch
     vars:
-      GITHUB_REPOSITORY: cloudnative-pg/plugin-barman-cloud
+      GITHUB_REPOSITORY: edkadigital/plugin-barman-cloud
       GITHUB_REF: main
       GITHUB_REF_NAME: main
     cmds:

api/v1/objectstore_types.go

@@ -75,6 +75,12 @@ type RecoveryWindow struct {
 
 	// The last successful backup time
 	LastSuccessfulBackupTime *metav1.Time `json:"lastSuccussfulBackupTime,omitempty"`
+
+	// The timestamp of the first WAL file successfully submitted to the object store
+	FirstWALSubmissionTime *metav1.Time `json:"firstWALSubmissionTime,omitempty"`
+
+	// The timestamp of the last WAL file successfully submitted to the object store
+	LastWALSubmissionTime *metav1.Time `json:"lastWALSubmissionTime,omitempty"`
 }
 
 // +kubebuilder:object:root=true

cmd/manager/main.go

@@ -10,10 +10,10 @@ import (
 	"github.com/spf13/cobra"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cmd/healthcheck"
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cmd/instance"
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cmd/operator"
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cmd/restore"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cmd/healthcheck"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cmd/instance"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cmd/operator"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cmd/restore"
 )
 
 func main() {

config/crd/bases/barmancloud.cnpg.io_objectstores.yaml

@@ -609,10 +609,20 @@ spec:
                         restored.
                       format: date-time
                       type: string
+                    firstWALSubmissionTime:
+                      description: The timestamp of the first WAL file successfully
+                        submitted to the object store
+                      format: date-time
+                      type: string
                     lastSuccussfulBackupTime:
                       description: The last successful backup time
                       format: date-time
                       type: string
+                    lastWALSubmissionTime:
+                      description: The timestamp of the last WAL file successfully
+                        submitted to the object store
+                      format: date-time
+                      type: string
                   type: object
                 description: ServerRecoveryWindow maps each server to its recovery
                   window

go.mod

@@ -1,4 +1,4 @@
-module github.com/cloudnative-pg/plugin-barman-cloud
+module github.com/edkadigital/plugin-barman-cloud
 
 go 1.24.1
 

internal/cmd/healthcheck/main.go

@@ -11,7 +11,7 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/health/grpc_health_v1"
 
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
 )
 
 // NewCmd returns the healthcheck command

internal/cmd/instance/main.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/instance"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/instance"
 )
 
 // NewCmd creates a new instance command

internal/cmd/operator/main.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator"
 )
 
 // NewCmd creates a new operator command

internal/cmd/restore/main.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/restore"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/restore"
 )
 
 // NewCmd creates the "restore" subcommand

internal/cnpgi/common/common.go

@@ -7,7 +7,7 @@ import (
 
 	barmanapi "github.com/cloudnative-pg/barman-cloud/pkg/api"
 
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
 )
 
 // TODO: refactor.

internal/cnpgi/common/wal.go

@@ -17,12 +17,13 @@ import (
 	walUtils "github.com/cloudnative-pg/machinery/pkg/fileutils/wals"
 	"github.com/cloudnative-pg/machinery/pkg/log"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config"
+	barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config"
 )
 
 // ErrMissingPermissions is raised when the sidecar has no
@@ -184,6 +185,12 @@ func (w WALServiceImplementation) Archive(
 		}
 	}
 
+	// Update WAL submission timing in ObjectStore status after successful archiving
+	if err := w.updateWALSubmissionTime(ctx, &objectStore, configuration.ServerName); err != nil {
+		contextLogger.Error(err, "failed to update WAL submission time in ObjectStore status")
+		// Don't fail the archiving operation for status update errors
+	}
+
 	return &wal.WALArchiveResult{}, nil
 }
 
@@ -469,3 +476,30 @@ func isEndOfWALStream(results []barmanRestorer.Result) bool {
 
 	return false
 }
+
+// updateWALSubmissionTime updates the WAL submission timing in the ObjectStore status
+func (w WALServiceImplementation) updateWALSubmissionTime(
+	ctx context.Context,
+	objectStore *barmancloudv1.ObjectStore,
+	serverName string,
+) error {
+	now := metav1.NewTime(time.Now())
+
+	if objectStore.Status.ServerRecoveryWindow == nil {
+		objectStore.Status.ServerRecoveryWindow = make(map[string]barmancloudv1.RecoveryWindow)
+	}
+
+	recoveryWindow := objectStore.Status.ServerRecoveryWindow[serverName]
+
+	// Set first WAL submission time if not already set
+	if recoveryWindow.FirstWALSubmissionTime == nil {
+		recoveryWindow.FirstWALSubmissionTime = &now
+	}
+
+	// Always update last WAL submission time
+	recoveryWindow.LastWALSubmissionTime = &now
+
+	objectStore.Status.ServerRecoveryWindow[serverName] = recoveryWindow
+
+	return w.Client.Status().Update(ctx, objectStore)
+}

internal/cnpgi/instance/backup.go

@@ -16,9 +16,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common"
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config"
+	barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/common"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config"
 )
 
 // BackupServiceImplementation is the implementation

internal/cnpgi/instance/identity.go

@@ -6,7 +6,7 @@ import (
 	"github.com/cloudnative-pg/cnpg-i/pkg/identity"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
+	"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
 )
 
 // IdentityImplementation implements IdentityServer

internal/cnpgi/instance/internal/client/client_test.go

@@ -9,7 +9,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
-	v1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
+	v1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

internal/cnpgi/instance/manager.go

@@ -17,8 +17,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 
-	barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
-	extendedclient "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/instance/internal/client"
+	barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
+	extendedclient "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/instance/internal/client"
 )
 
 // Start starts the sidecar informers and CNPG-i server