From 5116cce4b687386f1a707a55e92bf734778ec602 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Mon, 9 Apr 2018 13:02:25 -0700
Subject: [PATCH 01/37] bump version

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index b50e8e7..0a4410e 100644
--- a/system.json
+++ b/system.json
@@ -8,7 +8,7 @@
         "url": "static-version-service.json",
         "parameters": {
           "NAME": "a",
-          "TAG": "1.0.0",
+          "TAG": "2.0.0",
           "PUBLIC": true
         }
       }

From 24e19f17acdd4e826955a3cdb3d6e7ebb3f9e414 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Mon, 9 Apr 2018 21:00:56 -0700
Subject: [PATCH 02/37] add aggregator service

---
 system.json | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/system.json b/system.json
index 0a4410e..4b9f094 100644
--- a/system.json
+++ b/system.json
@@ -5,13 +5,30 @@
   "subsystems": [
     {
       "$include": {
-        "url": "static-version-service.json",
+        "url": "version-aggregator-service.json",
         "parameters": {
           "NAME": "a",
-          "TAG": "2.0.0",
+          "TAG": "1.0.0",
           "PUBLIC": true
         }
       }
+    },
+    {
+      "type": "system",
+      "name": "b",
+
+      "subsystems": [
+        {
+          "$include": {
+            "url": "parameter-dynamic-version-service.json",
+            "parameters": {
+              "NAME": "c",
+              "VERSION": "1.0.0",
+              "PUBLIC": false
+            }
+          }
+        }
+      ]
     }
   ]
 }
\ No newline at end of file

From 417f584845fefb77e71271ec9dc83518be6b3173 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Tue, 10 Apr 2018 01:31:18 -0700
Subject: [PATCH 03/37] bump num instances

---
 system.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system.json b/system.json
index 4b9f094..255214e 100644
--- a/system.json
+++ b/system.json
@@ -24,7 +24,8 @@
             "parameters": {
               "NAME": "c",
               "VERSION": "1.0.0",
-              "PUBLIC": false
+              "PUBLIC": false,
+              "NUM_INSTANCES": 2
             }
           }
         }

From ff1a30f7bb3f8e9503e7ca53236a05dc38a4b641 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Fri, 20 Apr 2018 01:27:08 -0700
Subject: [PATCH 04/37] revert to 1 instance

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index 255214e..630c910 100644
--- a/system.json
+++ b/system.json
@@ -25,7 +25,7 @@
               "NAME": "c",
               "VERSION": "1.0.0",
               "PUBLIC": false,
-              "NUM_INSTANCES": 2
+              "NUM_INSTANCES": 1
             }
           }
         }

From 0a1ff69261a538f3a113c2356adee9348dc30296 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Fri, 20 Apr 2018 01:31:14 -0700
Subject: [PATCH 05/37] bump back up to 2 instances

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index 630c910..255214e 100644
--- a/system.json
+++ b/system.json
@@ -25,7 +25,7 @@
               "NAME": "c",
               "VERSION": "1.0.0",
               "PUBLIC": false,
-              "NUM_INSTANCES": 1
+              "NUM_INSTANCES": 2
             }
           }
         }

From 62087b2f3e42c24b4aa1eb023e486c11e29dcf3d Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Fri, 20 Apr 2018 01:32:20 -0700
Subject: [PATCH 06/37] back to 1 instance

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index 255214e..630c910 100644
--- a/system.json
+++ b/system.json
@@ -25,7 +25,7 @@
               "NAME": "c",
               "VERSION": "1.0.0",
               "PUBLIC": false,
-              "NUM_INSTANCES": 2
+              "NUM_INSTANCES": 1
             }
           }
         }

From 59f17edbfb3db961d103771c903e6c234bcbe809 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Wed, 2 May 2018 14:27:00 -0700
Subject: [PATCH 07/37] add dedicated node pool service

---
 ...c-version-service-dedicated-node-pool.json | 60 +++++++++++++++++++
 system.json                                   |  2 +-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 parameter-dynamic-version-service-dedicated-node-pool.json

diff --git a/parameter-dynamic-version-service-dedicated-node-pool.json b/parameter-dynamic-version-service-dedicated-node-pool.json
new file mode 100644
index 0000000..342cc0b
--- /dev/null
+++ b/parameter-dynamic-version-service-dedicated-node-pool.json
@@ -0,0 +1,60 @@
+{
+  "$parameters": {
+    "NAME": { "required": true },
+    "VERSION": { "required": true },
+    "PUBLIC": { "required": true },
+    "NUM_INSTANCES": { "default": 2 },
+    "NUM_NODE_POOL_INSTANCES": { "default": 1 },
+    "INSTANCE_TYPE": { "default": "t2.micro" }
+  },
+
+  "type": "service",
+  "name": "${NAME}",
+
+  "components": [
+    {
+      "name": "service",
+      "ports": [
+        {
+          "name": "http",
+          "port": 8080,
+          "protocol": "HTTP",
+          "external_access": {
+            "public": "${PUBLIC}"
+          }
+        }
+      ],
+      "build": {
+        "git_repository": {
+          "url": "https://github.com/mlab-lattice/testing__version-service.git",
+          "tag": "dynamic"
+        },
+        "language": "node:boron",
+        "command": "npm install"
+      },
+      "exec": {
+        "command": [
+          "node",
+          "VersionService.js"
+        ],
+        "environment": {
+          "PORT": "8080",
+          "VERSION": "${VERSION}"
+        }
+      },
+      "health_check": {
+        "http": {
+          "port": "http",
+          "path": "/status"
+        }
+      }
+    }
+  ],
+  "resources": {
+    "num_instances": "${NUM_INSTANCES}",
+    "node_pool": {
+      "num_instances": "${NUM_NODE_POOL_INSTANCES}",
+      "instance_type": "${INSTANCE_TYPE}"
+    }
+  }
+}
\ No newline at end of file
diff --git a/system.json b/system.json
index 630c910..0c9e7cf 100644
--- a/system.json
+++ b/system.json
@@ -20,7 +20,7 @@
       "subsystems": [
         {
           "$include": {
-            "url": "parameter-dynamic-version-service.json",
+            "url": "parameter-dynamic-version-service-dedicated-node-pool.json",
             "parameters": {
               "NAME": "c",
               "VERSION": "1.0.0",

From ce5af44bf85081e33c9cb1cb6f64b6990f90150c Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Wed, 2 May 2018 14:31:09 -0700
Subject: [PATCH 08/37] use default num instances

---
 system.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/system.json b/system.json
index 0c9e7cf..05f669d 100644
--- a/system.json
+++ b/system.json
@@ -24,8 +24,7 @@
             "parameters": {
               "NAME": "c",
               "VERSION": "1.0.0",
-              "PUBLIC": false,
-              "NUM_INSTANCES": 1
+              "PUBLIC": false
             }
           }
         }

From f5b6d3a59efde28a294cbf8d664a5df88fd7d8a1 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Wed, 2 May 2018 14:34:21 -0700
Subject: [PATCH 09/37] bump num instances but not num node pool instances

---
 system.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system.json b/system.json
index 05f669d..201e0e6 100644
--- a/system.json
+++ b/system.json
@@ -24,7 +24,8 @@
             "parameters": {
               "NAME": "c",
               "VERSION": "1.0.0",
-              "PUBLIC": false
+              "PUBLIC": false,
+              "NUM_INSTANCES": 4
             }
           }
         }

