From 0146e599ff3bdee75f8acd0b1bb645b7b757e6d8 Mon Sep 17 00:00:00 2001 From: Joel Rieke Date: Wed, 3 Jul 2024 14:58:41 -0700 Subject: [PATCH] Propagate servicesWanted if provided... overriding as necessary. --- pkg/cli/trcconfigbase/trcconfig.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/cli/trcconfigbase/trcconfig.go b/pkg/cli/trcconfigbase/trcconfig.go index 7f1a7f8d8..f1549e57f 100644 --- a/pkg/cli/trcconfigbase/trcconfig.go +++ b/pkg/cli/trcconfigbase/trcconfig.go @@ -342,9 +342,8 @@ func CommonMain(envDefaultPtr *string, } } - services := []string{} if *servicesWanted != "" { - services = strings.Split(*servicesWanted, ",") + driverConfigBase.ServicesWanted = strings.Split(*servicesWanted, ",") } regions := []string{} @@ -438,7 +437,7 @@ func CommonMain(envDefaultPtr *string, EnvBasis: eUtils.GetEnvBasis(*envPtr), Regions: regions, SecretMode: *secretMode, - ServicesWanted: services, + ServicesWanted: driverConfigBase.ServicesWanted, StartDir: driverConfigBase.StartDir, EndDir: driverConfigBase.EndDir, WantKeystore: *keyStorePtr, @@ -494,7 +493,7 @@ func CommonMain(envDefaultPtr *string, EnvBasis: eUtils.GetEnvBasis(*envPtr), Regions: regions, SecretMode: *secretMode, - ServicesWanted: services, + ServicesWanted: driverConfigBase.ServicesWanted, StartDir: driverConfigBase.StartDir, EndDir: driverConfigBase.EndDir, WantKeystore: *keyStorePtr,