build-sys: use local asciigoat.org/ini

Signed-off-by: Alejandro Mery <amery@jpi.io>
vscode: add asciigoat, cyclomatic and Wrapf to the dictionary
2023-09-08 13:14:49 +00:00 · 2023-09-08 13:14:49 +00:00 · 2023-09-08 13:14:42 +00:00 · 2023-09-08 13:12:56 +00:00
5 changed files with 9 additions and 6 deletions
@@ -1,9 +1,12 @@
 {
    "cSpell.words": [
+        "asciigoat",
        "ceph",
+        "cyclomatic",
        "darvaza",
        "gofrs",
        "jpictl",
+        "Wrapf",
        "zerolog"
    ]
 }
@@ -2,6 +2,8 @@ module git.jpi.io/amery/jpictl

 go 1.19

+replace asciigoat.org/ini => ../../../asciigoat.org/ini
+
 require (
 	asciigoat.org/ini v0.2.5
 	darvaza.org/core v0.9.8
@@ -1,7 +1,5 @@
 asciigoat.org/core v0.3.9 h1:hgDDz4ecm3ZvehX++m8A/IzAt+B5oDPiRtxatzfUHPQ=
 asciigoat.org/core v0.3.9/go.mod h1:CAaHwyw8MpAq4a1MYtN2dxJrsK+hmIdW50OndaQZYPI=
-asciigoat.org/ini v0.2.5 h1:4gRIp9rU+XQt8+HMqZO5R7GavMv9Yl2+N+je6djDIAE=
-asciigoat.org/ini v0.2.5/go.mod h1:gmXzJ9XFqf1NLk5nQkj04USQ4tMtdRJHNQX6vp3DzjU=
 darvaza.org/core v0.9.8 h1:luLxgfUc2pzuusYPo/Z/dC/qr9XZPKpSQw8/kS7zNUM=
 darvaza.org/core v0.9.8/go.mod h1:Dbme64naxeshQfxcVJX9ZT7AiGyIY8kldfuELVtf8mw=
 darvaza.org/resolver v0.5.4 h1:dlSBNV14yYsp7Kg7ipwYOMNsLbrpeXa8Z0HBTa0Ryxs=
@@ -9,8 +9,8 @@ import (

 // A Machine is a machine on a Zone
 type Machine struct {
-	zone *Zone
-	logger
+	zone   *Zone
+	logger `toml:"-" json:"-" yaml:"-"`

 	ID   int    `toml:"id"`
 	Name string `toml:"-" json:"-" yaml:"-"`
@@ -87,8 +87,8 @@ func FilterMachines(m MachineIterator, cond func(*Machine) bool) (Machines, int)

 // Zone represents one zone in a cluster
 type Zone struct {
-	zones *Zones
-	logger
+	zones  *Zones
+	logger `toml:"-" json:"-" yaml:"-"`

 	ID   int    `toml:"id"`
 	Name string `toml:"name"`
Author	SHA1	Message	Date
amery	6b3d74aaec	build-sys: use local asciigoat.org/ini Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-08 13:14:49 +00:00
amery	37640a0ba8	vscode: add asciigoat, cyclomatic and Wrapf to the dictionary Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-08 13:14:49 +00:00
amery	ea612fd638	Merge branch 'pr-amery-dump' into next-amery	2023-09-08 13:14:42 +00:00
amery	32046fc1ec	zones: fix `jpictl dump` by explicitly omitting Machine.logger and Zone.logger if they were fields, as in Zones, they would be ignored automatically. but they aren't Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-08 13:12:56 +00:00