From 15288d3d9d13f57e6a09de9aea3ba03f83bfd9b8 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Wed, 2 May 2018 14:36:09 -0700
Subject: [PATCH 10/37] bump num node pool instances

---
 system.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system.json b/system.json
index 201e0e6..5da7278 100644
--- a/system.json
+++ b/system.json
@@ -25,6 +25,7 @@
               "NAME": "c",
               "VERSION": "1.0.0",
               "PUBLIC": false,
+              "NUM_NODE_POOL_INSTANCES": 2,
               "NUM_INSTANCES": 4
             }
           }

From 937e014786558a785d9f63fe92f8c360ca874623 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Thu, 10 May 2018 16:00:23 -0700
Subject: [PATCH 11/37] Update system.json

---
 system.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system.json b/system.json
index 5da7278..ff00ab6 100644
--- a/system.json
+++ b/system.json
@@ -26,11 +26,12 @@
               "VERSION": "1.0.0",
               "PUBLIC": false,
               "NUM_NODE_POOL_INSTANCES": 2,
-              "NUM_INSTANCES": 4
+              "NUM_INSTANCES": 4,
+              "INSTANCE_TYPE": "t2.medium"
             }
           }
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}

From 58d9656d35cc46ad98c6193e540101163ddd0671 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Thu, 10 May 2018 16:39:15 -0700
Subject: [PATCH 12/37] Update system.json

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index ff00ab6..77a1361 100644
--- a/system.json
+++ b/system.json
@@ -26,7 +26,7 @@
               "VERSION": "1.0.0",
               "PUBLIC": false,
               "NUM_NODE_POOL_INSTANCES": 2,
-              "NUM_INSTANCES": 4,
+              "NUM_INSTANCES": 40,
               "INSTANCE_TYPE": "t2.medium"
             }
           }

From 6ad4828760bf214606dbe0cb57508fbfa13d5784 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Thu, 10 May 2018 16:41:57 -0700
Subject: [PATCH 13/37] Update system.json

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index 77a1361..97d0230 100644
--- a/system.json
+++ b/system.json
@@ -27,7 +27,7 @@
               "PUBLIC": false,
               "NUM_NODE_POOL_INSTANCES": 2,
               "NUM_INSTANCES": 40,
-              "INSTANCE_TYPE": "t2.medium"
+              "INSTANCE_TYPE": "t2.large"
             }
           }
         }

From 41013a78584f4227047ed5c9ae59b9aabe74c7c5 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Thu, 10 May 2018 22:04:51 -0700
Subject: [PATCH 14/37] Update system.json

---
 system.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system.json b/system.json
index 97d0230..bd9ebf1 100644
--- a/system.json
+++ b/system.json
@@ -25,8 +25,8 @@
               "NAME": "c",
               "VERSION": "1.0.0",
               "PUBLIC": false,
-              "NUM_NODE_POOL_INSTANCES": 2,
-              "NUM_INSTANCES": 40,
+              "NUM_NODE_POOL_INSTANCES": 3,
+              "NUM_INSTANCES": 100,
               "INSTANCE_TYPE": "t2.large"
             }
           }

From ecaede655b6875f39b690c799c2c9256e2b4b647 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Thu, 10 May 2018 22:07:54 -0700
Subject: [PATCH 15/37] Update system.json

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index bd9ebf1..f888205 100644
--- a/system.json
+++ b/system.json
@@ -27,7 +27,7 @@
               "PUBLIC": false,
               "NUM_NODE_POOL_INSTANCES": 3,
               "NUM_INSTANCES": 100,
-              "INSTANCE_TYPE": "t2.large"
+              "INSTANCE_TYPE": "m5.large"
             }
           }
         }

From bcab841da9fd4345e7cadbaaf56383b33bc4cc16 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Tue, 15 May 2018 00:19:50 -0700
Subject: [PATCH 16/37] add initial demo system

---
 system.json | 101 +++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 81 insertions(+), 20 deletions(-)

