lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mcl, docs: Use the less ambiguous form of the import

Browse Source 
Update the style guide as well!
This commit is contained in:
James Shubin
2025-06-05 22:45:26 -04:00
parent e5ec13f592
commit 75bafa4fd3
11 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/dhcp/main.mcl
View File

@@ -31,7 +31,7 @@ import "deploy"
import "fmt"
import "golang"
import "local"
import "golang/strings"
import "golang/strings" as golang_strings
import "os"
class server($st) {
@@ -146,7 +146,7 @@ class server:subnet($name, $st) {
netmask => "${netmask}",
broadcast => "${broadcast}",
router => "${router}", # TODO: support multiple
dns => strings.join($dns, ", "),
dns => golang_strings.join($dns, ", "),
range => $valid_range,
#nextserver => "${nextserver}",
#filename => "${filename}",
@@ -206,7 +206,7 @@ class server:host($name, $st) {
$tmpl = struct{
name => "${name}",
macaddress => "${macaddress}",
valid_fixedaddress => strings.join($fixedaddress, ","),
valid_fixedaddress => golang_strings.join($fixedaddress, ","),
#fixedaddress => $fixedaddress, # TODO: when it's a list
hostname => "${hostname}",
nextserver => "${nextserver}",

10
modules/shorewall/main.mcl
View File

@@ -31,7 +31,7 @@ import "deploy"
import "fmt"
import "golang"
import "local"
import "golang/strings"
import "golang/strings" as golang_strings
# Class prepare adds some common things you probably want to run when using this
@@ -199,7 +199,7 @@ class firewall:interface($name, $zone, $st) {
print "interface: ${name}" {}
include interface_base
$interface = $st->interface || (strings.to_upper($zone) + "_IF") # eg: NET_IF
$interface = $st->interface || (golang_strings.to_upper($zone) + "_IF") # eg: NET_IF
$physical = $st->physical || $name
$options []str = $st->options || [] # TODO: add option validation?
$comment = $st->comment || ""
@@ -328,14 +328,14 @@ class firewall:rule($name, $st) {
#$original = $st->original || [] # TODO
$comment = $st->comment || ""
$source_ips_joined = strings.join($source_ips, ",")
$source_ips_joined = golang_strings.join($source_ips, ",")
$valid_source = if $source_ips_joined == "" {
"${source}"
} else {
"${source}:${source_ips_joined}"
}
$dest_ips_joined = strings.join($dest_ips, ",")
$dest_ips_joined = golang_strings.join($dest_ips, ",")
$valid_dest = if $dest_ips_joined == "" {
"${dest}"
} else {
@@ -506,7 +506,7 @@ class firewall:snat($name, $st) {
$port = $st->port || 0
$comment = $st->comment || ""
$valid_source = strings.join($source, ",")
$valid_source = golang_strings.join($source, ",")
$valid_proto = if $proto == "" {
"-"