STAC-23446 Fix logic for checking if global backup is enabled

Author: rb3ckers

cmd/cmdutils/common.go

@@ -19,7 +19,7 @@ func Run(globalFlags *config.CLIGlobalFlags, runFunc func(ctx *app.Context) erro
 		_, _ = fmt.Fprintf(os.Stderr, "❌ Error: %v\n", err)
 		os.Exit(1)
 	}
-	if storageRequired && !appCtx.Config.StorageEnabled() {
+	if storageRequired && !appCtx.Config.GlobalBackupEnabled() {
 		appCtx.Logger.Errorf("commands that interact with S3-compatible storage require SUSE Observability to be deployed with .Values.global.backup.enabled=true")
 		os.Exit(1)
 	}

cmd/elasticsearch/configure_test.go

@@ -417,7 +417,7 @@ storage:
 				assert.NotNil(t, cfg)
 				// Verify storage mode
 				assert.False(t, cfg.IsLegacyMode())
-				assert.True(t, cfg.StorageEnabled())
+				assert.True(t, cfg.GlobalBackupEnabled())
 				assert.NotEmpty(t, cfg.Elasticsearch.SnapshotRepository.AccessKey)
 				assert.NotEmpty(t, cfg.Elasticsearch.SnapshotRepository.SecretKey)
 			}

cmd/elasticsearch/list_indices_test.go

@@ -49,7 +49,7 @@ func TestListIndicesCmd_StorageIntegration(t *testing.T) {
 	assert.Equal(t, "elasticsearch-master", cfg.Elasticsearch.Service.Name)
 	assert.Equal(t, 9200, cfg.Elasticsearch.Service.Port)
 	assert.False(t, cfg.IsLegacyMode())
-	assert.True(t, cfg.StorageEnabled())
+	assert.True(t, cfg.GlobalBackupEnabled())
 	assert.Equal(t, "storage", cfg.GetStorageService().Name)
 }
 

cmd/elasticsearch/list_test.go

@@ -327,7 +327,7 @@ func TestListCmd_StorageIntegration(t *testing.T) {
 	assert.Equal(t, "backup-repo", cfg.Elasticsearch.Restore.Repository)
 	assert.Equal(t, "elasticsearch-master", cfg.Elasticsearch.Service.Name)
 	assert.False(t, cfg.IsLegacyMode())
-	assert.True(t, cfg.StorageEnabled())
+	assert.True(t, cfg.GlobalBackupEnabled())
 	assert.Equal(t, "storage", cfg.GetStorageService().Name)
 }
 

cmd/settings/list.go

@@ -97,7 +97,7 @@ func getAllBackups(appCtx *app.Context) ([]BackupFileInfo, error) {
 	}
 
 	// Get backups from S3 if storage is enabled