diff --git a/system.json b/system.json
index f888205..8dc6857 100644
--- a/system.json
+++ b/system.json
@@ -1,37 +1,98 @@
 {
   "type": "system",
-  "name": "test",
+  "name": "demo",
 
   "subsystems": [
     {
-      "$include": {
-        "url": "version-aggregator-service.json",
-        "parameters": {
-          "NAME": "a",
-          "TAG": "1.0.0",
-          "PUBLIC": true
+      "type": "service",
+      "name": "aggregator",
+
+      "components": [
+        {
+          "name": "service",
+          "ports": [
+            {
+              "name": "http",
+              "port": 8080,
+              "protocol": "HTTP",
+              "external_access": { "public": true }
+            }
+          ],
+          "build": {
+            "git_repository": {
+              "url": "https://github.com/mlab-lattice/testing__version-aggregator-service.git",
+              "tag": "1.0.0"
+            },
+            "language": "node:boron",
+            "command": "npm install"
+          },
+          "exec": {
+            "command": [
+              "node",
+              "VersionAggregatorService.js"
+            ],
+            "environment": { "PORT": "8080" }
+          },
+          "health_check": {
+            "http": {
+              "port": "http",
+              "path": "/status"
+            }
+          }
         }
+      ],
+      "resources": {
+        "num_instances": 1,
+        "instance_type": "t2.micro"
       }
     },
     {
-      "type": "system",
-      "name": "b",
+      "type": "service",
+      "name": "version-service",
 
-      "subsystems": [
+      "components": [
         {
-          "$include": {
-            "url": "parameter-dynamic-version-service-dedicated-node-pool.json",
-            "parameters": {
-              "NAME": "c",
-              "VERSION": "1.0.0",
-              "PUBLIC": false,
-              "NUM_NODE_POOL_INSTANCES": 3,
-              "NUM_INSTANCES": 100,
-              "INSTANCE_TYPE": "m5.large"
+          "name": "service",
+          "ports": [
+            {
+              "name": "http",
+              "port": 8080,
+              "protocol": "HTTP"
+            }
+          ],
+          "build": {
+            "git_repository": {
+              "url": "https://github.com/mlab-lattice/testing__version-service.git",
+              "tag": "dynamic"
+            },
+            "language": "node:boron",
+            "command": "npm install"
+          },
+          "exec": {
+            "command": [
+              "node",
+              "VersionService.js"
+            ],
+            "environment": {
+              "PORT": "8080",
+              "VERSION": "1.0.0"
+            }
+          },
+          "health_check": {
+            "http": {
+              "port": "http",
+              "path": "/status"
             }
           }
         }
-      ]
+      ],
+      "resources": {
+        "num_instances": "3",
+        "node_pool": {
+          "num_instances": "2",
+          "instance_type": "t2.large"
+        }
+      }
     }
   ]
 }

From 74eb5091d15344aa12d70a8f50e5078ad9a17fd8 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Tue, 15 May 2018 00:21:58 -0700
Subject: [PATCH 17/37] typo

---
 system.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system.json b/system.json
index 8dc6857..b2f9987 100644
--- a/system.json
+++ b/system.json
@@ -87,9 +87,9 @@
         }
       ],
       "resources": {
-        "num_instances": "3",
+        "num_instances": 3,
         "node_pool": {
-          "num_instances": "2",
+          "num_instances": 2,
           "instance_type": "t2.large"
         }
       }

From f88a59bc0e82d49f21c1fc21c8778c1411682db7 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Tue, 15 May 2018 00:32:32 -0700
Subject: [PATCH 18/37] bump instances

---
 system.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system.json b/system.json
index b2f9987..6be7854 100644
--- a/system.json
+++ b/system.json
@@ -87,9 +87,9 @@
         }
       ],
       "resources": {
-        "num_instances": 3,
+        "num_instances": 100,
         "node_pool": {
-          "num_instances": 2,
+          "num_instances": 4,
           "instance_type": "t2.large"
         }
       }

From 2d8430ec6b3b457739eb0c3c802195dc1f5f334d Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Tue, 15 May 2018 01:11:41 -0700
Subject: [PATCH 19/37] change instance type

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index 6be7854..aa6028e 100644
--- a/system.json
+++ b/system.json
@@ -90,7 +90,7 @@
         "num_instances": 100,
         "node_pool": {
           "num_instances": 4,
-          "instance_type": "t2.large"
+          "instance_type": "m5.large"
         }
       }
     }

From 4c822f9b42378b486c110a0113a36b589c04f252 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Tue, 15 May 2018 01:18:08 -0700
Subject: [PATCH 20/37] update version

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index aa6028e..0e519d7 100644
--- a/system.json
+++ b/system.json
@@ -75,7 +75,7 @@
             ],
             "environment": {
               "PORT": "8080",
-              "VERSION": "1.0.0"
+              "VERSION": "2.0.0"
             }
           },
           "health_check": {

From 10f3b2d4a5e7d94af833534ca034814777b6c8e8 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Tue, 15 May 2018 12:20:50 -0700
Subject: [PATCH 21/37] add system level node pool

---
 system.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/system.json b/system.json
index 0e519d7..3a2cf00 100644
--- a/system.json
+++ b/system.json
@@ -2,6 +2,13 @@
   "type": "system",
   "name": "demo",
 
+  "node_pools": {
+    "foo": {
+      "instance_type": "t2.large",
+      "num_instances": 3
+    }
+  },
+
   "subsystems": [
     {
       "type": "service",

From c814dfe645de9ae517ec100f9cdc7d050d9f43ee Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Tue, 15 May 2018 12:22:04 -0700
Subject: [PATCH 22/37] bump down instance numbers

---
 system.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system.json b/system.json
index 3a2cf00..3e3d62c 100644
--- a/system.json
+++ b/system.json
@@ -94,10 +94,10 @@
         }
       ],
       "resources": {
-        "num_instances": 100,
+        "num_instances": 3,
         "node_pool": {
-          "num_instances": 4,
-          "instance_type": "m5.large"
+          "num_instances": 2,
+          "instance_type": "t2.medium"
         }
       }
     }

From a131317009ee91d0e13435122980ff813cf93a87 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Thu, 17 May 2018 13:26:29 -0700
Subject: [PATCH 23/37] use system node pool

---
 system.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/system.json b/system.json
index 3e3d62c..1be6178 100644
--- a/system.json
+++ b/system.json
@@ -50,7 +50,7 @@
       ],
       "resources": {
         "num_instances": 1,
-        "instance_type": "t2.micro"
+        "node_pool": "/demo/foo"
       }
     },
     {
@@ -95,10 +95,7 @@
       ],
       "resources": {
         "num_instances": 3,
-        "node_pool": {
-          "num_instances": 2,
-          "instance_type": "t2.medium"
-        }
+        "node_pool": "/demo/foo"
       }
     }
   ]

