Additional fixes and cleanups

trento-project · Jul 26, 2021 · 99add59 · 99add59
1 parent 9106f60
commit 99add59
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 27 deletions.
diff --git a/agent/discovery/sapsystem.go b/agent/discovery/sapsystem.go
@@ -73,7 +73,7 @@ func storeSAPSystemTags(client consul.Client, systems sapsystem.SAPSystemsList)
 		landName = land.Name
 	}
 
-	sysNames := systems.GetSIDs()
+	sysNames := systems.GetSIDsString()
 
 	// Store host metadata
 	metadata := hosts.Metadata{

diff --git a/internal/hosts/hosts.go b/internal/hosts/hosts.go
@@ -89,28 +89,21 @@ func (n *Host) HAChecks() *check.Controls {
 	return checks
 }
 
-func (n *Host) GetSAPSystems() (map[string]*sapsystem.SAPSystem, error) {
+func (n *Host) GetSAPSystems() (sapsystem.SAPSystemsMap, error) {
 	systems, err := sapsystem.Load(n.client, n.Name())
 	if err != nil {
 		return nil, err
 	}
 	return systems, nil
 }
 
-func (n *Host) GetSAPSystemsList() (sapsystem.SAPSystemsList, error) {
-	systems, err := sapsystem.Load(n.client, n.Name())
+func (n *Host) GetSIDsString() string {
+	systems, err := n.GetSAPSystems()
 	if err != nil {
-		return nil, err
-	}
-
-	systemsList := make(sapsystem.SAPSystemsList, len(systems))
-	var i int
-	for _, value := range systems {
-		systemsList[i] = value
-		i++
+		return ""
 	}
 
-	return systemsList, nil
+	return systems.GetSIDsString()
 }
 
 // Use github.com/hashicorp/go-bexpr to create the filter

diff --git a/internal/sapsystem/sapsystem.go b/internal/sapsystem/sapsystem.go
@@ -30,6 +30,7 @@ const (
 )
 
 type SAPSystemsList []*SAPSystem
+type SAPSystemsMap map[string]*SAPSystem
 
 // A SAPSystem in this context is a SAP installation under one SID.
 // It will have application or database type, mutually exclusive
@@ -77,17 +78,24 @@ type CustomCommand func(name string, arg ...string) *exec.Cmd
 
 var customExecCommand CustomCommand = exec.Command
 
-func (systems SAPSystemsList) GetSIDs() string {
-	var sysNames string
-	for i, system := range systems {
-		separator := ","
-		if i < 1 {
-			separator = ""
-		}
-		sysNames = strings.Join([]string{sysNames, system.SID}, separator)
+func (sm SAPSystemsMap) GetSIDsString() string {
+	var sidString []string
+
+	for _, system := range sm {
+		sidString = append(sidString, system.SID)
+	}
+
+	return strings.Join(sidString, ",")
+}
+
+func (sl SAPSystemsList) GetSIDsString() string {
+	var sidString []string
+
+	for _, system := range sl {
+		sidString = append(sidString, system.SID)
 	}
 
-	return sysNames
+	return strings.Join(sidString, ",")
 }
 
 func NewSAPSystemsList() (SAPSystemsList, error) {

diff --git a/web/layout.go b/web/layout.go
@@ -7,6 +7,7 @@ import (
 	"io/fs"
 	"net/http"
 	"path/filepath"
+	"strings"
 
 	log "github.com/sirupsen/logrus"
 
@@ -149,6 +150,9 @@ func (r *LayoutRender) addFileFromFS(templatesFS fs.FS, file string) {
 			return a + b
 		},
 		"markdown": markdownToHTML,
+		"split": func(s string, sep string) []string {
+			return strings.Split(s, sep)
+		},
 	})
 	patterns := append([]string{r.root, file}, r.blocks...)
 	tmpl = template.Must(tmpl.ParseFS(templatesFS, patterns...))

diff --git a/web/templates/blocks/hosts_table.html.tmpl b/web/templates/blocks/hosts_table.html.tmpl
@@ -33,9 +33,9 @@
                         </a>
                     </td>
                     <td>
-                        {{- range $i, $v := .GetSAPSystemsList }}{{- if $i }},{{- end }}
-                            <a href='/sapsystems/{{ .SID }}?environment={{ index $TrentoMeta "trento-sap-environment" }}&landscape={{ index $TrentoMeta "trento-sap-landscape" }}'>
-                                {{ $v.SID }}
+                        {{- range $i, $v := split .GetSIDsString "," }}{{- if $i }},{{- end }}
+                            <a href='/sapsystems/{{ $v }}?environment={{ index $TrentoMeta "trento-sap-environment" }}&landscape={{ index $TrentoMeta "trento-sap-landscape" }}'>
+                                {{ $v }}
                             </a>
                         {{- end }}
                     </td>

diff --git a/web/templates/host.html.tmpl b/web/templates/host.html.tmpl
@@ -13,8 +13,8 @@
             <dd class="inline"><a href="/landscapes/{{ $Land }}?environment={{ $Env }}">{{ $Land }}</a></dd>
             <dt class="inline">SAP System</dt>
             <dd class="inline">
-                {{- range $i, $v := .Host.GetSAPSystemsList }}{{- if $i }},{{- end }} <a
-                        href="/sapsystems/{{ $v.SID }}?environment={{ $Env }}&landscape={{ $Land }}">{{ $v.SID }}</a>{{- end }}
+                {{- range $i, $v := split (.Host).GetSIDsString ","}}{{- if $i }},{{- end }} <a
+                        href="/sapsystems/{{ $v }}?environment={{ $Env }}&landscape={{ $Land }}">{{ $v }}</a>{{- end }}
             </dd>
 
             <dt class="inline">Cluster</dt>