-	if appCtx.Config.StorageEnabled() {
+	if appCtx.Config.GlobalBackupEnabled() {
 		if backups, err = getBackupListFromS3(appCtx); err != nil {
 			return nil, fmt.Errorf("failed to get list of backups from S3 storage: %v", err)
 		}

cmd/settings/restore.go

@@ -197,7 +197,7 @@ func buildEnvVar(extraEnvVar []corev1.EnvVar, config *config.Config) []corev1.En
 		{Name: "RECEIVER_BASE_URL", Value: config.Settings.Restore.ReceiverBaseURL},
 		{Name: "PLATFORM_VERSION", Value: config.Settings.Restore.PlatformVersion},
 		{Name: "ZOOKEEPER_QUORUM", Value: config.Settings.Restore.ZookeeperQuorum},
-		{Name: "BACKUP_CONFIGURATION_UPLOAD_REMOTE", Value: strconv.FormatBool(config.StorageEnabled())},
+		{Name: "BACKUP_CONFIGURATION_UPLOAD_REMOTE", Value: strconv.FormatBool(config.GlobalBackupEnabled())},
 	}
 	if fromPVC {
 		// Force PVC mode in the shell script, suppress local bucket

internal/foundation/config/config.go

@@ -32,14 +32,13 @@ func (c *Config) IsLegacyMode() bool {
 	return c.Minio.Service.Name != ""
 }
 
-// StorageEnabled returns true when S3-compatible storage is available,
-// either through legacy Minio (with Enabled=true) or when the new Storage config is used the
-// storage is always enabled
-func (c *Config) StorageEnabled() bool {
+// GlobalBackupEnabled returns true when global backup is enabled,
+// either through legacy Minio (with Enabled=true) or the new Storage config's globalBackupEnabled flag.
+func (c *Config) GlobalBackupEnabled() bool {
 	if c.IsLegacyMode() {
 		return c.Minio.Enabled
 	}
-	return true
+	return c.Storage.GlobalBackupEnabled
 }
 
 // GetStorageService returns the service config for the S3-compatible storage,

internal/foundation/config/config_test.go

@@ -61,7 +61,7 @@ func TestLoadConfig_FromConfigMapOnly(t *testing.T) {
 	assert.Equal(t, "configmap-secret-key", config.Elasticsearch.SnapshotRepository.SecretKey)
 	// Verify legacy mode
 	assert.True(t, config.IsLegacyMode())
-	assert.True(t, config.StorageEnabled())
+	assert.True(t, config.GlobalBackupEnabled())
 }
 
 func TestLoadConfig_Storage_FromConfigMapOnly(t *testing.T) {
@@ -96,14 +96,65 @@ func TestLoadConfig_Storage_FromConfigMapOnly(t *testing.T) {
 	assert.Equal(t, "configmap-secret-key", config.Elasticsearch.SnapshotRepository.SecretKey)
 	// Verify new storage mode (not legacy)
 	assert.False(t, config.IsLegacyMode())
-	assert.True(t, config.StorageEnabled())
+	assert.True(t, config.GlobalBackupEnabled())
 	// Verify storage accessor methods return storage config values
 	assert.Equal(t, "suse-observability-storage", config.GetStorageService().Name)
 	assert.Equal(t, 9000, config.GetStorageService().Port)
 	assert.Equal(t, "storageadmin", config.GetStorageAccessKey())
 	assert.Equal(t, "storageadmin", config.GetStorageSecretKey())
 }
 
+func TestGlobalBackupEnabled_StorageMode_Disabled(t *testing.T) {
+	config := &Config{
+		Storage: StorageConfig{
+			GlobalBackupEnabled: false,
+			Service: ServiceConfig{
+				Name:                 "storage",
+				Port:                 9000,
+				LocalPortForwardPort: 9000,
+			},
+		},
+	}
+
+	assert.False(t, config.IsLegacyMode())
+	assert.False(t, config.GlobalBackupEnabled())
+}
+
+func TestGlobalBackupEnabled_StorageMode_Enabled(t *testing.T) {
+	config := &Config{
+		Storage: StorageConfig{
+			GlobalBackupEnabled: true,
+			Service: ServiceConfig{
+				Name:                 "storage",
+				Port:                 9000,
+				LocalPortForwardPort: 9000,
+			},
+		},
+	}
+
+	assert.False(t, config.IsLegacyMode())
+	assert.True(t, config.GlobalBackupEnabled())
+}
+
+func TestGlobalBackupEnabled_LegacyMode(t *testing.T) {
+	config := &Config{
+		Minio: MinioConfig{
+			Enabled: false,
+			Service: ServiceConfig{
+				Name:                 "minio",
+				Port:                 9000,
+				LocalPortForwardPort: 9000,
+			},
+		},
+	}
+
+	assert.True(t, config.IsLegacyMode())
+	assert.False(t, config.GlobalBackupEnabled())
+
+	config.Minio.Enabled = true
+	assert.True(t, config.GlobalBackupEnabled())
+}
+
 func TestLoadConfig_CompleteConfiguration(t *testing.T) {
 	fakeClient := fake.NewClientset()
 	validConfigYAML := loadTestData(t, "validConfigMapConfig.yaml")
@@ -223,7 +274,7 @@ func TestLoadConfig_Storage_CompleteConfiguration(t *testing.T) {
 
 	// Verify new storage mode (not legacy)
 	assert.False(t, config.IsLegacyMode())
-	assert.True(t, config.StorageEnabled())
+	assert.True(t, config.GlobalBackupEnabled())
 
 	// Service config
 	assert.Equal(t, "suse-observability-elasticsearch-master-headless", config.Elasticsearch.Service.Name)