From 30f2bafbf1ee7e1b9b231b206244d89b19504e15 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Sun, 20 May 2018 16:30:09 -0700
Subject: [PATCH 24/37] change node pool naming scheme

---
 system.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system.json b/system.json
index 1be6178..ad0f2b5 100644
--- a/system.json
+++ b/system.json
@@ -50,7 +50,7 @@
       ],
       "resources": {
         "num_instances": 1,
-        "node_pool": "/demo/foo"
+        "node_pool": "/demo:foo"
       }
     },
     {
@@ -95,7 +95,7 @@
       ],
       "resources": {
         "num_instances": 3,
-        "node_pool": "/demo/foo"
+        "node_pool": "/demo:foo"
       }
     }
   ]

From b0fed2e83781a60d06a837a9b00dc8ffe61e92ab Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Mon, 18 Jun 2018 11:01:39 -0700
Subject: [PATCH 25/37] update system definition style

---
 system.json | 161 ++++++++++++++++++++++++----------------------------
 1 file changed, 74 insertions(+), 87 deletions(-)

diff --git a/system.json b/system.json
index ad0f2b5..d399c02 100644
--- a/system.json
+++ b/system.json
@@ -1,6 +1,5 @@
 {
-  "type": "system",
-  "name": "demo",
+  "type": "v1/system",
 
   "node_pools": {
     "foo": {
@@ -9,94 +8,82 @@
     }
   },
 
-  "subsystems": [
-    {
-      "type": "service",
-      "name": "aggregator",
-
-      "components": [
-        {
-          "name": "service",
-          "ports": [
-            {
-              "name": "http",
-              "port": 8080,
-              "protocol": "HTTP",
-              "external_access": { "public": true }
-            }
-          ],
-          "build": {
-            "git_repository": {
-              "url": "https://github.com/mlab-lattice/testing__version-aggregator-service.git",
-              "tag": "1.0.0"
-            },
-            "language": "node:boron",
-            "command": "npm install"
-          },
-          "exec": {
-            "command": [
-              "node",
-              "VersionAggregatorService.js"
-            ],
-            "environment": { "PORT": "8080" }
-          },
-          "health_check": {
-            "http": {
-              "port": "http",
-              "path": "/status"
-            }
-          }
+  "components": {
+    "aggregator": {
+      "type": "v1/service",
+      "port": {
+        "port": 8080,
+        "protocol": "HTTP",
+        "external_access": {
+          "public": true
+        }
+      },
+      "build": {
+        "git_repository": {
+          "url": "https://github.com/mlab-lattice/testing__version-aggregator-service.git",
+          "tag": "1.0.0"
+        },
+        "language": "node:boron",
+        "command": "npm install"
+      },
+      "exec": {
+        "command": [
+          "node",
+          "VersionAggregatorService.js"
+        ],
+        "environment": {
+          "PORT": "8080"
+        }
+      },
+      "health_check": {
+        "http": {
+          "port": "http",
+          "path": "/status"
         }
-      ],
-      "resources": {
-        "num_instances": 1,
-        "node_pool": "/demo:foo"
-      }
+      },
+
+      "num_instances": 1,
+      "node_pool": "/demo:foo"
     },
-    {
-      "type": "service",
-      "name": "version-service",
 
-      "components": [
-        {
-          "name": "service",
-          "ports": [
-            {
-              "name": "http",
-              "port": 8080,
-              "protocol": "HTTP"
-            }
-          ],
-          "build": {
-            "git_repository": {
-              "url": "https://github.com/mlab-lattice/testing__version-service.git",
-              "tag": "dynamic"
-            },
-            "language": "node:boron",
-            "command": "npm install"
-          },
-          "exec": {
-            "command": [
-              "node",
-              "VersionService.js"
-            ],
-            "environment": {
-              "PORT": "8080",
-              "VERSION": "2.0.0"
-            }
-          },
-          "health_check": {
-            "http": {
-              "port": "http",
-              "path": "/status"
-            }
-          }
+    "version-service": {
+      "type": "v1/service",
+      "ports": {
+        "http": {
+          "port": 8080,
+          "protocol": "HTTP"
+        }
+      },
+
+      "build": {
+        "git_repository": {
+          "url": "https://github.com/mlab-lattice/testing__version-service.git",
+          "tag": "dynamic"
+        },
+        "language": "node:boron",
+        "command": "npm install"
+      },
+
+      "exec": {
+        "command": [
+          "node",
+          "VersionService.js"
+        ],
+        "environment": {
+          "PORT": "8080",
+          "VERSION": "2.0.0"
         }
-      ],
-      "resources": {
-        "num_instances": 3,
-        "node_pool": "/demo:foo"
-      }
+      },
+
+      "health_check": {
+        "http": {
+          "port": "http",
+          "path": "/status"
+        }
+      },
+
+      "num_instances": 3,
+      "node_pool": "/demo:foo"
     }
-  ]
+  }
 }

From bae390a72ca48cf89f1226bc41c4efbf91b9a8d4 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Mon, 18 Jun 2018 11:12:46 -0700
Subject: [PATCH 26/37] fix build commands

---
 system.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system.json b/system.json
index d399c02..3c6330b 100644
--- a/system.json
+++ b/system.json
@@ -24,7 +24,7 @@
           "tag": "1.0.0"
         },
         "language": "node:boron",
-        "command": "npm install"
+        "command": ["npm", "install"]
       },
       "exec": {
         "command": [
@@ -61,7 +61,7 @@
           "tag": "dynamic"
         },
         "language": "node:boron",
-        "command": "npm install"
+        "command": ["npm", "install"]
       },
 
       "exec": {

From 4b41e63f9e187f1172d69d2908826e88f25ce8bf Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Mon, 18 Jun 2018 12:08:22 -0700
Subject: [PATCH 27/37] fix node pool reference path

---
 system.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system.json b/system.json
index 3c6330b..0732712 100644
--- a/system.json
+++ b/system.json
@@ -43,7 +43,7 @@
       },
 
       "num_instances": 1,
-      "node_pool": "/demo:foo"
+      "node_pool": "/:foo"
     },
 
     "version-service": {
@@ -83,7 +83,7 @@
       },
 
       "num_instances": 3,
-      "node_pool": "/demo:foo"
+      "node_pool": "/:foo"
     }
   }
 }

