VPN work.

2 files changed, 259 insertions, 81 deletions

diff --git a/out/phase-1.yaml b/out/phase-1.yaml
index 2d7bbed..c8dfa11 100644
--- a/out/phase-1.yaml
+++ b/out/phase-1.yaml
@@ -1,47 +1,121 @@
 ---
 type: "io.trygvis.rules.acme.AcmeMyApp"
 data:
+  environment: "production"
+  dockerTag: "master"
+---
+type: "io.trygvis.rules.acme.AcmeMyApp"
+data:
   environment: "ci"
   dockerTag: "development"
 ---
-type: "io.trygvis.rules.acme.AcmeMyApp"
+type: "io.trygvis.rules.acme.AcmeServer"
 data:
-  environment: "production"
-  dockerTag: "master"
+  machine:
+    name: "acme-3"
+    fqdn: "acme-3.machine.acme.com"
 ---
-type: "io.trygvis.rules.dba.Cluster"
+type: "io.trygvis.rules.acme.AcmeServer"
 data:
-  name: "acme-ci"
+  machine:
+    name: "acme-2"
+    fqdn: "acme-2.machine.acme.com"
+---
+type: "io.trygvis.rules.acme.AcmeServer"
+data:
+  machine:
+    name: "acme-1"
+    fqdn: "acme-1.machine.acme.com"
+---
+type: "io.trygvis.rules.acme.WgHost"
+data:
+  name: "acme-3"
+  machine:
+    name: "acme-3"
+    fqdn: "acme-3.machine.acme.com"
+  net: "vs0"
+  publicName: null
+  netToNetIp: null
+  networkIp: null
+---
+type: "io.trygvis.rules.acme.WgHost"
+data:
+  name: "ws-2"
+  machine: null
+  net: "vs0"
+  publicName: null
+  netToNetIp: null
+  networkIp: null
+---
+type: "io.trygvis.rules.acme.WgHost"
+data:
+  name: "acme-1"
+  machine:
+    name: "acme-1"
+    fqdn: "acme-1.machine.acme.com"
+  net: "vs0"
+  publicName: null
+  netToNetIp: null
+  networkIp: null
+---
+type: "io.trygvis.rules.acme.WgHost"
+data:
+  name: "ws-1"
+  machine: null
+  net: "vs0"
+  publicName: null
+  netToNetIp: null
+  networkIp: null
+---
+type: "io.trygvis.rules.acme.WgHost"
+data:
+  name: "acme-2"
+  machine:
+    name: "acme-2"
+    fqdn: "acme-2.machine.acme.com"
+  net: "vs0"
+  publicName: null
+  netToNetIp: null
+  networkIp: null
+---
+type: "io.trygvis.rules.acme.WgNet"
+data:
+  name: "vs0"
+  domain: "vpn.acme.com"
 ---
 type: "io.trygvis.rules.dba.Cluster"
 data:
   name: "acme-production"
 ---
+type: "io.trygvis.rules.dba.Cluster"
+data:
+  name: "acme-ci"
+---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-production"
   name: "db"
-  machineRole: "pdb"
-  image: "postgresql"
-  tag: "13"
+  machineRole: "mdb"
+  image: "mongodb"
+  tag: "3.2"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
-    name: "acme-ci"
+    name: "acme-production"
   name: "db"
-  machineRole: "mdb"
-  image: "mongodb"
-  tag: "3.2"
+  machineRole: "pdb"
+  image: "postgresql"
+  tag: "13"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-ci"
   name: "app"
-  machineRole: "4tune-api"
-  image: "4tune-api"
+  machineRole: "4tune-web"
+  image: "4tune-web"
   tag: "development"
 ---
 type: "io.trygvis.rules.dba.Container"
@@ -49,8 +123,8 @@ data:
   cluster:
     name: "acme-production"
   name: "app"
-  machineRole: "4tune-web"
-  image: "4tune-web"
+  machineRole: "statera"
+  image: "statera"
   tag: "master"
 ---
 type: "io.trygvis.rules.dba.Container"
@@ -58,26 +132,26 @@ data:
   cluster:
     name: "acme-production"
   name: "app"
-  machineRole: "statera"
-  image: "statera"
+  machineRole: "statera-console"
+  image: "statera-console"
   tag: "master"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-ci"
