Switching WG code to use object references.

2 files changed, 151 insertions, 192 deletions

diff --git a/out/acme/apps.yaml b/out/acme/apps.yaml
index 3942ed5..0c69b8e 100644
--- a/out/acme/apps.yaml
+++ b/out/acme/apps.yaml
@@ -212,54 +212,42 @@
     - "production-db"
 - type: "io.trygvis.rules.terraform.ScalewayMachine"
   data:
+    &acme-1 key: "acme-1"
     machine: *acme-1
-    key: "acme-1"
-- type: "io.trygvis.rules.terraform.ScalewayMachine"
-  data:
-    machine: *acme-1
-    key: "acme-1"
-- type: "io.trygvis.rules.terraform.ScalewayMachine"
-  data:
-    machine: *acme-2
-    key: "acme-2"
 - type: "io.trygvis.rules.terraform.ScalewayMachine"
   data:
+    &acme-2 key: "acme-2"
     machine: *acme-2
-    key: "acme-2"
 - type: "io.trygvis.rules.terraform.ScalewayMachine"
   data:
+    &acme-3 key: "acme-3"
     machine: *acme-3
-    key: "acme-3"
-- type: "io.trygvis.rules.terraform.ScalewayMachine"
-  data:
-    machine: *acme-3
-    key: "acme-3"
 - type: "io.trygvis.rules.terraform.ScalewayMachine"
   data:
+    &ws-1 key: "ws-1"
     machine: *ws-1
-    key: "ws-1"
 - type: "io.trygvis.rules.terraform.ScalewayMachine"
   data:
+    &ws-2 key: "ws-2"
     machine: *ws-2
-    key: "ws-2"
 - type: "io.trygvis.rules.engine.KeyValue"
   data:
     key: "rm-gen"
     value: null
 - type: "io.trygvis.rules.terraform.GoogleManagedZoneTerraformExpression"
   data:
-    name: "acme_zone"
+    &acme_zone name: "acme_zone"
 - type: "io.trygvis.acme.AcmeServer"
   data:
-    name: "acme-1"
+    &acme-1 name: "acme-1"
     machine: *acme-1
 - type: "io.trygvis.acme.AcmeServer"
   data:
-    name: "acme-2"
+    &acme-2 name: "acme-2"
     machine: *acme-2
 - type: "io.trygvis.acme.AcmeServer"
   data:
-    name: "acme-3"
+    &acme-3 name: "acme-3"
     machine: *acme-3
 - type: "io.trygvis.acme.apps.AcmeOps"
   data: {}
diff --git a/out/acme/wireguard.yaml b/out/acme/wireguard.yaml
index de882c3..58572d9 100644
--- a/out/acme/wireguard.yaml
+++ b/out/acme/wireguard.yaml
@@ -1,172 +1,143 @@
 ---