From 63d4369ba5789a7601876db4987e141b299ab854 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Mon, 18 Jun 2018 13:22:00 -0700
Subject: [PATCH 28/37] change port definition

---
 system.json | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/system.json b/system.json
index 0732712..f8f42a0 100644
--- a/system.json
+++ b/system.json
@@ -11,13 +11,16 @@
   "components": {
     "aggregator": {
       "type": "v1/service",
-      "port": {
-        "port": 8080,
-        "protocol": "HTTP",
-        "external_access": {
-          "public": true
+
+      "ports": {
+        "8080": {
+          "protocol": "HTTP",
+          "external_access": {
+            "public": true
+          }
         }
       },
+
       "build": {
         "git_repository": {
           "url": "https://github.com/mlab-lattice/testing__version-aggregator-service.git",
@@ -48,12 +51,8 @@
 
     "version-service": {
       "type": "v1/service",
-      "ports": {
-        "http": {
-          "port": 8080,
-          "protocol": "HTTP"
-        }
-      },
+
+      "ports": { "8080": { "protocol": "HTTP" } },
 
       "build": {
         "git_repository": {

From 8244a8302557f5d607937c4777a2b928515d9818 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Mon, 18 Jun 2018 13:27:52 -0700
Subject: [PATCH 29/37] fix health check port

---
 system.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system.json b/system.json
index f8f42a0..d852861 100644
--- a/system.json
+++ b/system.json
@@ -40,7 +40,7 @@
       },
       "health_check": {
         "http": {
-          "port": "http",
+          "port": 8080,
           "path": "/status"
         }
       },
@@ -76,7 +76,7 @@
 
       "health_check": {
         "http": {
-          "port": "http",
+          "port": 8080,
           "path": "/status"
         }
       },

From e0ac2b9ec6742a3b21b0971430069741448a1aa8 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Mon, 18 Jun 2018 17:41:29 -0700
Subject: [PATCH 30/37] add job

---
 system.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/system.json b/system.json
index d852861..459e1f9 100644
--- a/system.json
+++ b/system.json
@@ -9,6 +9,20 @@
   },
 
   "components": {
+    "ubuntu": {
+      "type": "v1/job",
+
+      "build": {
+        "docker_image": {
+          "registry": "registry.hub.docker.com",
+          "repository": "library/ubuntu",
+          "tag": "latest"
+        }
+      },
+
+      "node_pool": "/:foo"
+    },
+
     "aggregator": {
       "type": "v1/service",
 

From 1bf971b32eb14db892bc2172fb190b529829c926 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Mon, 30 Jul 2018 15:17:12 -0700
Subject: [PATCH 31/37] update to references

---
 system.json | 103 ++++++++++++----------------------------------------
 system.yaml |  37 +++++++++++++++++++
 2 files changed, 61 insertions(+), 79 deletions(-)
 create mode 100644 system.yaml

diff --git a/system.json b/system.json
index 459e1f9..e9a9639 100644
--- a/system.json
+++ b/system.json
@@ -4,99 +4,44 @@
   "node_pools": {
     "foo": {
       "instance_type": "t2.large",
-      "num_instances": 3
+      "num_instances": 2
     }
   },
 
   "components": {
-    "ubuntu": {
-      "type": "v1/job",
-
-      "build": {
-        "docker_image": {
-          "registry": "registry.hub.docker.com",
-          "repository": "library/ubuntu",
-          "tag": "latest"
-        }
-      },
-
-      "node_pool": "/:foo"
-    },
-
     "aggregator": {
-      "type": "v1/service",
+      "type": "v1/reference",
 
-      "ports": {
-        "8080": {
-          "protocol": "HTTP",
-          "external_access": {
-            "public": true
-          }
-        }
+      "git_repository": {
+        "file": "lattice.json",
+        "tag": "1.x",
+        "url": "https://github.com/mlab-lattice/testing__version-aggregator-service.git"
       },
 
-      "build": {
-        "git_repository": {
-          "url": "https://github.com/mlab-lattice/testing__version-aggregator-service.git",
-          "tag": "1.0.0"
-        },
-        "language": "node:boron",
-        "command": ["npm", "install"]
-      },
-      "exec": {
-        "command": [
-          "node",
-          "VersionAggregatorService.js"
-        ],
-        "environment": {
-          "PORT": "8080"
-        }
-      },
-      "health_check": {
-        "http": {
-          "port": 8080,
-          "path": "/status"
-        }
+      "parameters": {
+        "num_instances": 1
       },
-
-      "num_instances": 1,
-      "node_pool": "/:foo"
     },
 
-    "version-service": {
-      "type": "v1/service",
-
-      "ports": { "8080": { "protocol": "HTTP" } },
-
-      "build": {
-        "git_repository": {
-          "url": "https://github.com/mlab-lattice/testing__version-service.git",
-          "tag": "dynamic"
-        },
-        "language": "node:boron",
-        "command": ["npm", "install"]
-      },
+    "service": {
+      "type": "v1/reference",
 
-      "exec": {
-        "command": [
-          "node",
-          "VersionService.js"
-        ],
-        "environment": {
-          "PORT": "8080",
-          "VERSION": "2.0.0"
-        }
-      },
-
-      "health_check": {
-        "http": {
-          "port": 8080,
-          "path": "/status"
-        }
+      "git_repository": {
+        "file": "lattice.yaml",
+        "tag": "1.0.x",
+        "url": "https://github.com/mlab-lattice/testing__version-service.git"
       },
+    },
 
-      "num_instances": 3,
-      "node_pool": "/:foo"
+    "ubuntu": {
+      "type": "v1/job",
+      "build": {
+        "node_pool": "/:foo",
+        "registry": "registry.hub.docker.com",
+        "repository": "library/ubuntu",
+        "tag": "latest",
+        "type": "docker_image"
+      }
     }
   }
 }
diff --git a/system.yaml b/system.yaml
new file mode 100644
index 0000000..21493b1
--- /dev/null
+++ b/system.yaml
@@ -0,0 +1,37 @@
+type: v1/system
+node_pools:
+  foo:
+    instance_type: t2.large
+    num_instances: 2
+
+components:
+  ubuntu:
+    type: v1/job
+
+    build:
+      type: docker_image
+      registry: registry.hub.docker.com
+      repository: library/ubuntu
+      tag: latest
+
+      node_pool: /:foo
+
+  aggregator:
+    type: v1/reference
+
+    git_repository:
+      url: https://github.com/mlab-lattice/testing__version-aggregator-service.git
+      tag: "1.x"
+      file: lattice.json
+
+    parameters:
+      num_instances: 1
+
+  service:
+    type: v1/reference
+
+    git_repository:
+      url: https://github.com/mlab-lattice/testing__version-service.git
+      tag: "1.0.x"
+      file: lattice.yaml
+

From 7e9d18b5df9969e636c93a6b30ff98ea403b993f Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Mon, 30 Jul 2018 15:43:52 -0700
Subject: [PATCH 32/37] update system.json to match system.yaml

---
 system.json | 27 ++++++++++++++++-----------
 system.yaml | 24 +++++++++++++-----------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/system.json b/system.json
index e9a9639..6d14b3c 100644
--- a/system.json
+++ b/system.json
@@ -13,12 +13,13 @@
       "type": "v1/reference",
 
       "git_repository": {
-        "file": "lattice.json",
-        "tag": "1.x",
-        "url": "https://github.com/mlab-lattice/testing__version-aggregator-service.git"
+        "url": "https://github.com/mlab-lattice/testing__version-aggregator-service.git",
+        "tag": "1.0.x",
+        "file": "lattice.json"
       },
 
       "parameters": {
+		"node_pool": "/:foo",
         "num_instances": 1
       },
     },
@@ -27,21 +28,25 @@
       "type": "v1/reference",
 
       "git_repository": {
-        "file": "lattice.yaml",
-        "tag": "1.0.x",
-        "url": "https://github.com/mlab-lattice/testing__version-service.git"
+        "url": "https://github.com/mlab-lattice/testing__version-service.git",
+        "tag": "1.x",
+        "file": "lattice.yaml"
       },
+
+	  "parameters": { "node_pool": "/:foo" }
     },
 
     "ubuntu": {
       "type": "v1/job",
+
       "build": {
-        "node_pool": "/:foo",
-        "registry": "registry.hub.docker.com",
-        "repository": "library/ubuntu",
-        "tag": "latest",
         "type": "docker_image"
-      }
+
+        "repository": "library/ubuntu",
+        "tag": "18.04"
+      },
+
+      "node_pool": "/:foo"
     }
   }
 }
diff --git a/system.yaml b/system.yaml
index 21493b1..40218c6 100644
--- a/system.yaml
+++ b/system.yaml
@@ -5,17 +5,6 @@ node_pools:
     num_instances: 2
 
 components:
-  ubuntu:
-    type: v1/job
-
-    build:
-      type: docker_image
-      registry: registry.hub.docker.com
-      repository: library/ubuntu
-      tag: latest
-
-      node_pool: /:foo
-
   aggregator:
     type: v1/reference
 
@@ -25,6 +14,7 @@ components:
       file: lattice.json
 
     parameters:
+      node_pool: /:foo
       num_instances: 1
 
   service:
@@ -35,3 +25,15 @@ components:
       tag: "1.0.x"
       file: lattice.yaml
 
+    parameters:
+      node_pool: /:foo
+
+  ubuntu:
+    type: v1/job
+
+    build:
+      type: docker_image
+      repository: library/ubuntu
+      tag: "18.04"
+
+    node_pool: /:foo

From da8a192939dbf58a2709418c9f6e2f35822435d1 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Mon, 30 Jul 2018 15:49:14 -0700
Subject: [PATCH 33/37] Update system.json

---
 system.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system.json b/system.json
index 6d14b3c..04d5728 100644
--- a/system.json
+++ b/system.json
@@ -19,7 +19,7 @@
       },
 
       "parameters": {
-		"node_pool": "/:foo",
+	"node_pool": "/:foo",
         "num_instances": 1
       },
     },
@@ -32,15 +32,15 @@
         "tag": "1.x",
         "file": "lattice.yaml"
       },
-
-	  "parameters": { "node_pool": "/:foo" }
+	 
+      "parameters": { "node_pool": "/:foo" }
     },
 
     "ubuntu": {
       "type": "v1/job",
 
       "build": {
-        "type": "docker_image"
+        "type": "docker_image",
 
         "repository": "library/ubuntu",
         "tag": "18.04"

From 702ff4da0be5f4d71e7978ca24b6df529c46191d Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Mon, 30 Jul 2018 16:37:36 -0700
Subject: [PATCH 34/37] Update system.json

---
 system.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system.json b/system.json
index 04d5728..f74ea2a 100644
--- a/system.json
+++ b/system.json
@@ -21,7 +21,7 @@
       "parameters": {
 	"node_pool": "/:foo",
         "num_instances": 1
-      },
+      }
     },
 
     "service": {

From cf4c7d2af06f13bb4dab0ba329bfe620f6f1cad8 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Wed, 1 Aug 2018 18:05:09 -0700
Subject: [PATCH 35/37] fix lattice.yaml

---
 system.yaml => lattice.yaml                   | 10 ++--
 ...c-version-service-dedicated-node-pool.json | 60 -------------------
 parameter-dynamic-version-service.json        | 56 -----------------
 secret-dynamic-version-service.json           | 59 ------------------
 static-version-service.json                   | 55 -----------------
 system.json                                   | 52 ----------------
 version-aggregator-service.json               | 55 -----------------
 7 files changed, 4 insertions(+), 343 deletions(-)
 rename system.yaml => lattice.yaml (87%)
 delete mode 100644 parameter-dynamic-version-service-dedicated-node-pool.json
 delete mode 100644 parameter-dynamic-version-service.json
 delete mode 100644 secret-dynamic-version-service.json
 delete mode 100644 static-version-service.json
 delete mode 100644 system.json
 delete mode 100644 version-aggregator-service.json

diff --git a/system.yaml b/lattice.yaml
similarity index 87%
rename from system.yaml
rename to lattice.yaml
index 40218c6..35b4cd2 100644
--- a/system.yaml
+++ b/lattice.yaml
@@ -1,4 +1,5 @@
 type: v1/system
+
 node_pools:
   foo:
     instance_type: t2.large
@@ -10,8 +11,8 @@ components:
 
     git_repository:
       url: https://github.com/mlab-lattice/testing__version-aggregator-service.git
-      tag: "1.x"
-      file: lattice.json
+      tag: 1.0.x
+	  file: lattice.json
 
     parameters:
       node_pool: /:foo
@@ -22,18 +23,15 @@ components:
 
     git_repository:
       url: https://github.com/mlab-lattice/testing__version-service.git
-      tag: "1.0.x"
-      file: lattice.yaml
+      tag: 1.x
 
     parameters:
       node_pool: /:foo
 
   ubuntu:
     type: v1/job
-
     build:
       type: docker_image
       repository: library/ubuntu
       tag: "18.04"
-
     node_pool: /:foo
diff --git a/parameter-dynamic-version-service-dedicated-node-pool.json b/parameter-dynamic-version-service-dedicated-node-pool.json
deleted file mode 100644
index 342cc0b..0000000
--- a/parameter-dynamic-version-service-dedicated-node-pool.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "$parameters": {
-    "NAME": { "required": true },
-    "VERSION": { "required": true },
-    "PUBLIC": { "required": true },
-    "NUM_INSTANCES": { "default": 2 },
-    "NUM_NODE_POOL_INSTANCES": { "default": 1 },
-    "INSTANCE_TYPE": { "default": "t2.micro" }
-  },
-
-  "type": "service",
-  "name": "${NAME}",
-
-  "components": [
-    {
-      "name": "service",
-      "ports": [
-        {
-          "name": "http",
-          "port": 8080,
-          "protocol": "HTTP",
-          "external_access": {
-            "public": "${PUBLIC}"
-          }
-        }
-      ],
-      "build": {
-        "git_repository": {
-          "url": "https://github.com/mlab-lattice/testing__version-service.git",
-          "tag": "dynamic"
-        },
-        "language": "node:boron",
-        "command": "npm install"
-      },
-      "exec": {
-        "command": [
-          "node",
-          "VersionService.js"
-        ],
-        "environment": {
-          "PORT": "8080",
-          "VERSION": "${VERSION}"
-        }
-      },
-      "health_check": {
-        "http": {
-          "port": "http",
-          "path": "/status"
-        }
-      }
-    }
-  ],
-  "resources": {
-    "num_instances": "${NUM_INSTANCES}",
-    "node_pool": {
-      "num_instances": "${NUM_NODE_POOL_INSTANCES}",
-      "instance_type": "${INSTANCE_TYPE}"
-    }
-  }
-}
\ No newline at end of file
diff --git a/parameter-dynamic-version-service.json b/parameter-dynamic-version-service.json
deleted file mode 100644
index 63e05df..0000000
--- a/parameter-dynamic-version-service.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "$parameters": {
-    "NAME": { "required": true },
-    "VERSION": { "required": true },
-    "PUBLIC": { "required": true },
-    "NUM_INSTANCES": { "default": 1 },
-    "INSTANCE_TYPE": { "default": "t2.micro" }
-  },
-
-  "type": "service",
-  "name": "${NAME}",
-
-  "components": [
-    {
-      "name": "service",
-      "ports": [
-        {
-          "name": "http",
-          "port": 8080,
-          "protocol": "HTTP",
-          "external_access": {
-            "public": "${PUBLIC}"
-          }
-        }
-      ],
-      "build": {
-        "git_repository": {
-          "url": "https://github.com/mlab-lattice/testing__version-service.git",
-          "tag": "dynamic"
-        },
-        "language": "node:boron",
-        "command": "npm install"
-      },
-      "exec": {
-        "command": [
-          "node",
-          "VersionService.js"
-        ],
-        "environment": {
-          "PORT": "8080",
-          "VERSION": "${VERSION}"
-        }
-      },
-      "health_check": {
-        "http": {
-          "port": "http",
-          "path": "/status"
-        }
-      }
-    }
-  ],
-  "resources": {
-    "num_instances": "${NUM_INSTANCES}",
-    "instance_type": "${INSTANCE_TYPE}"
-  }
-}
\ No newline at end of file
diff --git a/secret-dynamic-version-service.json b/secret-dynamic-version-service.json
deleted file mode 100644
index 91616d6..0000000
--- a/secret-dynamic-version-service.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "$parameters": {
-    "NAME": { "required": true },
-    "PUBLIC": { "required": true },
-    "NUM_INSTANCES": { "default": 1 },
-    "INSTANCE_TYPE": { "default": "t2.micro" }
-  },
-
-  "type": "service",
-  "name": "${NAME}",
-
-  "secrets": {
-    "version": {}
-  },
-
-  "components": [
-    {
-      "name": "service",
-      "ports": [
-        {
-          "name": "http",
-          "port": 8080,
-          "protocol": "HTTP",
-          "external_access": {
-            "public": "${PUBLIC}"
-          }
-        }
-      ],
-      "build": {
-        "git_repository": {
-          "url": "https://github.com/mlab-lattice/testing__version-service.git",
-          "tag": "dynamic"
-        },
-        "language": "node:boron",
-        "command": "npm install"
-      },
-      "exec": {
-        "command": [
-          "node",
-          "VersionService.js"
-        ],
-        "environment": {
-          "PORT": "8080",
-          "VERSION": { "secret": "version" }
-        }
-      },
-      "health_check": {
-        "http": {
-          "port": "http",
-          "path": "/status"
-        }
-      }
-    }
-  ],
-  "resources": {
-    "num_instances": "${NUM_INSTANCES}",
-    "instance_type": "${INSTANCE_TYPE}"
-  }
-}
\ No newline at end of file
diff --git a/static-version-service.json b/static-version-service.json
deleted file mode 100644
index 5311bb2..0000000
--- a/static-version-service.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "$parameters": {
-    "NAME": { "required": true },
-    "TAG": { "required": true},
-    "PUBLIC": { "required": true },
-    "NUM_INSTANCES": { "default": 1 },
-    "INSTANCE_TYPE": { "default": "t2.micro" }
-  },
-
-  "type": "service",
-  "name": "${NAME}",
-
-  "components": [
-    {
-      "name": "service",
-      "ports": [
-        {
-          "name": "http",
-          "port": 8080,
-          "protocol": "HTTP",
-          "external_access": {
-            "public": "${PUBLIC}"
-          }
-        }
-      ],
-      "build": {
-        "git_repository": {
-          "url": "https://github.com/mlab-lattice/testing__version-service.git",
-          "tag": "${TAG}"
-        },
-        "language": "node:boron",
-        "command": "npm install"
-      },
-      "exec": {
-        "command": [
-          "node",
-          "VersionService.js"
-        ],
-        "environment": {
-          "PORT": "8080"
-        }
-      },
-      "health_check": {
-        "http": {
-          "port": "http",
-          "path": "/status"
-        }
-      }
-    }
-  ],
-  "resources": {
-    "num_instances": "${NUM_INSTANCES}",
-    "instance_type": "${INSTANCE_TYPE}"
-  }
-}
\ No newline at end of file
diff --git a/system.json b/system.json
deleted file mode 100644
index 6d14b3c..0000000
--- a/system.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "type": "v1/system",
-
-  "node_pools": {
-    "foo": {
-      "instance_type": "t2.large",
-      "num_instances": 2
-    }
-  },
-
-  "components": {
-    "aggregator": {
-      "type": "v1/reference",
-
-      "git_repository": {
-        "url": "https://github.com/mlab-lattice/testing__version-aggregator-service.git",
-        "tag": "1.0.x",
-        "file": "lattice.json"
-      },
-
-      "parameters": {
-		"node_pool": "/:foo",
-        "num_instances": 1
-      },
-    },
-
-    "service": {
-      "type": "v1/reference",
-
-      "git_repository": {
-        "url": "https://github.com/mlab-lattice/testing__version-service.git",
-        "tag": "1.x",
-        "file": "lattice.yaml"
-      },
-
-	  "parameters": { "node_pool": "/:foo" }
-    },
-
-    "ubuntu": {
-      "type": "v1/job",
-
-      "build": {
-        "type": "docker_image"
-
-        "repository": "library/ubuntu",
-        "tag": "18.04"
-      },
-
-      "node_pool": "/:foo"
-    }
-  }
-}
diff --git a/version-aggregator-service.json b/version-aggregator-service.json
deleted file mode 100644
index f019ba0..0000000
--- a/version-aggregator-service.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "$parameters": {
-    "NAME": { "required": true },
-    "TAG": { "required": true},
-    "PUBLIC": { "required": true },
-    "NUM_INSTANCES": { "default": 1 },
-    "INSTANCE_TYPE": { "default": "t2.micro" }
-  },
-
-  "type": "service",
-  "name": "${NAME}",
-
-  "components": [
-    {
-      "name": "service",
-      "ports": [
-        {
-          "name": "http",
-          "port": 8080,
-          "protocol": "HTTP",
-          "external_access": {
-            "public": "${PUBLIC}"
-          }
-        }
-      ],
-      "build": {
-        "git_repository": {
-          "url": "https://github.com/mlab-lattice/testing__version-aggregator-service.git",
-          "tag": "${TAG}"
-        },
-        "language": "node:boron",
-        "command": "npm install"
-      },
-      "exec": {
-        "command": [
-          "node",
-          "VersionAggregatorService.js"
-        ],
-        "environment": {
-          "PORT": "8080"
-        }
-      },
-      "health_check": {
-        "http": {
-          "port": "http",
-          "path": "/status"
-        }
-      }
-    }
-  ],
-  "resources": {
-    "num_instances": "${NUM_INSTANCES}",
-    "instance_type": "${INSTANCE_TYPE}"
-  }
-}
\ No newline at end of file

