[apricot] implementation of GetRuntimeEntries rpc call

AliceO2Group · Feb 15, 2024 · c2320f2 · c2320f2
1 parent 4875f84
commit c2320f2
Show file tree

Hide file tree

Showing 9 changed files with 587 additions and 371 deletions.
diff --git a/apricot/cacheproxy/service.go b/apricot/cacheproxy/service.go
@@ -49,6 +49,10 @@ func (s Service) SetRuntimeEntry(component string, key string, value string) err
 	return s.base.SetRuntimeEntry(component, key, value)
 }
 
+func (s Service) GetRuntimeEntries(component string) (map[string]string, error) {
+	return s.base.GetRuntimeEntries(component)
+}
+
 func (s Service) ListRuntimeEntries(component string) ([]string, error) {
 	return s.base.ListRuntimeEntries(component)
 }

diff --git a/apricot/config.go b/apricot/config.go
@@ -53,6 +53,7 @@ func setFlags() error {
 	pflag.String("backendUri", viper.GetString("backendUri"), "URI of the Consul server or YAML configuration file")
 	pflag.Bool("verbose", viper.GetBool("verbose"), "Verbose logging")
 	pflag.Bool("trimSpaceInVarsFromConsulKV", viper.GetBool("trimSpaceInVarsFromConsulKV"), "When true, the variables imported from the Consul KV are trimmed if the contain whitespaces")
+	pflag.String("workingDir", viper.GetString("workingDir"), "Working directory for apricot")
 
 	pflag.Parse()
 	return viper.BindPFlags(pflag.CommandLine)

diff --git a/apricot/local/service.go b/apricot/local/service.go
@@ -45,6 +45,7 @@ import (
 	"github.com/AliceO2Group/Control/configuration/componentcfg"
 	"github.com/AliceO2Group/Control/configuration/template"
 	"github.com/flosch/pongo2/v6"
+	"github.com/hashicorp/go-multierror"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )
@@ -477,6 +478,26 @@ func (s *Service) SetRuntimeEntry(component string, key string, value string) er
 	}
 }
 
+func (s *Service) GetRuntimeEntries(component string) (map[string]string, error) {
+	s.logMethod()
+
+	if keys, err := s.ListRuntimeEntries(component); err == nil {
+		var keysErrors *multierror.Error
+		entries := make(map[string]string)
+		for _, key := range keys {
+			if entry, err := s.GetRuntimeEntry(component, key); err == nil {
+				entries[key] = entry
+			} else {
+				keysErrors = multierror.Append(keysErrors, err)
+			}
+		}
+		return entries, keysErrors.ErrorOrNil()
+	} else {
+		return nil, err
+	}
+
+}
+
 func (s *Service) ListRuntimeEntries(component string) ([]string, error) {
 	s.logMethod()