-type: "io.trygvis.rules.dns.DnsEntry"
-data:
-  fqdn: "acme-1.vpn.acme.com"
-  type: "A"
----
-type: "io.trygvis.rules.dns.DnsEntry"
-data:
-  fqdn: "acme-2.vpn.acme.com"
-  type: "A"
----
-type: "io.trygvis.rules.dns.DnsEntry"
-data:
-  fqdn: "acme-3.vpn.acme.com"
-  type: "A"
----
-type: "io.trygvis.rules.dns.DnsEntry"
-data:
-  fqdn: "ws-1.vpn.acme.com"
-  type: "A"
----
-type: "io.trygvis.rules.dns.DnsEntry"
-data:
-  fqdn: "ws-2.vpn.acme.com"
-  type: "A"
----
-type: "io.trygvis.rules.machine.Machine"
-data:
-  name: "acme-1"
-  fqdn: "acme-1.machine.acme.com"
----
-type: "io.trygvis.rules.machine.Machine"
-data:
-  name: "acme-2"
-  fqdn: "acme-2.machine.acme.com"
----
-type: "io.trygvis.rules.machine.Machine"
-data:
-  name: "acme-3"
-  fqdn: "acme-3.machine.acme.com"
----
-type: "io.trygvis.rules.machine.Machine"
-data:
-  name: "ws-1"
-  fqdn: null
----
-type: "io.trygvis.rules.machine.Machine"
-data:
-  name: "ws-2"
-  fqdn: null
----
-type: "io.trygvis.rules.wireguard.WgConnection"
-data:
-  host: "acme-1"
-  to: "acme-2"
----
-type: "io.trygvis.rules.wireguard.WgConnection"
-data:
-  host: "acme-1"
-  to: "acme-3"
----
-type: "io.trygvis.rules.wireguard.WgConnection"
-data:
-  host: "acme-2"
-  to: "acme-1"
----
-type: "io.trygvis.rules.wireguard.WgConnection"
-data:
-  host: "acme-2"
-  to: "acme-3"
----
-type: "io.trygvis.rules.wireguard.WgConnection"
-data:
-  host: "acme-3"
-  to: "acme-1"
----
-type: "io.trygvis.rules.wireguard.WgConnection"
-data:
-  host: "acme-3"
-  to: "acme-2"
----
-type: "io.trygvis.rules.wireguard.WgConnection"
-data:
-  host: "ws-1"
-  to: "acme-1"
----
-type: "io.trygvis.rules.wireguard.WgConnection"
-data:
-  host: "ws-1"
-  to: "acme-2"
----
-type: "io.trygvis.rules.wireguard.WgConnection"
-data:
-  host: "ws-1"
-  to: "acme-3"
----
-type: "io.trygvis.rules.wireguard.WgConnection"
-data:
-  host: "ws-2"
-  to: "acme-1"
----
-type: "io.trygvis.rules.wireguard.WgConnection"
-data:
-  host: "ws-2"
-  to: "acme-2"
----
-type: "io.trygvis.rules.wireguard.WgConnection"
-data:
-  host: "ws-2"
-  to: "acme-3"
----
-type: "io.trygvis.rules.wireguard.WgHost"
-data:
-  name: "acme-1"
-  net: "vpn0"
-  publicName: "acme-1.machine.acme.com"
-  ip: "192.168.10.3"
-  networkCidr: "10.55.255.0/24"
----
-type: "io.trygvis.rules.wireguard.WgHost"
-data:
-  name: "acme-2"
-  net: "vpn0"
-  publicName: "acme-2.machine.acme.com"
-  ip: "192.168.10.4"
-  networkCidr: "10.55.254.0/24"
----
-type: "io.trygvis.rules.wireguard.WgHost"
-data:
-  name: "acme-3"
-  net: "vpn0"
-  publicName: "acme-3.machine.acme.com"
-  ip: "192.168.10.5"
-  networkCidr: "10.55.253.0/24"
----
-type: "io.trygvis.rules.wireguard.WgHost"
-data:
-  name: "ws-1"
-  net: "vpn0"
-  publicName: null
-  ip: "192.168.10.6"
-  networkCidr: "10.55.252.0/24"
----
-type: "io.trygvis.rules.wireguard.WgHost"
-data:
-  name: "ws-2"
-  net: "vpn0"
-  publicName: null
-  ip: "192.168.10.7"
-  networkCidr: "10.55.251.0/24"
----
-type: "io.trygvis.rules.wireguard.WgIpPool"
-data:
-  net: "vpn0"
-  role: "link"
-  cidr:
-    value: "192.168.10.0/29"
----
-type: "io.trygvis.rules.wireguard.WgIpPool"
-data:
-  net: "vpn0"
-  role: "networks"
-  cidr:
-    value: "10.55.0.0/16"
----
-type: "io.trygvis.rules.wireguard.WgNet"
-data:
-  name: "vpn0"
-  domain: "vpn.acme.com"
-  linkCidr: "192.168.10.0/29"
-  networkCidr: "10.55.0.0/16"
-  networkBits: 24
+- type: "io.trygvis.rules.machine.Machine"
+  data:
+    &acme-1 name: "acme-1"
+    fqdn: "acme-1.machine.acme.com"
+- type: "io.trygvis.rules.machine.Machine"
+  data:
+    &acme-2 name: "acme-2"
+    fqdn: "acme-2.machine.acme.com"
+- type: "io.trygvis.rules.machine.Machine"
+  data:
+    &acme-3 name: "acme-3"
+    fqdn: "acme-3.machine.acme.com"
+- type: "io.trygvis.rules.machine.Machine"
+  data:
+    &ws-1 name: "ws-1"
+    fqdn: null
+- type: "io.trygvis.rules.machine.Machine"
+  data:
+    &ws-2 name: "ws-2"
+    fqdn: null
+- type: "io.trygvis.rules.dns.DnsEntry"
+  data:
+    fqdn: "acme-1.vpn.acme.com"
+    type: "A"
+- type: "io.trygvis.rules.dns.DnsEntry"
+  data:
+    fqdn: "acme-2.vpn.acme.com"
+    type: "A"
+- type: "io.trygvis.rules.dns.DnsEntry"
+  data:
+    fqdn: "acme-3.vpn.acme.com"
+    type: "A"
+- type: "io.trygvis.rules.dns.DnsEntry"
+  data:
+    fqdn: "ws-1.vpn.acme.com"
+    type: "A"
+- type: "io.trygvis.rules.dns.DnsEntry"
+  data:
+    fqdn: "ws-2.vpn.acme.com"
+    type: "A"
+- type: "io.trygvis.rules.wireguard.WgNet"
+  data:
+    &vpn0 name: "vpn0"
+    domain: "vpn.acme.com"
+    linkCidr: "192.168.10.0/29"
+    networkCidr: "10.55.0.0/16"
+    networkBits: 24
+- type: "io.trygvis.rules.wireguard.WgIpPool"
+  data:
+    &1 net: *vpn0
+    role: "link"
+    cidr:
+      value: "192.168.10.0/29"
+- type: "io.trygvis.rules.wireguard.WgIpPool"
+  data:
+    &2 net: *vpn0
+    role: "networks"
+    cidr:
+      value: "10.55.0.0/16"
+- type: "io.trygvis.rules.wireguard.WgHost"
+  data:
+    &3 machine: *ws-1
+    net: *vpn0
+    publicName: null
+    ip: "192.168.10.6"
+    networkCidr: "10.55.252.0/24"
+- type: "io.trygvis.rules.wireguard.WgHost"
+  data:
+    &4 machine: *ws-2
+    net: *vpn0
+    publicName: null
+    ip: "192.168.10.7"
+    networkCidr: "10.55.251.0/24"
+- type: "io.trygvis.rules.wireguard.WgHost"
+  data:
+    &5 machine: *acme-1
+    net: *vpn0
+    publicName: "acme-1.machine.acme.com"
+    ip: "192.168.10.3"
+    networkCidr: "10.55.255.0/24"
+- type: "io.trygvis.rules.wireguard.WgHost"
+  data:
+    &6 machine: *acme-2
+    net: *vpn0
+    publicName: "acme-2.machine.acme.com"
+    ip: "192.168.10.4"
+    networkCidr: "10.55.254.0/24"
+- type: "io.trygvis.rules.wireguard.WgHost"
+  data:
+    &7 machine: *acme-3
+    net: *vpn0
+    publicName: "acme-3.machine.acme.com"
+    ip: "192.168.10.5"
+    networkCidr: "10.55.253.0/24"
+- type: "io.trygvis.rules.wireguard.WgConnection"
+  data:
+    &8 host: *3
+    to: *7
+- type: "io.trygvis.rules.wireguard.WgConnection"
+  data:
+    &9 host: *3
+    to: *5
+- type: "io.trygvis.rules.wireguard.WgConnection"
+  data:
+    &10 host: *3
+    to: *6
+- type: "io.trygvis.rules.wireguard.WgConnection"
+  data:
+    &11 host: *4
+    to: *7
+- type: "io.trygvis.rules.wireguard.WgConnection"
+  data:
+    &12 host: *4
+    to: *5
+- type: "io.trygvis.rules.wireguard.WgConnection"
+  data:
+    &13 host: *4
+    to: *6
+- type: "io.trygvis.rules.wireguard.WgConnection"
+  data:
+    &14 host: *7
+    to: *5
+- type: "io.trygvis.rules.wireguard.WgConnection"
+  data:
+    &15 host: *7
+    to: *6
+- type: "io.trygvis.rules.wireguard.WgConnection"
+  data:
+    &16 host: *5
+    to: *7
+- type: "io.trygvis.rules.wireguard.WgConnection"
+  data:
+    &17 host: *5
+    to: *6
+- type: "io.trygvis.rules.wireguard.WgConnection"
+  data:
+    &18 host: *6
+    to: *7
+- type: "io.trygvis.rules.wireguard.WgConnection"
+  data:
+    &19 host: *6
+    to: *5