fix: avoid injecting the plugin environment into the PG container (#62)

Signed-off-by: Leonardo Cecchi <[email protected]>

Author: leonardoce

internal/cnpgi/operator/config/config.go

@@ -44,7 +44,9 @@ func (e *ConfigurationError) IsEmpty() bool {
 
 // PluginConfiguration is the configuration of the plugin
 type PluginConfiguration struct {
-	BarmanObjectName string
+	BarmanObjectName         string
+	RecoveryBarmanObjectName string
+	RecoveryBarmanServerName string
 }
 
 // NewFromCluster extracts the configuration from the cluster
@@ -54,22 +56,50 @@ func NewFromCluster(cluster *cnpgv1.Cluster) *PluginConfiguration {
 		metadata.PluginName,
 	)
 
+	recoveryServerName := ""
+	recoveryBarmanObjectName := ""
+
+	if recoveryParameters := getRecoveryParameters(cluster); recoveryParameters != nil {
+		recoveryBarmanObjectName = recoveryParameters["barmanObjectName"]
+		recoveryServerName = recoveryParameters["serverName"]
+		if len(recoveryServerName) == 0 {
+			recoveryServerName = cluster.Name
+		}
+	}
+
 	result := &PluginConfiguration{
 		// used for the backup/archive
 		BarmanObjectName: helper.Parameters["barmanObjectName"],
+		// used for restore/wal_restore
+		RecoveryBarmanServerName: recoveryServerName,
+		RecoveryBarmanObjectName: recoveryBarmanObjectName,
 	}
 
 	return result
 }
 
+func getRecoveryParameters(cluster *cnpgv1.Cluster) map[string]string {
+	recoveryPluginConfiguration := cluster.GetRecoverySourcePlugin()
+	if recoveryPluginConfiguration == nil {
+		return nil
+	}
+
+	if recoveryPluginConfiguration.Name != metadata.PluginName {
+		return nil
+	}
+
+	return recoveryPluginConfiguration.Parameters
+}
+
 // Validate checks if the barmanObjectName is set
 func (p *PluginConfiguration) Validate() error {
 	err := NewConfigurationError()
-	if len(p.BarmanObjectName) != 0 {
-		return nil
+
+	if len(p.BarmanObjectName) == 0 && len(p.RecoveryBarmanObjectName) == 0 {
+		return err.WithMessage("no reference to barmanObjectName have been included")
 	}
 
-	return err.WithMessage("Missing barmanObjectName parameter")
+	return nil
 }
 
 // Plugin represents a plugin with its associated cluster and parameters.

internal/cnpgi/restore/restore.go

@@ -160,7 +160,7 @@ func (impl JobHookImpl) Restore(
 	contextLogger.Info("sending restore response", "config", config, "env", env)
 	return &restore.RestoreResponse{
 		RestoreConfig: config,
-		Envs:          env,
+		Envs:          nil,
 	}, nil
 }