fix(endpoint/gitlab): hack up the scope/data helper to avoid dict/map…

… issues, fix pipeline hook message
ssube · Jun 2, 2019 · b9a9fa5 · b9a9fa5
1 parent 5830ea6
commit b9a9fa5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/docs/controller/gitlab/endpoint/push-controller.yml b/docs/controller/gitlab/endpoint/push-controller.yml
@@ -47,9 +47,8 @@ data:
         templates:
           body: >-
             {{#withMap cmd.data pipeline="object_attributes" user="user" }}
-            Pipeline {{ pipeline.id }} on {{ pipeline.ref }} by {{ user.username }} has finished: {{ pipeline.status }}
-            after {{ pipeline.duration }} seconds.
-            {{ json this }}
+            Pipeline {{ this.pipeline.[0].id }} on {{ this.pipeline.[0].ref }} by {{ this.user.[0].username }} has
+            finished: {{ this.pipeline.[0].status }} after {{ this.pipeline.[0].duration }} seconds.
             {{/withMap}}
 
     - metadata:

diff --git a/src/transform/helpers.ts b/src/transform/helpers.ts
@@ -26,6 +26,13 @@ export async function applyTransforms(
   return result;
 }
 
+/**
+ * Convert a template scope (before or after rendering) into suitable data for
+ * a Command or Message.
+ *
+ * This helper exists to mask some Dict/Map inconsistencies that should be
+ * resolved elsewhere.
+ */
 export function scopeToData(scope: TemplateScope): MapLike<Array<string>> {
   const data = new Map();
   for (const [key, value] of Object.entries(scope)) {
@@ -34,7 +41,8 @@ export function scopeToData(scope: TemplateScope): MapLike<Array<string>> {
     } else if (Array.isArray(value)) {
       setOrPush(data, key, value);
     } else {
-      setOrPush(data, key, JSON.stringify(value));
+      // TODO: handle nested objects
+      setOrPush(data, key, value);
     }
   }
   return mapToDict(data);