summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2021-02-03 16:35:48 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2021-02-03 16:35:48 +0100
commitbafe762ac01d16904c18404283027e426e19bc73 (patch)
treec22688ad186f5ce635f525704c5035f91b983b68
parent91abd0b04320a9c9d932df195aca38c1cacfcc5a (diff)
downloadrules-sandbox-bafe762ac01d16904c18404283027e426e19bc73.tar.gz
rules-sandbox-bafe762ac01d16904c18404283027e426e19bc73.tar.bz2
rules-sandbox-bafe762ac01d16904c18404283027e426e19bc73.tar.xz
rules-sandbox-bafe762ac01d16904c18404283027e426e19bc73.zip
Code reorganization.
Moving main code to src, keeping modules in modules/
-rw-r--r--.run/acme-apps.run.xml2
-rw-r--r--.run/acme-wireguard.run.xml2
-rw-r--r--.run/ninja.run.xml2
-rwxr-xr-xengine2
-rw-r--r--example/.gitignore (renamed from acme/.gitignore)3
-rw-r--r--example/.settings.sh (renamed from acme/.settings.sh)0
-rw-r--r--example/Makefile (renamed from acme/Makefile)0
-rw-r--r--example/acme-apps/ansible/dba/acme-myapp-ci.yml (renamed from acme-apps/ansible/dba/acme-myapp-ci.yml)28
-rw-r--r--example/acme-apps/ansible/dba/acme-myapp-production.yml (renamed from acme-apps/ansible/dba/acme-myapp-production.yml)0
-rw-r--r--example/acme-apps/ansible/dba/acme-ops.yml (renamed from acme-apps/ansible/dba/acme-ops.yml)0
-rw-r--r--example/acme-apps/terraform/acme-1-instance.tf (renamed from acme-apps/terraform/acme-1-instance.tf)0
-rw-r--r--example/acme-apps/terraform/acme-1-ip.tf (renamed from acme-apps/terraform/acme-1-ip.tf)0
-rw-r--r--example/acme-apps/terraform/acme-2-instance.tf (renamed from acme-apps/terraform/acme-2-instance.tf)0
-rw-r--r--example/acme-apps/terraform/acme-2-ip.tf (renamed from acme-apps/terraform/acme-2-ip.tf)0
-rw-r--r--example/acme-apps/terraform/acme-3-instance.tf (renamed from acme-apps/terraform/acme-3-instance.tf)0
-rw-r--r--example/acme-apps/terraform/acme-3-ip.tf (renamed from acme-apps/terraform/acme-3-ip.tf)0
-rw-r--r--example/acme-apps/terraform/main.tf (renamed from acme-apps/terraform/main.tf)0
-rw-r--r--example/acme-apps/terraform/vars.tf (renamed from acme-apps/terraform/vars.tf)0
-rw-r--r--example/acme-wireguard/host_vars/acme-1/wireguard.yml (renamed from acme-wireguard/host_vars/acme-1/wireguard.yml)0
-rw-r--r--example/acme-wireguard/host_vars/acme-2/wireguard.yml (renamed from acme-wireguard/host_vars/acme-2/wireguard.yml)0
-rw-r--r--example/acme-wireguard/host_vars/acme-3/wireguard.yml (renamed from acme-wireguard/host_vars/acme-3/wireguard.yml)0
-rw-r--r--example/acme-wireguard/host_vars/ws-1/wireguard.yml (renamed from acme-wireguard/host_vars/ws-1/wireguard.yml)0
-rw-r--r--example/acme-wireguard/host_vars/ws-2/wireguard.yml (renamed from acme-wireguard/host_vars/ws-2/wireguard.yml)0
-rw-r--r--example/acme-wireguard/inventory.yml (renamed from acme-wireguard/inventory.yml)0
-rw-r--r--example/acme-wireguard/wireguard-vpn0.yml (renamed from acme-wireguard/wireguard-vpn0.yml)0
-rw-r--r--example/acme.yaml (renamed from acme.yaml)0
-rw-r--r--example/ansible.cfg (renamed from acme/ansible.cfg)0
-rw-r--r--example/build.ninja1
-rw-r--r--example/db/apps.yaml (renamed from out/acme/apps.yaml)8
-rw-r--r--example/db/wireguard.yaml (renamed from out/acme/wireguard.yaml)0
-rw-r--r--example/engine.ninja11
-rw-r--r--example/main.tf (renamed from acme/main.tf)0
-rw-r--r--example/modules/acme/pom.xml (renamed from module/acme/pom.xml)2
-rw-r--r--example/modules/acme/src/main/java/io/trygvis/acme/AcmeAppsMain.java (renamed from module/acme/src/main/java/io/trygvis/acme/AcmeAppsMain.java)0
-rw-r--r--example/modules/acme/src/main/java/io/trygvis/acme/VpnMain.java (renamed from module/acme/src/main/java/io/trygvis/acme/VpnMain.java)0
-rw-r--r--example/modules/acme/src/main/java/io/trygvis/acme/apps/AcmeMyApp.java (renamed from module/acme/src/main/java/io/trygvis/acme/apps/AcmeMyApp.java)0
-rw-r--r--example/modules/acme/src/main/java/io/trygvis/acme/apps/AcmeOps.java (renamed from module/acme/src/main/java/io/trygvis/acme/apps/AcmeOps.java)0
-rw-r--r--example/modules/acme/src/main/resources/META-INF/kmodule.xml (renamed from module/acme/src/main/resources/META-INF/kmodule.xml)0
-rw-r--r--example/modules/acme/src/main/resources/io/trygvis/acme/acme.drl (renamed from module/acme/src/main/resources/io/trygvis/acme/acme.drl)0
-rw-r--r--example/modules/acme/src/main/resources/io/trygvis/acme/apps/apps.drl (renamed from module/acme/src/main/resources/io/trygvis/acme/apps/apps.drl)0
-rw-r--r--module/acme/classpath.txt29
-rw-r--r--modules/ri-base/classpath.txt (renamed from module/ri-base/classpath.txt)0
-rw-r--r--modules/ri-base/pom.xml (renamed from module/ri-base/pom.xml)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/core/Problem.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/core/Problem.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/dba/Cluster.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/dba/Cluster.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/dba/Container.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/dba/Container.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/dns/DnsEntry.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/dns/DnsEntry.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/dns/DnsEntryTerraformExpression.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/dns/DnsEntryTerraformExpression.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/dns/DnsZone.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/dns/DnsZone.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/engine/KeyValue.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/engine/KeyValue.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/machine/Machine.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/machine/Machine.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/machine/MachineSpecification.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/machine/MachineSpecification.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/network/IpCalc.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/network/IpCalc.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/network/Ipv4Address.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/network/Ipv4Address.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/network/Ipv4Cidr.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/network/Ipv4Cidr.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformInputVariable.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformInputVariable.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformMain.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformMain.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformProvider.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformProvider.java)0
-rw-r--r--modules/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformResource.java (renamed from module/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformResource.java)0
-rw-r--r--modules/ri-base/src/main/resources/META-INF/kmodule.xml (renamed from module/ri-base/src/main/resources/META-INF/kmodule.xml)0
-rw-r--r--modules/ri-base/src/main/resources/io/trygvis/rules/dba/dba.drl (renamed from module/ri-base/src/main/resources/io/trygvis/rules/dba/dba.drl)0
-rw-r--r--modules/ri-base/src/main/resources/io/trygvis/rules/engine/init.drl (renamed from module/ri-base/src/main/resources/io/trygvis/rules/engine/init.drl)0
-rw-r--r--modules/ri-base/src/main/resources/io/trygvis/rules/machine/machine.drl (renamed from module/ri-base/src/main/resources/io/trygvis/rules/machine/machine.drl)0
-rw-r--r--modules/ri-base/src/main/resources/io/trygvis/rules/scaleway/terraform.drl (renamed from module/ri-base/src/main/resources/io/trygvis/rules/scaleway/terraform.drl)0
-rw-r--r--modules/ri-base/src/main/resources/io/trygvis/rules/terraform/terraform-resources.drl (renamed from module/ri-base/src/main/resources/io/trygvis/rules/terraform/terraform-resources.drl)0
-rw-r--r--modules/ri-base/src/main/resources/templates/dba/cluster.j2 (renamed from module/ri-base/src/main/resources/templates/dba/cluster.j2)0
-rw-r--r--modules/ri-base/src/main/resources/templates/platform-ansible.j2 (renamed from module/ri-base/src/main/resources/templates/platform-ansible.j2)0
-rw-r--r--modules/ri-base/src/main/resources/templates/terraform/machine-outputs.j2 (renamed from module/ri-base/src/main/resources/templates/terraform/machine-outputs.j2)0
-rw-r--r--modules/ri-base/src/main/resources/templates/terraform/machine.j2 (renamed from module/ri-base/src/main/resources/templates/terraform/machine.j2)0
-rw-r--r--modules/ri-base/src/main/resources/templates/terraform/main-scaleway-machine.j2 (renamed from module/ri-base/src/main/resources/templates/terraform/main-scaleway-machine.j2)0
-rw-r--r--modules/ri-base/src/main/resources/templates/terraform/main.j2 (renamed from module/ri-base/src/main/resources/templates/terraform/main.j2)0
-rw-r--r--modules/ri-base/src/main/resources/templates/terraform/record-set.j2 (renamed from module/ri-base/src/main/resources/templates/terraform/record-set.j2)0
-rw-r--r--modules/ri-base/src/main/resources/templates/terraform/resource.j2 (renamed from module/ri-base/src/main/resources/templates/terraform/resource.j2)0
-rw-r--r--modules/ri-base/src/main/resources/templates/terraform/variables.j2 (renamed from module/ri-base/src/main/resources/templates/terraform/variables.j2)0
-rw-r--r--modules/ri-base/src/test/java/io/trygvis/rules/network/Ipv4CidrTest.txt (renamed from module/ri-base/src/test/java/io/trygvis/rules/network/Ipv4CidrTest.txt)0
-rw-r--r--modules/ri-docker/pom.xml25
-rw-r--r--modules/ri-module-api/classpath.txt (renamed from module/ri-module-api/classpath.txt)0
-rw-r--r--modules/ri-module-api/pom.xml (renamed from module/ri-module-api/pom.xml)0
-rw-r--r--modules/ri-module-api/src/main/java/io/trygvis/rules/engine/TemplateEngine.java (renamed from module/ri-module-api/src/main/java/io/trygvis/rules/engine/TemplateEngine.java)0
-rw-r--r--modules/ri-module-parent/classpath.txt (renamed from module/ri-module-parent/classpath.txt)0
-rw-r--r--modules/ri-module-parent/pom.xml (renamed from module/ri-module-parent/pom.xml)0
-rw-r--r--modules/ri-wireguard/classpath.txt (renamed from module/ri-wireguard/classpath.txt)0
-rw-r--r--modules/ri-wireguard/pom.xml (renamed from module/ri-wireguard/pom.xml)0
-rw-r--r--modules/ri-wireguard/src/main/resources/META-INF/kmodule.xml (renamed from module/ri-wireguard/src/main/resources/META-INF/kmodule.xml)0
-rw-r--r--modules/ri-wireguard/src/main/resources/io/trygvis/rules/wireguard/wireguard.drl (renamed from module/ri-wireguard/src/main/resources/io/trygvis/rules/wireguard/wireguard.drl)0
-rw-r--r--modules/ri-wireguard/src/main/resources/logback.xml (renamed from module/ri-wireguard/src/main/resources/logback.xml)0
-rw-r--r--modules/ri-wireguard/src/main/resources/templates/wireguard/ansible-host.j2 (renamed from module/ri-wireguard/src/main/resources/templates/wireguard/ansible-host.j2)0
-rw-r--r--modules/ri-wireguard/src/main/resources/templates/wireguard/ansible.j2 (renamed from module/ri-wireguard/src/main/resources/templates/wireguard/ansible.j2)0
-rw-r--r--modules/ri-wireguard/src/main/resources/templates/wireguard/inventory.j2 (renamed from module/ri-wireguard/src/main/resources/templates/wireguard/inventory.j2)0
-rw-r--r--pom.xml33
-rw-r--r--src/ri-engine/classpath.txt (renamed from module/ri-engine/classpath.txt)0
-rw-r--r--src/ri-engine/pom.xml (renamed from module/ri-engine/pom.xml)34
-rw-r--r--src/ri-engine/src/main/java/io/trygvis/rules/engine/DbIo.java (renamed from module/ri-engine/src/main/java/io/trygvis/rules/engine/DbIo.java)0
-rw-r--r--src/ri-engine/src/main/java/io/trygvis/rules/engine/DbObject.java (renamed from module/ri-engine/src/main/java/io/trygvis/rules/engine/DbObject.java)0
-rw-r--r--src/ri-engine/src/main/java/io/trygvis/rules/engine/Engine.java (renamed from module/ri-engine/src/main/java/io/trygvis/rules/engine/Engine.java)0
-rw-r--r--src/ri-engine/src/main/java/io/trygvis/rules/engine/JinjavaTemplateEngine.java (renamed from module/ri-engine/src/main/java/io/trygvis/rules/engine/JinjavaTemplateEngine.java)0
-rw-r--r--src/ri-engine/src/main/java/io/trygvis/rules/engine/Main.java (renamed from module/ri-engine/src/main/java/io/trygvis/rules/engine/Main.java)0
-rw-r--r--src/ri-engine/src/main/java/io/trygvis/rules/engine/TemplateLoader.java (renamed from module/ri-engine/src/main/java/io/trygvis/rules/engine/TemplateLoader.java)0
-rw-r--r--src/ri-engine/src/main/java/io/trygvis/rules/engine/cli/DatabaseCommand.java (renamed from module/ri-engine/src/main/java/io/trygvis/rules/engine/cli/DatabaseCommand.java)0
-rw-r--r--src/ri-engine/src/main/java/io/trygvis/rules/engine/cli/EngineFile.java (renamed from module/ri-engine/src/main/java/io/trygvis/rules/engine/cli/EngineFile.java)0
-rw-r--r--src/ri-engine/src/main/java/io/trygvis/rules/engine/cli/NinjaCommand.java (renamed from module/ri-engine/src/main/java/io/trygvis/rules/engine/cli/NinjaCommand.java)0
-rw-r--r--src/ri-engine/src/main/java/io/trygvis/rules/engine/cli/RunCommand.java (renamed from module/ri-engine/src/main/java/io/trygvis/rules/engine/cli/RunCommand.java)0
-rw-r--r--src/ri-it/classpath.txt63
-rw-r--r--src/ri-it/pom.xml42
-rw-r--r--src/ri-it/src/test/java/io/trygvis/rules/engine/AcmeAppsTestMain.java (renamed from module/ri-engine/src/test/java/io/trygvis/rules/engine/AcmeAppsTestMain.java)7
-rw-r--r--src/ri-it/src/test/java/io/trygvis/rules/engine/AcmeWireguardTestMain.java (renamed from module/ri-engine/src/test/java/io/trygvis/rules/engine/AcmeWireguardTestMain.java)7
-rw-r--r--src/ri-it/src/test/java/io/trygvis/rules/engine/NinjaTestMain.java (renamed from module/ri-engine/src/test/java/io/trygvis/rules/engine/NinjaTestMain.java)0
-rw-r--r--src/ri-planner/classpath.txt (renamed from module/acme-planner/classpath.txt)0
-rw-r--r--src/ri-planner/pom.xml (renamed from module/acme-planner/pom.xml)0
-rw-r--r--src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudBalance.java (renamed from module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudBalance.java)0
-rw-r--r--src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudBalancingEasyScoreCalculator.java (renamed from module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudBalancingEasyScoreCalculator.java)0
-rw-r--r--src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudComputer.java (renamed from module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudComputer.java)0
-rw-r--r--src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudPlaningMain.java (renamed from module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudPlaningMain.java)0
-rw-r--r--src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudPlanner.java (renamed from module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudPlanner.java)0
-rw-r--r--src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudProcess.java (renamed from module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudProcess.java)0
-rw-r--r--src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudProcessDifficultyComparator.java (renamed from module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudProcessDifficultyComparator.java)0
-rw-r--r--src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/ScalewayInstance.java (renamed from module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/ScalewayInstance.java)0
-rw-r--r--src/ri-planner/src/main/resources/io/trygvis/acme/planning/machine/solver-config.xml (renamed from module/acme-planner/src/main/resources/io/trygvis/acme/planning/machine/solver-config.xml)0
118 files changed, 197 insertions, 104 deletions
diff --git a/.run/acme-apps.run.xml b/.run/acme-apps.run.xml
index 292aad9..972bf53 100644
--- a/.run/acme-apps.run.xml
+++ b/.run/acme-apps.run.xml
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="acme-apps" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="io.trygvis.rules.engine.AcmeAppsTestMain" />
- <module name="ri-engine" />
+ <module name="ri-it" />
<option name="VM_PARAMETERS" value="--add-opens java.base/java.lang=ALL-UNNAMED" />
<extension name="coverage">
<pattern>
diff --git a/.run/acme-wireguard.run.xml b/.run/acme-wireguard.run.xml
index 9b107a1..3523a3d 100644
--- a/.run/acme-wireguard.run.xml
+++ b/.run/acme-wireguard.run.xml
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="acme-wireguard" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="io.trygvis.rules.engine.AcmeWireguardTestMain" />
- <module name="ri-engine" />
+ <module name="ri-it" />
<option name="VM_PARAMETERS" value="--add-opens java.base/java.lang=ALL-UNNAMED" />
<extension name="coverage">
<pattern>
diff --git a/.run/ninja.run.xml b/.run/ninja.run.xml
index a7b68ab..e3ac4cb 100644
--- a/.run/ninja.run.xml
+++ b/.run/ninja.run.xml
@@ -4,7 +4,7 @@
<env name="MODULE_HOME" value="modules/" />
</envs>
<option name="MAIN_CLASS_NAME" value="io.trygvis.rules.engine.NinjaTestMain" />
- <module name="ri-engine" />
+ <module name="ri-it" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="io.trygvis.rules.engine.*" />
diff --git a/engine b/engine
index 8fb2b33..1d4534a 100755
--- a/engine
+++ b/engine
@@ -3,7 +3,7 @@
set -euo pipefail
basedir="$(dirname $0)"
-jar="$(echo $basedir/module/ri-engine/target/ri-engine-*-fat.jar)"
+jar="$(echo $basedir/src/ri-engine/target/ri-engine-fat.jar)"
if [[ ! -r engine_completion ]]
then
diff --git a/acme/.gitignore b/example/.gitignore
index a01565a..c6f6ac8 100644
--- a/acme/.gitignore
+++ b/example/.gitignore
@@ -1,4 +1,4 @@
-.terraform*
+../acme/.terraform
terraform.d
*.tfstate
*.tfstate.backup
@@ -7,3 +7,4 @@ plan
.vault-password*
*.dot
*.png
+.ninja_log
diff --git a/acme/.settings.sh b/example/.settings.sh
index 7bd49fb..7bd49fb 100644
--- a/acme/.settings.sh
+++ b/example/.settings.sh
diff --git a/acme/Makefile b/example/Makefile
index 39d54a6..39d54a6 100644
--- a/acme/Makefile
+++ b/example/Makefile
diff --git a/acme-apps/ansible/dba/acme-myapp-ci.yml b/example/acme-apps/ansible/dba/acme-myapp-ci.yml
index 584ddf3..e73360d 100644
--- a/acme-apps/ansible/dba/acme-myapp-ci.yml
+++ b/example/acme-apps/ansible/dba/acme-myapp-ci.yml
@@ -3,7 +3,7 @@
# cluster:
---
- host:
- - acme-1
+ - acme-2
tasks:
import_role:
name: docker-service
@@ -11,18 +11,14 @@
template: |
version: "3"
services:
- 4tune-api:
- image: 4tune-api:development
- 4tune-web:
- image: 4tune-web:development
- statera-console:
- image: statera-console:development
- statera:
- image: statera:development
+ mdb:
+ image: mongodb:3.2
+ pdb:
+ image: postgresql:13
---
- host:
- - acme-2
+ - acme-1
tasks:
import_role:
name: docker-service
@@ -30,8 +26,12 @@
template: |
version: "3"
services:
- mdb:
- image: mongodb:3.2
- pdb:
- image: postgresql:13
+ 4tune-api:
+ image: 4tune-api:development
+ 4tune-web:
+ image: 4tune-web:development
+ statera-console:
+ image: statera-console:development
+ statera:
+ image: statera:development
diff --git a/acme-apps/ansible/dba/acme-myapp-production.yml b/example/acme-apps/ansible/dba/acme-myapp-production.yml
index 6b6bf6c..6b6bf6c 100644
--- a/acme-apps/ansible/dba/acme-myapp-production.yml
+++ b/example/acme-apps/ansible/dba/acme-myapp-production.yml
diff --git a/acme-apps/ansible/dba/acme-ops.yml b/example/acme-apps/ansible/dba/acme-ops.yml
index 077c554..077c554 100644
--- a/acme-apps/ansible/dba/acme-ops.yml
+++ b/example/acme-apps/ansible/dba/acme-ops.yml
diff --git a/acme-apps/terraform/acme-1-instance.tf b/example/acme-apps/terraform/acme-1-instance.tf
index e1aed14..e1aed14 100644
--- a/acme-apps/terraform/acme-1-instance.tf
+++ b/example/acme-apps/terraform/acme-1-instance.tf
diff --git a/acme-apps/terraform/acme-1-ip.tf b/example/acme-apps/terraform/acme-1-ip.tf
index 283eb55..283eb55 100644
--- a/acme-apps/terraform/acme-1-ip.tf
+++ b/example/acme-apps/terraform/acme-1-ip.tf
diff --git a/acme-apps/terraform/acme-2-instance.tf b/example/acme-apps/terraform/acme-2-instance.tf
index 4ae0fe5..4ae0fe5 100644
--- a/acme-apps/terraform/acme-2-instance.tf
+++ b/example/acme-apps/terraform/acme-2-instance.tf
diff --git a/acme-apps/terraform/acme-2-ip.tf b/example/acme-apps/terraform/acme-2-ip.tf
index f72fe88..f72fe88 100644
--- a/acme-apps/terraform/acme-2-ip.tf
+++ b/example/acme-apps/terraform/acme-2-ip.tf
diff --git a/acme-apps/terraform/acme-3-instance.tf b/example/acme-apps/terraform/acme-3-instance.tf
index 389b39b..389b39b 100644
--- a/acme-apps/terraform/acme-3-instance.tf
+++ b/example/acme-apps/terraform/acme-3-instance.tf
diff --git a/acme-apps/terraform/acme-3-ip.tf b/example/acme-apps/terraform/acme-3-ip.tf
index 7d07eb9..7d07eb9 100644
--- a/acme-apps/terraform/acme-3-ip.tf
+++ b/example/acme-apps/terraform/acme-3-ip.tf
diff --git a/acme-apps/terraform/main.tf b/example/acme-apps/terraform/main.tf
index 74efe05..74efe05 100644
--- a/acme-apps/terraform/main.tf
+++ b/example/acme-apps/terraform/main.tf
diff --git a/acme-apps/terraform/vars.tf b/example/acme-apps/terraform/vars.tf
index 8b13789..8b13789 100644
--- a/acme-apps/terraform/vars.tf
+++ b/example/acme-apps/terraform/vars.tf
diff --git a/acme-wireguard/host_vars/acme-1/wireguard.yml b/example/acme-wireguard/host_vars/acme-1/wireguard.yml
index 3c71e52..3c71e52 100644
--- a/acme-wireguard/host_vars/acme-1/wireguard.yml
+++ b/example/acme-wireguard/host_vars/acme-1/wireguard.yml
diff --git a/acme-wireguard/host_vars/acme-2/wireguard.yml b/example/acme-wireguard/host_vars/acme-2/wireguard.yml
index d7e4219..d7e4219 100644
--- a/acme-wireguard/host_vars/acme-2/wireguard.yml
+++ b/example/acme-wireguard/host_vars/acme-2/wireguard.yml
diff --git a/acme-wireguard/host_vars/acme-3/wireguard.yml b/example/acme-wireguard/host_vars/acme-3/wireguard.yml
index 7d7fa76..7d7fa76 100644
--- a/acme-wireguard/host_vars/acme-3/wireguard.yml
+++ b/example/acme-wireguard/host_vars/acme-3/wireguard.yml
diff --git a/acme-wireguard/host_vars/ws-1/wireguard.yml b/example/acme-wireguard/host_vars/ws-1/wireguard.yml
index 0372db8..0372db8 100644
--- a/acme-wireguard/host_vars/ws-1/wireguard.yml
+++ b/example/acme-wireguard/host_vars/ws-1/wireguard.yml
diff --git a/acme-wireguard/host_vars/ws-2/wireguard.yml b/example/acme-wireguard/host_vars/ws-2/wireguard.yml
index 133bd66..133bd66 100644
--- a/acme-wireguard/host_vars/ws-2/wireguard.yml
+++ b/example/acme-wireguard/host_vars/ws-2/wireguard.yml
diff --git a/acme-wireguard/inventory.yml b/example/acme-wireguard/inventory.yml
index de54c64..de54c64 100644
--- a/acme-wireguard/inventory.yml
+++ b/example/acme-wireguard/inventory.yml
diff --git a/acme-wireguard/wireguard-vpn0.yml b/example/acme-wireguard/wireguard-vpn0.yml
index a1309e2..a1309e2 100644
--- a/acme-wireguard/wireguard-vpn0.yml
+++ b/example/acme-wireguard/wireguard-vpn0.yml
diff --git a/acme.yaml b/example/acme.yaml
index 741e711..741e711 100644
--- a/acme.yaml
+++ b/example/acme.yaml
diff --git a/acme/ansible.cfg b/example/ansible.cfg
index 1790523..1790523 100644
--- a/acme/ansible.cfg
+++ b/example/ansible.cfg
diff --git a/example/build.ninja b/example/build.ninja
new file mode 100644
index 0000000..7ccc450
--- /dev/null
+++ b/example/build.ninja
@@ -0,0 +1 @@
+subninja engine.ninja
diff --git a/out/acme/apps.yaml b/example/db/apps.yaml
index 61a0673..b27231a 100644
--- a/out/acme/apps.yaml
+++ b/example/db/apps.yaml
@@ -215,6 +215,14 @@
roles:
- "production-app"
- "production-db"
+- type: "io.trygvis.rules.wireguard.WgNet"
+ data:
+ &vpn0 name: "vpn0"
+ domain: "vpn.acme.com"
+ port: 53476
+ linkCidr: "192.168.10.0/29"
+ networkCidr: "10.55.0.0/16"
+ networkBits: 24
- type: "io.trygvis.rules.terraform.TerraformResource$ArrayTerraformValue"
data:
- "scaleway_instance_ip.acme-1.id"
diff --git a/out/acme/wireguard.yaml b/example/db/wireguard.yaml
index a374351..a374351 100644
--- a/out/acme/wireguard.yaml
+++ b/example/db/wireguard.yaml
diff --git a/example/engine.ninja b/example/engine.ninja
index 3e6c6f3..3c53218 100644
--- a/example/engine.ninja
+++ b/example/engine.ninja
@@ -5,7 +5,7 @@
rule engine-yaml-to-ninja
command = engine ninja
-build engine.ninja: engine.yaml
+build engine.ninja: engine-yaml-to-ninja engine.yaml
### engine.png
@@ -22,35 +22,32 @@ build engine.png: dot-to-png engine.dot
# Jobs
rule acme
- command=engine run $name $inputs $output_state $agenda_group $modules
+ command=engine run $name $inputs $output_state $output_includes $generated_output $agenda_groups $modules
build db/acme.yaml: acme
name=--name acme
output_state=--output-state db/acme.yaml
- agenda_group=
modules=$
--module=foo $
--module=bar
rule acme-apps
- command=engine run $name $inputs $output_state $agenda_group $modules
+ command=engine run $name $inputs $output_state $output_includes $generated_output $agenda_groups $modules
build db/acme-apps.yaml: acme-apps db/acme.yaml
name=--name acme-apps
inputs=$
--input=db/acme.yaml
output_state=--output-state db/acme-apps.yaml
- agenda_group=
rule acme-wireguard
- command=engine run $name $inputs $output_state $agenda_group $modules
+ command=engine run $name $inputs $output_state $output_includes $generated_output $agenda_groups $modules
build db/acme-wireguard.yaml: acme-wireguard db/acme.yaml
name=--name acme-wireguard
inputs=$
--input=db/acme.yaml
output_state=--output-state db/acme-wireguard.yaml
- agenda_group=
modules=$
--module=foo $
--module=$$MODULE_HOME/bar
diff --git a/acme/main.tf b/example/main.tf
index c7b91b2..c7b91b2 100644
--- a/acme/main.tf
+++ b/example/main.tf
diff --git a/module/acme/pom.xml b/example/modules/acme/pom.xml
index 3081602..01b9ab0 100644
--- a/module/acme/pom.xml
+++ b/example/modules/acme/pom.xml
@@ -8,7 +8,7 @@
<groupId>io.trygvis.rules-sandbox.module</groupId>
<artifactId>ri-module-parent</artifactId>
<version>1.0-SNAPSHOT</version>
- <relativePath>../ri-module-parent/pom.xml</relativePath>
+ <relativePath>../../../modules/ri-module-parent/pom.xml</relativePath>
</parent>
<artifactId>acme</artifactId>
diff --git a/module/acme/src/main/java/io/trygvis/acme/AcmeAppsMain.java b/example/modules/acme/src/main/java/io/trygvis/acme/AcmeAppsMain.java
index c65a3b2..c65a3b2 100644
--- a/module/acme/src/main/java/io/trygvis/acme/AcmeAppsMain.java
+++ b/example/modules/acme/src/main/java/io/trygvis/acme/AcmeAppsMain.java
diff --git a/module/acme/src/main/java/io/trygvis/acme/VpnMain.java b/example/modules/acme/src/main/java/io/trygvis/acme/VpnMain.java
index cbf962c..cbf962c 100644
--- a/module/acme/src/main/java/io/trygvis/acme/VpnMain.java
+++ b/example/modules/acme/src/main/java/io/trygvis/acme/VpnMain.java
diff --git a/module/acme/src/main/java/io/trygvis/acme/apps/AcmeMyApp.java b/example/modules/acme/src/main/java/io/trygvis/acme/apps/AcmeMyApp.java
index 9371af2..9371af2 100644
--- a/module/acme/src/main/java/io/trygvis/acme/apps/AcmeMyApp.java
+++ b/example/modules/acme/src/main/java/io/trygvis/acme/apps/AcmeMyApp.java
diff --git a/module/acme/src/main/java/io/trygvis/acme/apps/AcmeOps.java b/example/modules/acme/src/main/java/io/trygvis/acme/apps/AcmeOps.java
index be9d82b..be9d82b 100644
--- a/module/acme/src/main/java/io/trygvis/acme/apps/AcmeOps.java
+++ b/example/modules/acme/src/main/java/io/trygvis/acme/apps/AcmeOps.java
diff --git a/module/acme/src/main/resources/META-INF/kmodule.xml b/example/modules/acme/src/main/resources/META-INF/kmodule.xml
index da435d6..da435d6 100644
--- a/module/acme/src/main/resources/META-INF/kmodule.xml
+++ b/example/modules/acme/src/main/resources/META-INF/kmodule.xml
diff --git a/module/acme/src/main/resources/io/trygvis/acme/acme.drl b/example/modules/acme/src/main/resources/io/trygvis/acme/acme.drl
index 6a2f33b..6a2f33b 100644
--- a/module/acme/src/main/resources/io/trygvis/acme/acme.drl
+++ b/example/modules/acme/src/main/resources/io/trygvis/acme/acme.drl
diff --git a/module/acme/src/main/resources/io/trygvis/acme/apps/apps.drl b/example/modules/acme/src/main/resources/io/trygvis/acme/apps/apps.drl
index 670079f..670079f 100644
--- a/module/acme/src/main/resources/io/trygvis/acme/apps/apps.drl
+++ b/example/modules/acme/src/main/resources/io/trygvis/acme/apps/apps.drl
diff --git a/module/acme/classpath.txt b/module/acme/classpath.txt
deleted file mode 100644
index e544c09..0000000
--- a/module/acme/classpath.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-io.trygvis.rules-sandbox.module:acme:1.0-SNAPSHOT:jar
-com.fasterxml.jackson.core:jackson-annotations:2.12.0:jar
-com.fasterxml.jackson.core:jackson-core:2.12.0:jar
-com.fasterxml.jackson.core:jackson-databind:2.12.0:jar
-com.github.javaparser:javaparser-core:3.13.10:jar
-com.thoughtworks.xstream:xstream:1.4.14:jar
-commons-codec:commons-codec:1.14:jar
-commons-io:commons-io:2.8.0:jar
-io.trygvis.rules-sandbox.module:ri-base:1.0-SNAPSHOT:jar
-io.trygvis.rules-sandbox.module:ri-module-api:1.0-SNAPSHOT:jar
-io.trygvis.rules-sandbox.module:ri-wireguard:1.0-SNAPSHOT:jar
-org.antlr:antlr-runtime:3.5.2:jar
-org.drools:drools-canonical-model:7.48.0.Final:jar
-org.drools:drools-compiler:7.48.0.Final:jar
-org.drools:drools-core:7.48.0.Final:jar
-org.drools:drools-core-dynamic:7.48.0.Final:jar
-org.drools:drools-core-reflective:7.48.0.Final:jar
-org.drools:drools-ecj:7.48.0.Final:jar
-org.drools:drools-model-compiler:7.48.0.Final:jar
-org.drools:drools-mvel-compiler:7.48.0.Final:jar
-org.drools:drools-mvel-parser:7.48.0.Final:jar
-org.kie:kie-api:7.48.0.Final:jar
-org.kie:kie-internal:7.48.0.Final:jar
-org.kie:kie-memory-compiler:7.48.0.Final:jar
-org.kie.soup:kie-soup-maven-support:7.48.0.Final:jar
-org.kie.soup:kie-soup-xstream:7.48.0.Final:jar
-org.slf4j:slf4j-api:1.7.30:jar
-xmlpull:xmlpull:1.1.3.1:jar
-xpp3:xpp3_min:1.1.4c:jar
diff --git a/module/ri-base/classpath.txt b/modules/ri-base/classpath.txt
index d5370b2..d5370b2 100644
--- a/module/ri-base/classpath.txt
+++ b/modules/ri-base/classpath.txt
diff --git a/module/ri-base/pom.xml b/modules/ri-base/pom.xml
index 119368c..119368c 100644
--- a/module/ri-base/pom.xml
+++ b/modules/ri-base/pom.xml
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/core/Problem.java b/modules/ri-base/src/main/java/io/trygvis/rules/core/Problem.java
index 04d1af3..04d1af3 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/core/Problem.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/core/Problem.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/dba/Cluster.java b/modules/ri-base/src/main/java/io/trygvis/rules/dba/Cluster.java
index 6b23cdd..6b23cdd 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/dba/Cluster.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/dba/Cluster.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/dba/Container.java b/modules/ri-base/src/main/java/io/trygvis/rules/dba/Container.java
index a420671..a420671 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/dba/Container.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/dba/Container.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/dns/DnsEntry.java b/modules/ri-base/src/main/java/io/trygvis/rules/dns/DnsEntry.java
index 105ef79..105ef79 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/dns/DnsEntry.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/dns/DnsEntry.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/dns/DnsEntryTerraformExpression.java b/modules/ri-base/src/main/java/io/trygvis/rules/dns/DnsEntryTerraformExpression.java
index 79bf934..79bf934 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/dns/DnsEntryTerraformExpression.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/dns/DnsEntryTerraformExpression.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/dns/DnsZone.java b/modules/ri-base/src/main/java/io/trygvis/rules/dns/DnsZone.java
index 1af5c8f..1af5c8f 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/dns/DnsZone.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/dns/DnsZone.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/engine/KeyValue.java b/modules/ri-base/src/main/java/io/trygvis/rules/engine/KeyValue.java
index 5046169..5046169 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/engine/KeyValue.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/engine/KeyValue.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/machine/Machine.java b/modules/ri-base/src/main/java/io/trygvis/rules/machine/Machine.java
index 8f162c6..8f162c6 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/machine/Machine.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/machine/Machine.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/machine/MachineSpecification.java b/modules/ri-base/src/main/java/io/trygvis/rules/machine/MachineSpecification.java
index 9d38b2d..9d38b2d 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/machine/MachineSpecification.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/machine/MachineSpecification.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/network/IpCalc.java b/modules/ri-base/src/main/java/io/trygvis/rules/network/IpCalc.java
index 7ec344c..7ec344c 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/network/IpCalc.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/network/IpCalc.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/network/Ipv4Address.java b/modules/ri-base/src/main/java/io/trygvis/rules/network/Ipv4Address.java
index 9021198..9021198 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/network/Ipv4Address.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/network/Ipv4Address.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/network/Ipv4Cidr.java b/modules/ri-base/src/main/java/io/trygvis/rules/network/Ipv4Cidr.java
index 851af95..851af95 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/network/Ipv4Cidr.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/network/Ipv4Cidr.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformInputVariable.java b/modules/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformInputVariable.java
index 1415767..1415767 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformInputVariable.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformInputVariable.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformMain.java b/modules/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformMain.java
index 82626d2..82626d2 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformMain.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformMain.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformProvider.java b/modules/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformProvider.java
index 613d953..613d953 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformProvider.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformProvider.java
diff --git a/module/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformResource.java b/modules/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformResource.java
index 351a3e1..351a3e1 100644
--- a/module/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformResource.java
+++ b/modules/ri-base/src/main/java/io/trygvis/rules/terraform/TerraformResource.java
diff --git a/module/ri-base/src/main/resources/META-INF/kmodule.xml b/modules/ri-base/src/main/resources/META-INF/kmodule.xml
index 4650977..4650977 100644
--- a/module/ri-base/src/main/resources/META-INF/kmodule.xml
+++ b/modules/ri-base/src/main/resources/META-INF/kmodule.xml
diff --git a/module/ri-base/src/main/resources/io/trygvis/rules/dba/dba.drl b/modules/ri-base/src/main/resources/io/trygvis/rules/dba/dba.drl
index c31bc57..c31bc57 100644
--- a/module/ri-base/src/main/resources/io/trygvis/rules/dba/dba.drl
+++ b/modules/ri-base/src/main/resources/io/trygvis/rules/dba/dba.drl
diff --git a/module/ri-base/src/main/resources/io/trygvis/rules/engine/init.drl b/modules/ri-base/src/main/resources/io/trygvis/rules/engine/init.drl
index 267cc4a..267cc4a 100644
--- a/module/ri-base/src/main/resources/io/trygvis/rules/engine/init.drl
+++ b/modules/ri-base/src/main/resources/io/trygvis/rules/engine/init.drl
diff --git a/module/ri-base/src/main/resources/io/trygvis/rules/machine/machine.drl b/modules/ri-base/src/main/resources/io/trygvis/rules/machine/machine.drl
index 0250cc6..0250cc6 100644
--- a/module/ri-base/src/main/resources/io/trygvis/rules/machine/machine.drl
+++ b/modules/ri-base/src/main/resources/io/trygvis/rules/machine/machine.drl
diff --git a/module/ri-base/src/main/resources/io/trygvis/rules/scaleway/terraform.drl b/modules/ri-base/src/main/resources/io/trygvis/rules/scaleway/terraform.drl
index 7e0ff03..7e0ff03 100644
--- a/module/ri-base/src/main/resources/io/trygvis/rules/scaleway/terraform.drl
+++ b/modules/ri-base/src/main/resources/io/trygvis/rules/scaleway/terraform.drl
diff --git a/module/ri-base/src/main/resources/io/trygvis/rules/terraform/terraform-resources.drl b/modules/ri-base/src/main/resources/io/trygvis/rules/terraform/terraform-resources.drl
index 40a81f0..40a81f0 100644
--- a/module/ri-base/src/main/resources/io/trygvis/rules/terraform/terraform-resources.drl
+++ b/modules/ri-base/src/main/resources/io/trygvis/rules/terraform/terraform-resources.drl
diff --git a/module/ri-base/src/main/resources/templates/dba/cluster.j2 b/modules/ri-base/src/main/resources/templates/dba/cluster.j2
index 045fbcd..045fbcd 100644
--- a/module/ri-base/src/main/resources/templates/dba/cluster.j2
+++ b/modules/ri-base/src/main/resources/templates/dba/cluster.j2
diff --git a/module/ri-base/src/main/resources/templates/platform-ansible.j2 b/modules/ri-base/src/main/resources/templates/platform-ansible.j2
index 72e3247..72e3247 100644
--- a/module/ri-base/src/main/resources/templates/platform-ansible.j2
+++ b/modules/ri-base/src/main/resources/templates/platform-ansible.j2
diff --git a/module/ri-base/src/main/resources/templates/terraform/machine-outputs.j2 b/modules/ri-base/src/main/resources/templates/terraform/machine-outputs.j2
index 438fac6..438fac6 100644
--- a/module/ri-base/src/main/resources/templates/terraform/machine-outputs.j2
+++ b/modules/ri-base/src/main/resources/templates/terraform/machine-outputs.j2
diff --git a/module/ri-base/src/main/resources/templates/terraform/machine.j2 b/modules/ri-base/src/main/resources/templates/terraform/machine.j2
index 0ac8b90..0ac8b90 100644
--- a/module/ri-base/src/main/resources/templates/terraform/machine.j2
+++ b/modules/ri-base/src/main/resources/templates/terraform/machine.j2
diff --git a/module/ri-base/src/main/resources/templates/terraform/main-scaleway-machine.j2 b/modules/ri-base/src/main/resources/templates/terraform/main-scaleway-machine.j2
index eab9fac..eab9fac 100644
--- a/module/ri-base/src/main/resources/templates/terraform/main-scaleway-machine.j2
+++ b/modules/ri-base/src/main/resources/templates/terraform/main-scaleway-machine.j2
diff --git a/module/ri-base/src/main/resources/templates/terraform/main.j2 b/modules/ri-base/src/main/resources/templates/terraform/main.j2
index 009f4ed..009f4ed 100644
--- a/module/ri-base/src/main/resources/templates/terraform/main.j2
+++ b/modules/ri-base/src/main/resources/templates/terraform/main.j2
diff --git a/module/ri-base/src/main/resources/templates/terraform/record-set.j2 b/modules/ri-base/src/main/resources/templates/terraform/record-set.j2
index b89ee00..b89ee00 100644
--- a/module/ri-base/src/main/resources/templates/terraform/record-set.j2
+++ b/modules/ri-base/src/main/resources/templates/terraform/record-set.j2
diff --git a/module/ri-base/src/main/resources/templates/terraform/resource.j2 b/modules/ri-base/src/main/resources/templates/terraform/resource.j2
index 91af481..91af481 100644
--- a/module/ri-base/src/main/resources/templates/terraform/resource.j2
+++ b/modules/ri-base/src/main/resources/templates/terraform/resource.j2
diff --git a/module/ri-base/src/main/resources/templates/terraform/variables.j2 b/modules/ri-base/src/main/resources/templates/terraform/variables.j2
index 6c37d99..6c37d99 100644
--- a/module/ri-base/src/main/resources/templates/terraform/variables.j2
+++ b/modules/ri-base/src/main/resources/templates/terraform/variables.j2
diff --git a/module/ri-base/src/test/java/io/trygvis/rules/network/Ipv4CidrTest.txt b/modules/ri-base/src/test/java/io/trygvis/rules/network/Ipv4CidrTest.txt
index 826f586..826f586 100644
--- a/module/ri-base/src/test/java/io/trygvis/rules/network/Ipv4CidrTest.txt
+++ b/modules/ri-base/src/test/java/io/trygvis/rules/network/Ipv4CidrTest.txt
diff --git a/modules/ri-docker/pom.xml b/modules/ri-docker/pom.xml
new file mode 100644
index 0000000..49729da
--- /dev/null
+++ b/modules/ri-docker/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>io.trygvis.rules-sandbox.module</groupId>
+ <artifactId>ri-module-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../ri-module-parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>ri-docker</artifactId>
+ <packaging>kjar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ri-base</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/module/ri-module-api/classpath.txt b/modules/ri-module-api/classpath.txt
index 1f0f0a6..1f0f0a6 100644
--- a/module/ri-module-api/classpath.txt
+++ b/modules/ri-module-api/classpath.txt
diff --git a/module/ri-module-api/pom.xml b/modules/ri-module-api/pom.xml
index 118b5ba..118b5ba 100644
--- a/module/ri-module-api/pom.xml
+++ b/modules/ri-module-api/pom.xml
diff --git a/module/ri-module-api/src/main/java/io/trygvis/rules/engine/TemplateEngine.java b/modules/ri-module-api/src/main/java/io/trygvis/rules/engine/TemplateEngine.java
index eafa6e4..eafa6e4 100644
--- a/module/ri-module-api/src/main/java/io/trygvis/rules/engine/TemplateEngine.java
+++ b/modules/ri-module-api/src/main/java/io/trygvis/rules/engine/TemplateEngine.java
diff --git a/module/ri-module-parent/classpath.txt b/modules/ri-module-parent/classpath.txt
index 8624088..8624088 100644
--- a/module/ri-module-parent/classpath.txt
+++ b/modules/ri-module-parent/classpath.txt
diff --git a/module/ri-module-parent/pom.xml b/modules/ri-module-parent/pom.xml
index d593ca8..d593ca8 100644
--- a/module/ri-module-parent/pom.xml
+++ b/modules/ri-module-parent/pom.xml
diff --git a/module/ri-wireguard/classpath.txt b/modules/ri-wireguard/classpath.txt
index ef1b057..ef1b057 100644
--- a/module/ri-wireguard/classpath.txt
+++ b/modules/ri-wireguard/classpath.txt
diff --git a/module/ri-wireguard/pom.xml b/modules/ri-wireguard/pom.xml
index cc569d7..cc569d7 100644
--- a/module/ri-wireguard/pom.xml
+++ b/modules/ri-wireguard/pom.xml
diff --git a/module/ri-wireguard/src/main/resources/META-INF/kmodule.xml b/modules/ri-wireguard/src/main/resources/META-INF/kmodule.xml
index de617f7..de617f7 100644
--- a/module/ri-wireguard/src/main/resources/META-INF/kmodule.xml
+++ b/modules/ri-wireguard/src/main/resources/META-INF/kmodule.xml
diff --git a/module/ri-wireguard/src/main/resources/io/trygvis/rules/wireguard/wireguard.drl b/modules/ri-wireguard/src/main/resources/io/trygvis/rules/wireguard/wireguard.drl
index 5630ab6..5630ab6 100644
--- a/module/ri-wireguard/src/main/resources/io/trygvis/rules/wireguard/wireguard.drl
+++ b/modules/ri-wireguard/src/main/resources/io/trygvis/rules/wireguard/wireguard.drl
diff --git a/module/ri-wireguard/src/main/resources/logback.xml b/modules/ri-wireguard/src/main/resources/logback.xml
index 66ae905..66ae905 100644
--- a/module/ri-wireguard/src/main/resources/logback.xml
+++ b/modules/ri-wireguard/src/main/resources/logback.xml
diff --git a/module/ri-wireguard/src/main/resources/templates/wireguard/ansible-host.j2 b/modules/ri-wireguard/src/main/resources/templates/wireguard/ansible-host.j2
index 6cb3a05..6cb3a05 100644
--- a/module/ri-wireguard/src/main/resources/templates/wireguard/ansible-host.j2
+++ b/modules/ri-wireguard/src/main/resources/templates/wireguard/ansible-host.j2
diff --git a/module/ri-wireguard/src/main/resources/templates/wireguard/ansible.j2 b/modules/ri-wireguard/src/main/resources/templates/wireguard/ansible.j2
index ad4d034..ad4d034 100644
--- a/module/ri-wireguard/src/main/resources/templates/wireguard/ansible.j2
+++ b/modules/ri-wireguard/src/main/resources/templates/wireguard/ansible.j2
diff --git a/module/ri-wireguard/src/main/resources/templates/wireguard/inventory.j2 b/modules/ri-wireguard/src/main/resources/templates/wireguard/inventory.j2
index 64f3b5b..64f3b5b 100644
--- a/module/ri-wireguard/src/main/resources/templates/wireguard/inventory.j2
+++ b/modules/ri-wireguard/src/main/resources/templates/wireguard/inventory.j2
diff --git a/pom.xml b/pom.xml
index 2f062f1..e72ee2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,21 @@
<java.preview><!--enable-preview--></java.preview>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>5.7.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>5.7.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -77,10 +92,10 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>module/acme</module>
- <module>module/acme-planner</module>
- <module>module/ri-engine</module>
- <module>module/ri-module-api</module>
+ <module>modules/ri-module-api</module>
+ <module>src/ri-planner</module>
+ <module>src/ri-engine</module>
+ <module>src/ri-it</module>
</modules>
</profile>
<profile>
@@ -89,10 +104,10 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>module/ri-base</module>
- <module>module/ri-module-api</module>
- <module>module/ri-module-parent</module>
- <module>module/ri-wireguard</module>
+ <module>modules/ri-base</module>
+ <module>modules/ri-module-api</module>
+ <module>modules/ri-module-parent</module>
+ <module>modules/ri-wireguard</module>
</modules>
</profile>
</profiles>
@@ -164,7 +179,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/module/ri-engine/classpath.txt b/src/ri-engine/classpath.txt
index f01f5f8..f01f5f8 100644
--- a/module/ri-engine/classpath.txt
+++ b/src/ri-engine/classpath.txt
diff --git a/module/ri-engine/pom.xml b/src/ri-engine/pom.xml
index a2307f0..e974b7c 100644
--- a/module/ri-engine/pom.xml
+++ b/src/ri-engine/pom.xml
@@ -25,25 +25,6 @@
</dependency>
<dependency>
- <groupId>io.trygvis.rules-sandbox.module</groupId>
- <artifactId>ri-base</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.trygvis.rules-sandbox.module</groupId>
- <artifactId>ri-wireguard</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.trygvis.rules-sandbox.module</groupId>
- <artifactId>acme</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
</dependency>
@@ -89,19 +70,6 @@
<artifactId>picocli</artifactId>
<version>${version.picocli}</version>
</dependency>
-
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>5.7.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>5.7.0</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -138,7 +106,7 @@
<resource>META-INF/kie.conf</resource>
</transformer>
</transformers>
- <outputFile>${project.build.directory}/${project.artifactId}-${project.version}-fat.jar</outputFile>
+ <outputFile>${project.build.directory}/${project.artifactId}-fat.jar</outputFile>
</configuration>
</execution>
</executions>
diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/engine/DbIo.java b/src/ri-engine/src/main/java/io/trygvis/rules/engine/DbIo.java
index 7dc24ad..7dc24ad 100644
--- a/module/ri-engine/src/main/java/io/trygvis/rules/engine/DbIo.java
+++ b/src/ri-engine/src/main/java/io/trygvis/rules/engine/DbIo.java
diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/engine/DbObject.java b/src/ri-engine/src/main/java/io/trygvis/rules/engine/DbObject.java
index 6b9817e..6b9817e 100644
--- a/module/ri-engine/src/main/java/io/trygvis/rules/engine/DbObject.java
+++ b/src/ri-engine/src/main/java/io/trygvis/rules/engine/DbObject.java
diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/engine/Engine.java b/src/ri-engine/src/main/java/io/trygvis/rules/engine/Engine.java
index f2247d3..f2247d3 100644
--- a/module/ri-engine/src/main/java/io/trygvis/rules/engine/Engine.java
+++ b/src/ri-engine/src/main/java/io/trygvis/rules/engine/Engine.java
diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/engine/JinjavaTemplateEngine.java b/src/ri-engine/src/main/java/io/trygvis/rules/engine/JinjavaTemplateEngine.java
index ba23089..ba23089 100644
--- a/module/ri-engine/src/main/java/io/trygvis/rules/engine/JinjavaTemplateEngine.java
+++ b/src/ri-engine/src/main/java/io/trygvis/rules/engine/JinjavaTemplateEngine.java
diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/engine/Main.java b/src/ri-engine/src/main/java/io/trygvis/rules/engine/Main.java
index dc9ed02..dc9ed02 100644
--- a/module/ri-engine/src/main/java/io/trygvis/rules/engine/Main.java
+++ b/src/ri-engine/src/main/java/io/trygvis/rules/engine/Main.java
diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/engine/TemplateLoader.java b/src/ri-engine/src/main/java/io/trygvis/rules/engine/TemplateLoader.java
index 9441264..9441264 100644
--- a/module/ri-engine/src/main/java/io/trygvis/rules/engine/TemplateLoader.java
+++ b/src/ri-engine/src/main/java/io/trygvis/rules/engine/TemplateLoader.java
diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/engine/cli/DatabaseCommand.java b/src/ri-engine/src/main/java/io/trygvis/rules/engine/cli/DatabaseCommand.java
index 03650b5..03650b5 100644
--- a/module/ri-engine/src/main/java/io/trygvis/rules/engine/cli/DatabaseCommand.java
+++ b/src/ri-engine/src/main/java/io/trygvis/rules/engine/cli/DatabaseCommand.java
diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/engine/cli/EngineFile.java b/src/ri-engine/src/main/java/io/trygvis/rules/engine/cli/EngineFile.java
index 8da0e39..8da0e39 100644
--- a/module/ri-engine/src/main/java/io/trygvis/rules/engine/cli/EngineFile.java
+++ b/src/ri-engine/src/main/java/io/trygvis/rules/engine/cli/EngineFile.java
diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/engine/cli/NinjaCommand.java b/src/ri-engine/src/main/java/io/trygvis/rules/engine/cli/NinjaCommand.java
index ef5ed1d..ef5ed1d 100644
--- a/module/ri-engine/src/main/java/io/trygvis/rules/engine/cli/NinjaCommand.java
+++ b/src/ri-engine/src/main/java/io/trygvis/rules/engine/cli/NinjaCommand.java
diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/engine/cli/RunCommand.java b/src/ri-engine/src/main/java/io/trygvis/rules/engine/cli/RunCommand.java
index 35f30cd..35f30cd 100644
--- a/module/ri-engine/src/main/java/io/trygvis/rules/engine/cli/RunCommand.java
+++ b/src/ri-engine/src/main/java/io/trygvis/rules/engine/cli/RunCommand.java
diff --git a/src/ri-it/classpath.txt b/src/ri-it/classpath.txt
new file mode 100644
index 0000000..0b29855
--- /dev/null
+++ b/src/ri-it/classpath.txt
@@ -0,0 +1,63 @@
+io.trygvis.rules-sandbox:ri-it:1.0-SNAPSHOT:jar
+ch.obermuhlner:big-math:2.0.0:jar
+ch.qos.logback:logback-classic:1.2.3:jar
+ch.qos.logback:logback-core:1.2.3:jar
+com.fasterxml.jackson.core:jackson-annotations:2.12.0:jar
+com.fasterxml.jackson.core:jackson-core:2.12.0:jar
+com.fasterxml.jackson.core:jackson-databind:2.12.0:jar
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.0:jar
+com.github.javaparser:javaparser-core:3.13.10:jar
+com.github.virtuald:curvesapi:1.06:jar
+com.google.code.findbugs:annotations:3.0.1:jar
+com.google.errorprone:error_prone_annotations:2.1.3:jar
+com.google.guava:guava:25.0-jre:jar
+com.google.j2objc:j2objc-annotations:1.1:jar
+com.google.re2j:re2j:1.2:jar
+com.googlecode.java-ipv6:java-ipv6:0.17:jar
+com.hubspot.jinjava:jinjava:2.5.6:jar
+com.thoughtworks.xstream:xstream:1.4.14:jar
+com.zaxxer:SparseBitSet:1.2:jar
+commons-codec:commons-codec:1.14:jar
+commons-io:commons-io:2.8.0:jar
+commons-net:commons-net:3.3:jar
+info.picocli:picocli:4.6.1:jar
+io.trygvis.rules-sandbox:ri-engine:1.0-SNAPSHOT:jar
+io.trygvis.rules-sandbox.module:ri-module-api:1.0-SNAPSHOT:jar
+org.antlr:antlr-runtime:3.5.2:jar
+org.apache.commons:commons-collections4:4.4:jar
+org.apache.commons:commons-compress:1.19:jar
+org.apache.commons:commons-lang3:3.10:jar
+org.apache.commons:commons-math3:3.6.1:jar
+org.apache.poi:poi:4.1.2:jar
+org.apache.poi:poi-ooxml:4.1.2:jar
+org.apache.poi:poi-ooxml-schemas:4.1.2:jar
+org.apache.xmlbeans:xmlbeans:3.1.0:jar
+org.checkerframework:checker-compat-qual:2.0.0:jar
+org.codehaus.mojo:animal-sniffer-annotations:1.14:jar
+org.drools:drools-canonical-model:7.48.0.Final:jar
+org.drools:drools-compiler:7.48.0.Final:jar
+org.drools:drools-core:7.48.0.Final:jar
+org.drools:drools-core-dynamic:7.48.0.Final:jar
+org.drools:drools-core-reflective:7.48.0.Final:jar
+org.drools:drools-decisiontables:7.48.0.Final:jar
+org.drools:drools-ecj:7.48.0.Final:jar
+org.drools:drools-model-compiler:7.48.0.Final:jar
+org.drools:drools-mvel:7.48.0.Final:jar
+org.drools:drools-mvel-compiler:7.48.0.Final:jar
+org.drools:drools-mvel-parser:7.48.0.Final:jar
+org.drools:drools-templates:7.48.0.Final:jar
+org.javassist:javassist:3.24.1-GA:jar
+org.jsoup:jsoup:1.10.3:jar
+org.kie:kie-api:7.48.0.Final:jar
+org.kie:kie-internal:7.48.0.Final:jar
+org.kie:kie-memory-compiler:7.48.0.Final:jar
+org.kie.soup:kie-soup-commons:7.48.0.Final:jar
+org.kie.soup:kie-soup-maven-support:7.48.0.Final:jar
+org.kie.soup:kie-soup-project-datamodel-api:7.48.0.Final:jar
+org.kie.soup:kie-soup-project-datamodel-commons:7.48.0.Final:jar
+org.kie.soup:kie-soup-xstream:7.48.0.Final:jar
+org.mvel:mvel2:2.4.11.Final:jar
+org.slf4j:slf4j-api:1.7.30:jar
+org.yaml:snakeyaml:1.26:jar
+xmlpull:xmlpull:1.1.3.1:jar
+xpp3:xpp3_min:1.1.4c:jar
diff --git a/src/ri-it/pom.xml b/src/ri-it/pom.xml
new file mode 100644
index 0000000..6ccefad
--- /dev/null
+++ b/src/ri-it/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>io.trygvis.rules-sandbox</groupId>
+ <artifactId>rules-sandbox</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>ri-it</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ri-engine</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.trygvis.rules-sandbox.module</groupId>
+ <artifactId>ri-base</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.trygvis.rules-sandbox.module</groupId>
+ <artifactId>ri-wireguard</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.trygvis.rules-sandbox.module</groupId>
+ <artifactId>acme</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/module/ri-engine/src/test/java/io/trygvis/rules/engine/AcmeAppsTestMain.java b/src/ri-it/src/test/java/io/trygvis/rules/engine/AcmeAppsTestMain.java
index 37e8787..a512daf 100644
--- a/module/ri-engine/src/test/java/io/trygvis/rules/engine/AcmeAppsTestMain.java
+++ b/src/ri-it/src/test/java/io/trygvis/rules/engine/AcmeAppsTestMain.java
@@ -8,12 +8,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
class AcmeAppsTestMain {
public static void main(String[] args) throws Exception {
+ var basedir = new File("example");
var c = new RunCommand();
c.name = "acme-apps";
- c.input = new File[]{new File("acme.yaml")};
- c.outputState = new File("out/acme/apps.yaml");
+ c.input = new File[]{new File(basedir, "acme.yaml")};
+ c.outputState = new File(basedir, "db/apps.yaml");
c.agendaGroups = new String[]{"init", "generate"};
- c.generatedOutput = new File("acme-apps");
+ c.generatedOutput = new File(basedir, "acme-apps");
assertEquals(0, c.call());
}
}
diff --git a/module/ri-engine/src/test/java/io/trygvis/rules/engine/AcmeWireguardTestMain.java b/src/ri-it/src/test/java/io/trygvis/rules/engine/AcmeWireguardTestMain.java
index cf6b1c8..243b07d 100644
--- a/module/ri-engine/src/test/java/io/trygvis/rules/engine/AcmeWireguardTestMain.java
+++ b/src/ri-it/src/test/java/io/trygvis/rules/engine/AcmeWireguardTestMain.java
@@ -8,12 +8,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
class AcmeWireguardTestMain {
public static void main(String[] args) throws Exception {
+ var basedir = new File("example");
var c = new RunCommand();
c.name = "acme-wireguard";
- c.input = new File[]{new File("acme.yaml")};
- c.outputState = new File("out/acme/wireguard.yaml");
+ c.input = new File[]{new File(basedir, "acme.yaml")};
+ c.outputState = new File(basedir, "db/wireguard.yaml");
c.agendaGroups = new String[]{"init", "generate"};
- c.generatedOutput = new File("acme-wireguard");
+ c.generatedOutput = new File(basedir, "acme-wireguard");
c.outputIncludes = new String[]{
"Wg*",
"Machine",
diff --git a/module/ri-engine/src/test/java/io/trygvis/rules/engine/NinjaTestMain.java b/src/ri-it/src/test/java/io/trygvis/rules/engine/NinjaTestMain.java
index d62eec1..d62eec1 100644
--- a/module/ri-engine/src/test/java/io/trygvis/rules/engine/NinjaTestMain.java
+++ b/src/ri-it/src/test/java/io/trygvis/rules/engine/NinjaTestMain.java
diff --git a/module/acme-planner/classpath.txt b/src/ri-planner/classpath.txt
index 411ee43..411ee43 100644
--- a/module/acme-planner/classpath.txt
+++ b/src/ri-planner/classpath.txt
diff --git a/module/acme-planner/pom.xml b/src/ri-planner/pom.xml
index ed8699d..ed8699d 100644
--- a/module/acme-planner/pom.xml
+++ b/src/ri-planner/pom.xml
diff --git a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudBalance.java b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudBalance.java
index 7311918..7311918 100644
--- a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudBalance.java
+++ b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudBalance.java
diff --git a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudBalancingEasyScoreCalculator.java b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudBalancingEasyScoreCalculator.java
index 6a14372..6a14372 100644
--- a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudBalancingEasyScoreCalculator.java
+++ b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudBalancingEasyScoreCalculator.java
diff --git a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudComputer.java b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudComputer.java
index aa2087d..aa2087d 100644
--- a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudComputer.java
+++ b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudComputer.java
diff --git a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudPlaningMain.java b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudPlaningMain.java
index 60b3fd3..60b3fd3 100644
--- a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudPlaningMain.java
+++ b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudPlaningMain.java
diff --git a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudPlanner.java b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudPlanner.java
index c629656..c629656 100644
--- a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudPlanner.java
+++ b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudPlanner.java
diff --git a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudProcess.java b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudProcess.java
index 2002903..2002903 100644
--- a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudProcess.java
+++ b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudProcess.java
diff --git a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudProcessDifficultyComparator.java b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudProcessDifficultyComparator.java
index 658e826..658e826 100644
--- a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/CloudProcessDifficultyComparator.java
+++ b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/CloudProcessDifficultyComparator.java
diff --git a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/ScalewayInstance.java b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/ScalewayInstance.java
index dfdc0e0..dfdc0e0 100644
--- a/module/acme-planner/src/main/java/io/trygvis/acme/planning/machine/ScalewayInstance.java
+++ b/src/ri-planner/src/main/java/io/trygvis/acme/planning/machine/ScalewayInstance.java
diff --git a/module/acme-planner/src/main/resources/io/trygvis/acme/planning/machine/solver-config.xml b/src/ri-planner/src/main/resources/io/trygvis/acme/planning/machine/solver-config.xml
index 81ae8ed..81ae8ed 100644
--- a/module/acme-planner/src/main/resources/io/trygvis/acme/planning/machine/solver-config.xml
+++ b/src/ri-planner/src/main/resources/io/trygvis/acme/planning/machine/solver-config.xml