-  name: "app"
-  machineRole: "statera"
-  image: "statera"
-  tag: "development"
+  name: "db"
+  machineRole: "pdb"
+  image: "postgresql"
+  tag: "13"
 ---
 type: "io.trygvis.rules.dba.Container"
 data:
   cluster:
     name: "acme-production"
   name: "app"
-  machineRole: "4tune-api"
-  image: "4tune-api"
+  machineRole: "4tune-web"
+  image: "4tune-web"
   tag: "master"
 ---
 type: "io.trygvis.rules.dba.Container"
@@ -85,8 +159,8 @@ data:
   cluster:
     name: "acme-production"
   name: "app"
-  machineRole: "statera-console"
-  image: "statera-console"
+  machineRole: "4tune-api"
+  image: "4tune-api"
   tag: "master"
 ---
 type: "io.trygvis.rules.dba.Container"
@@ -94,15 +168,6 @@ data:
   cluster:
     name: "acme-ci"
   name: "db"
-  machineRole: "pdb"
-  image: "postgresql"
-  tag: "13"
----
-type: "io.trygvis.rules.dba.Container"
-data:
-  cluster:
-    name: "acme-production"
-  name: "db"
   machineRole: "mdb"
   image: "mongodb"
   tag: "3.2"
@@ -112,8 +177,8 @@ data:
   cluster:
     name: "acme-ci"
   name: "app"
-  machineRole: "4tune-web"
-  image: "4tune-web"
+  machineRole: "statera-console"
+  image: "statera-console"
   tag: "development"
 ---
 type: "io.trygvis.rules.dba.Container"
@@ -121,98 +186,105 @@ data:
   cluster:
     name: "acme-ci"
   name: "app"
-  machineRole: "statera-console"
-  image: "statera-console"
+  machineRole: "statera"
+  image: "statera"
   tag: "development"
 ---
-type: "io.trygvis.rules.dns.DnsEntry"
+type: "io.trygvis.rules.dba.Container"
 data:
-  fqdn: "acme-3.machine.acme.com"
-  type: "A"
+  cluster:
+    name: "acme-ci"
+  name: "app"
+  machineRole: "4tune-api"
+  image: "4tune-api"
+  tag: "development"
 ---
 type: "io.trygvis.rules.dns.DnsEntry"
 data:
-  fqdn: "acme-2.machine.acme.com"
+  fqdn: "acme-1.vpn.acme.com"
   type: "A"
 ---
 type: "io.trygvis.rules.dns.DnsEntry"
 data:
-  fqdn: "acme-2.machine.acme.com"
-  type: "AAAA"
+  fqdn: "ws-1.vpn.acme.com"
+  type: "A"
 ---
 type: "io.trygvis.rules.dns.DnsEntry"
 data:
-  fqdn: "acme-1.machine.acme.com"
-  type: "AAAA"
+  fqdn: "ws-2.vpn.acme.com"
+  type: "A"
 ---
 type: "io.trygvis.rules.dns.DnsEntry"
 data:
-  fqdn: "acme-3.machine.acme.com"
-  type: "AAAA"
+  fqdn: "acme-2.vpn.acme.com"
+  type: "A"
 ---
 type: "io.trygvis.rules.dns.DnsEntry"
 data:
-  fqdn: "acme-1.machine.acme.com"
+  fqdn: "acme-3.vpn.acme.com"
   type: "A"
 ---
-type: "io.trygvis.rules.dns.DnsEntryTerraformExpression"
+type: "io.trygvis.rules.engine.KeyValue"
 data:
-  entry:
-    fqdn: "acme-3.machine.acme.com"
-    type: "A"
-  key: "acme-3"
-  expression: "scaleway_instance_ip.acme-3.address"
+  key: "rm-gen"
+  value: null
 ---
-type: "io.trygvis.rules.dns.DnsEntryTerraformExpression"
+type: "io.trygvis.rules.machine.Machine"
 data:
-  entry:
-    fqdn: "acme-2.machine.acme.com"
-    type: "A"
-  key: "acme-2"
-  expression: "scaleway_instance_ip.acme-2.address"
+  name: "ws-2"
+  fqdn: null
 ---
-type: "io.trygvis.rules.dns.DnsEntryTerraformExpression"
+type: "io.trygvis.rules.machine.Machine"
 data:
