refactor(titus): move container attributes above env

amanya · Jul 25, 2018 · e11c727 · e11c727
1 parent d4b3607
commit e11c727
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/app/scripts/modules/titus/package.json b/app/scripts/modules/titus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spinnaker/titus",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "main": "lib/lib.js",
   "typings": "lib/index.d.ts",
   "scripts": {

diff --git a/app/scripts/modules/titus/src/serverGroup/configure/wizard/parameters.html b/app/scripts/modules/titus/src/serverGroup/configure/wizard/parameters.html
@@ -68,18 +68,18 @@ <h4 class="col-sm-12">
     </div>
     <div class="form-group">
       <h4 class="col-sm-12">
-        <b>Environment Variables</b>
+        <b>Container Attributes</b>
       </h4>
       <div class="col-sm-12">
-        <map-editor model="command.env" allow-empty="true"></map-editor>
+        <map-editor model="command.containerAttributes" allow-empty="true"></map-editor>
       </div>
     </div>
     <div class="form-group">
       <h4 class="col-sm-12">
-        <b>Container Attributes</b>
+        <b>Environment Variables</b>
       </h4>
       <div class="col-sm-12">
-        <map-editor model="command.containerAttributes" allow-empty="true"></map-editor>
+        <map-editor model="command.env" allow-empty="true"></map-editor>
       </div>
     </div>
   </div>

diff --git a/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html
@@ -192,21 +192,21 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
         <dd ng-repeat-end>{{val}}</dd>
       </dl>
     </collapsible-section>
-    <collapsible-section heading="Environment Variables">
-      <div ng-if="!serverGroup.env">No environment variables associated with this
+    <collapsible-section heading="Container Attributes">
+      <div ng-if="!serverGroup.containerAttributes">No container attributes associated with this
         server group
       </div>
-      <dl ng-if="serverGroup.env">
-        <dt ng-repeat-start="(key, val) in serverGroup.env">{{key}}</dt>
+      <dl ng-if="serverGroup.containerAttributes">
+        <dt ng-repeat-start="(key, val) in serverGroup.containerAttributes">{{key}}</dt>
         <dd ng-repeat-end>{{val}}</dd>
       </dl>
     </collapsible-section>
-    <collapsible-section heading="Container Attributes">
-      <div ng-if="!serverGroup.containerAttributes">No container attributes associated with this
+    <collapsible-section heading="Environment Variables">
+      <div ng-if="!serverGroup.env">No environment variables associated with this
         server group
       </div>
-      <dl ng-if="serverGroup.containerAttributes">
-        <dt ng-repeat-start="(key, val) in serverGroup.containerAttributes">{{key}}</dt>
+      <dl ng-if="serverGroup.env">
+        <dt ng-repeat-start="(key, val) in serverGroup.env">{{key}}</dt>
         <dd ng-repeat-end>{{val}}</dd>
       </dl>
     </collapsible-section>