amery/jpictl
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

zones: Env: allow multiple gateways and drop unused ZONE{zoneID}_IP #4

Merged
amery merged 3 commits from pr-amery-env into main 2023-08-28 18:09:00 +02:00
Conversation 3 Commits 3 Files Changed 1
+39 -44
1 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/zones/env.go
+39 -44
View File
@@ -22,11 +22,23 @@ func (m *Zones) Env(export bool) *Env {
}
}
// Zones returns the list of Zone IDs
func (m *Env) Zones() []int {
var zones []int
m.ForEachZone(func(z *Zone) bool {
zones = append(zones, z.ID)
return false
})
return zones
}
// WriteTo generates environment variables for shell scripts
func (m *Env) WriteTo(w io.Writer) (int64, error) {
var buf bytes.Buffer
m.writeEnvVarFn(&buf, genEnvZones, "ZONES")
m.writeEnvVarInts(&buf, m.Zones(), "ZONES")
m.ForEachZone(func(z *Zone) bool {
m.writeEnvZone(&buf, z)
return false
@@ -45,25 +57,27 @@ func (m *Env) writeEnvZone(w io.Writer, z *Zone) {
m.writeEnvVar(w, z.Name, "ZONE%v_%s", zoneID, "NAME")
// ZONE{zoneID}_GW
gatewayID := getRingZeroGatewayID(z)
if gatewayID > 0 {
m.writeEnvVar(w, fmt.Sprintf("%v", gatewayID), "ZONE%v_%s", zoneID, "GW")
// ZONE{zoneID}_IP
if ip, ok := RingZeroAddress(zoneID, gatewayID); ok {
m.writeEnvVar(w, ip.String(), "ZONE%v_%s", zoneID, "IP")
}
}
gateways, _ := z.GatewayIDs()
m.writeEnvVarInts(w, gateways, "ZONE%v_%s", zoneID, "GW")
}
func (m *Env) writeEnvVarFn(w io.Writer, fn func(*Env) string, name string, args ...any) {
var value string
func (m *Env) writeEnvVarInts(w io.Writer, value []int, name string, args ...any) {
var s string
if fn != nil {
value = fn(m)
if n := len(value); n > 0 {
var buf bytes.Buffer
amery marked this conversation as resolved Outdated
karasz commented 2023-08-28 17:54:30 +02:00
Outdated
Review
Copy Link
Copy Source

I would make it like:

if n := len(value); n > 0 {
	var buffer bytes.Buffer
    for i, v := range value {
    	buffer.WriteString(fmt.Sprintf("%v", v))
    }
}
I would make it like: ```go if n := len(value); n > 0 { var buffer bytes.Buffer for i, v := range value { buffer.WriteString(fmt.Sprintf("%v", v)) } } ```
👍 1
amery commented 2023-08-28 18:00:21 +02:00
Outdated
Review
Copy Link
Copy Source

so buffered instead of joined. agreed

so buffered instead of joined. agreed
amery commented 2023-08-28 18:07:46 +02:00
Outdated
Review
Copy Link
Copy Source

slightly different to handle the space delimiters, but commit amended to use a bytes.Buffer instead of strings.Join @karasz

slightly different to handle the space delimiters, but commit amended to use a `bytes.Buffer` instead of `strings.Join` @karasz
for i, v := range value {
if i != 0 {
_, _ = fmt.Fprint(&buf, " ")
}
_, _ = fmt.Fprintf(&buf, "%v", v)
}
s = buf.String()
}
m.writeEnvVar(w, value, name, args...)
m.writeEnvVar(w, s, name, args...)
}
func (m *Env) writeEnvVar(w io.Writer, value string, name string, args ...any) {
@@ -84,35 +98,16 @@ func (m *Env) writeEnvVar(w io.Writer, value string, name string, args ...any) {
}
}
func genEnvZones(m *Env) string {
var s []string
m.ForEachZone(func(z *Zone) bool {
s = append(s, fmt.Sprintf("%v", z.ID))
return false
})
return strings.Join(s, " ")
}
func genEnvZoneNodes(z *Zone) string {
s := make([]string, 0, len(z.Machines))
for _, p := range z.Machines {
s = append(s, p.Name)
if n := z.Len(); n > 0 {
s := make([]string, 0, n)
z.ForEachMachine(func(p *Machine) bool {
s = append(s, p.Name)
return false
})
return strings.Join(s, " ")
}
return strings.Join(s, " ")
}
func getRingZeroGatewayID(z *Zone) int {
var gatewayID int
z.ForEachMachine(func(p *Machine) bool {
if p.IsGateway() {
gatewayID = p.ID
}
return gatewayID != 0
})
return gatewayID
return ""
}