-  entry:
-    fqdn: "acme-1.machine.acme.com"
-    type: "A"
-  key: "acme-1"
-  expression: "scaleway_instance_ip.acme-1.address"
+  name: "acme-2"
+  fqdn: "acme-2.machine.acme.com"
 ---
-type: "io.trygvis.rules.engine.KeyValue"
+type: "io.trygvis.rules.machine.Machine"
 data:
-  key: "rm-gen"
-  value: null
+  name: "acme-1"
+  fqdn: "acme-1.machine.acme.com"
 ---
 type: "io.trygvis.rules.machine.Machine"
 data:
-  name: "acme-2"
+  name: "ws-1"
+  fqdn: null
 ---
 type: "io.trygvis.rules.machine.Machine"
 data:
   name: "acme-3"
+  fqdn: "acme-3.machine.acme.com"
 ---
-type: "io.trygvis.rules.machine.Machine"
+type: "io.trygvis.rules.terraform.ScalewayMachine"
 data:
-  name: "acme-1"
+  machine:
+    name: "ws-2"
+    fqdn: null
+  key: "ws-2"
 ---
 type: "io.trygvis.rules.terraform.ScalewayMachine"
 data:
   machine:
-    name: "acme-2"
-  key: "acme-2"
-  fqdn: "acme-2.machine.acme.com"
+    name: "acme-3"
+    fqdn: "acme-3.machine.acme.com"
+  key: "acme-3"
 ---
 type: "io.trygvis.rules.terraform.ScalewayMachine"
 data:
   machine:
     name: "acme-1"
+    fqdn: "acme-1.machine.acme.com"
   key: "acme-1"
-  fqdn: "acme-1.machine.acme.com"
 ---
 type: "io.trygvis.rules.terraform.ScalewayMachine"
 data:
   machine:
-    name: "acme-3"
-  key: "acme-3"
-  fqdn: "acme-3.machine.acme.com"
+    name: "acme-2"
+    fqdn: "acme-2.machine.acme.com"
+  key: "acme-2"
+---
+type: "io.trygvis.rules.terraform.ScalewayMachine"
+data:
+  machine:
+    name: "ws-1"
+    fqdn: null
+  key: "ws-1"
diff --git a/out/vs0.yaml b/out/vs0.yaml
new file mode 100644
index 0000000..c400981
--- /dev/null
+++ b/out/vs0.yaml
@@ -0,0 +1,106 @@
+---
+type: "io.trygvis.rules.acme.WgHost"
+data:
+  name: "acme-3"
+  machine:
+    name: "acme-3"
+    fqdn: "acme-3.machine.acme.com"
+  net: "vs0"
+  publicName: null
+  netToNetIp: null
+  networkIp: null
+---
+type: "io.trygvis.rules.acme.WgHost"
+data:
+  name: "ws-2"
+  machine: null
+  net: "vs0"
+  publicName: null
+  netToNetIp: null
+  networkIp: null
+---
+type: "io.trygvis.rules.acme.WgHost"
+data:
+  name: "acme-1"
+  machine:
+    name: "acme-1"
+    fqdn: "acme-1.machine.acme.com"
+  net: "vs0"
+  publicName: null
+  netToNetIp: null
+  networkIp: null
+---
+type: "io.trygvis.rules.acme.WgHost"
+data:
+  name: "ws-1"
+  machine: null
+  net: "vs0"
+  publicName: null
+  netToNetIp: null
+  networkIp: null
+---
+type: "io.trygvis.rules.acme.WgHost"
+data:
+  name: "acme-2"
+  machine:
+    name: "acme-2"
+    fqdn: "acme-2.machine.acme.com"
+  net: "vs0"
+  publicName: null
+  netToNetIp: null
+  networkIp: null
+---
+type: "io.trygvis.rules.acme.WgNet"
+data:
+  name: "vs0"
+  domain: "vpn.acme.com"
+---
+type: "io.trygvis.rules.dns.DnsEntry"
+data:
+  fqdn: "acme-1.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.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.machine.Machine"
+data:
+  name: "ws-2"
+  fqdn: null
+---
+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-1"
+  fqdn: "acme-1.machine.acme.com"
+---
+type: "io.trygvis.rules.machine.Machine"
+data:
+  name: "ws-1"
+  fqdn: null
+---
+type: "io.trygvis.rules.machine.Machine"
+data:
+  name: "acme-3"
+  fqdn: "acme-3.machine.acme.com"