From de6e7aaa9a6251a7708263a24567a3fe8fd20577 Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Wed, 1 Aug 2018 18:06:58 -0700
Subject: [PATCH 36/37] fix tab

---
 lattice.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lattice.yaml b/lattice.yaml
index 35b4cd2..b4dda9c 100644
--- a/lattice.yaml
+++ b/lattice.yaml
@@ -12,7 +12,7 @@ components:
     git_repository:
       url: https://github.com/mlab-lattice/testing__version-aggregator-service.git
       tag: 1.0.x
-	  file: lattice.json
+      file: lattice.json
 
     parameters:
       node_pool: /:foo

From 16e3e458e8e7dbabe47fb325e4a166bb81f3752f Mon Sep 17 00:00:00 2001
From: Kevin Rosendahl <kevindrosendahl@gmail.com>
Date: Wed, 1 Aug 2018 18:08:23 -0700
Subject: [PATCH 37/37] use version not tab

---
 lattice.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lattice.yaml b/lattice.yaml
index b4dda9c..ea09e3c 100644
--- a/lattice.yaml
+++ b/lattice.yaml
@@ -11,7 +11,7 @@ components:
 
     git_repository:
       url: https://github.com/mlab-lattice/testing__version-aggregator-service.git
-      tag: 1.0.x
+      version: 1.0.x
       file: lattice.json
 
     parameters:
@@ -23,7 +23,7 @@ components:
 
     git_repository:
       url: https://github.com/mlab-lattice/testing__version-service.git
-      tag: 1.x
+      version: 1.x
 
     parameters:
       node_pool: /:foo