Merge pull request #1815 from intuit/slack-upgrade

Use Block Kit for slack messages
intuit · Mar 2, 2021 · 2e8e07e · 2e8e07e
2 parents 5eb470f + 6210899
commit 2e8e07e
Show file tree

Hide file tree

Showing 14 changed files with 1,753 additions and 92 deletions.
diff --git a/docs/public/logo-large-dark.png b/docs/public/logo-large-dark.png
diff --git a/docs/public/logo-large.png b/docs/public/logo-large.png
diff --git a/packages/core/src/__tests__/__snapshots__/validate-config.test.ts.snap b/packages/core/src/__tests__/__snapshots__/validate-config.test.ts.snap
@@ -105,3 +105,12 @@ Found unknown configuration keys: types.doc
 ",
 ]
 `;
+
+exports[`validatePlugin should validate plugin configuration - union 1`] = `
+Array [
+  "\\"test-plugin\\"
+
+Found missing configuration keys: when using auth you must also provide channels
+",
+]
+`;
diff --git a/packages/core/src/__tests__/validate-config.test.ts b/packages/core/src/__tests__/validate-config.test.ts
@@ -427,6 +427,63 @@ describe("validatePlugin", () => {
     ).toMatchSnapshot();
   });
 
+  test("should validate plugin configuration - union", async () => {
+    const hook: ValidatePluginHook = new AsyncSeriesBailHook([
+      "name",
+      "options",
+    ]);
+
+    const basePluginOptions = t.partial({
+      /** URL of the slack to post to */
+      url: t.string,
+      /** Who to bother when posting to the channel */
+      atTarget: t.string,
+      /** Allow users to opt into having prereleases posted to slack */
+      publishPreRelease: t.boolean,
+      /** Additional Title to add at the start of the slack message */
+      title: t.string,
+    });
+
+    const appPluginOptions = t.intersection([
+      t.interface({
+        /** Marks we are gonna use app auth */
+        auth: t.literal("app"),
+        /** Channels to post */
+        channels: t.array(t.string),
+      }),
+      basePluginOptions,
+    ]);
+
+    const pluginOptions = t.union([basePluginOptions, appPluginOptions]);
+
+    hook.tapPromise("test", async (name, options) => {
+      if (name === "test-plugin") {
+        return validatePluginConfiguration(
+          "test-plugin",
+          pluginOptions,
+          options
+        );
+      }
+    });
+
+    expect(
+      await validatePlugins(hook, {
+        plugins: [["test-plugin", { url: "foo" }]],
+      })
+    ).toStrictEqual([]);
+    expect(
+      await validatePlugins(hook, {
+        plugins: [["test-plugin", { auth: "app" }]],
+      })
+    ).toMatchSnapshot();
+    // Check no validation issues with intersected options
+    expect(
+      await validatePlugins(hook, {
+        plugins: [["test-plugin", { auth: "app", channels: ['foo'] }]],
+      })
+      ).toStrictEqual([]);
+  });
+
   test("should validate plugin configuration - array of configurations", async () => {
     const hook: ValidatePluginHook = new AsyncSeriesBailHook([
       "name",

diff --git a/packages/core/src/validate-config.ts b/packages/core/src/validate-config.ts
@@ -228,7 +228,8 @@ export const validateIoConfiguration = (
       return errors;
     }
 
-    const exactRc = makeExactType(configDeceleration).decode(rc);
+    const exactDeclaration = makeExactType(configDeceleration);
+    const exactRc = exactDeclaration.decode(rc);
 
     if (!isRight(looseRc) || !isRight(exactRc)) {
       return [];
@@ -247,6 +248,47 @@ export const validateIoConfiguration = (
       return [];
     }
 
+    if (
+      (exactDeclaration as any)._tag === "UnionType" &&
+      "types" in exactDeclaration &&
+      exactDeclaration.types.every(
+        (type) =>
+          type._tag === "IntersectionType" || (type as any)._tag === "ExactType"
+      )
+    ) {
+      const decodedTypes = exactDeclaration.types.map((t) => t.decode(rc));
+      const matchingMissingMember = decodedTypes.filter((t) => "left" in t)[0];
+
+      if (matchingMissingMember && "left" in matchingMissingMember) {
+        const correct = Object.keys(
+          matchingMissingMember.left[0].context[0].actual as any
+        );
+        const missing =
+          matchingMissingMember.left[0].context[
+            matchingMissingMember.left[0].context.length - 1
+          ].key;
+
+        return [
+          `${errorPath(
+            `"${name}"`
+          )}\n\nFound missing configuration keys: when using ${chalk.greenBright.bold(
+            correct.join(", ")
+          )} you must also provide ${unexpectedValue(missing)}\n`,
+        ];
+      }
+
+      const matchingCorrectMember = decodedTypes.filter(
+        (t) =>
+          "right" in t &&
+          Object.keys(t.right).length && 
+          Object.keys(t.right).every((key) => unknownKeys.includes(key))
+      )[0];
+
+      if (matchingCorrectMember) {
+        return [];
+      }
+    }
+
     return [
       `${errorPath(
         `"${name}"`

diff --git a/plugins/microsoft-teams/__tests__/__snapshots__/index.test.ts.snap b/plugins/microsoft-teams/__tests__/__snapshots__/index.test.ts.snap
@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`createPost should add more indents to nested lists - 2 spaces 1`] = `"{\\"@context\\":\\"http://schema.org/extensions\\",\\"@type\\":\\"MessageCard\\",\\"text\\":\\"@channel: New release *<https://git.hub/some/project/releases/v1.0.0|v1.0.0>*\\\\n*My Notes*\\\\n• PR <google.com|some link>\\\\n   • Another note\\"}"`;
+
+exports[`createPost should add more indents to nested lists 1`] = `"{\\"@context\\":\\"http://schema.org/extensions\\",\\"@type\\":\\"MessageCard\\",\\"text\\":\\"@channel: New release *<https://git.hub/some/project/releases/v1.0.0|v1.0.0>*\\\\n*My Notes*\\\\n• PR <google.com|some link>\\\\n   • Another note\\"}"`;
+
+exports[`createPost should add title 1`] = `"{\\"@context\\":\\"http://schema.org/extensions\\",\\"@type\\":\\"MessageCard\\",\\"text\\":\\"@channel: New release *<https://git.hub/some/project/releases/v1.0.0|v1.0.0>*\\\\n*My Notes*\\\\n• PR <google.com|some link>\\"}"`;
+
+exports[`createPost should call slack api 1`] = `"{\\"@context\\":\\"http://schema.org/extensions\\",\\"@type\\":\\"MessageCard\\",\\"text\\":\\"@channel: New release *<https://git.hub/some/project/releases/v1.0.0|v1.0.0>*\\\\n*My Notes*\\\\n• PR <google.com|some link>\\"}"`;
+
+exports[`createPost should call slack api in env var 1`] = `"{\\"@context\\":\\"http://schema.org/extensions\\",\\"@type\\":\\"MessageCard\\",\\"text\\":\\"@channel: New release *<https://git.hub/some/project/releases/v1.0.0|v1.0.0>*\\\\n*My Notes*\\\\n• PR <google.com|some link>\\"}"`;
+
+exports[`createPost should call slack api through http proxy 1`] = `"{\\"@context\\":\\"http://schema.org/extensions\\",\\"@type\\":\\"MessageCard\\",\\"text\\":\\"@channel: New release *<https://git.hub/some/project/releases/v1.0.0|v1.0.0>*\\\\n*My Notes*\\\\n• PR <google.com|some link>\\"}"`;
+
+exports[`createPost should call slack api through https proxy 1`] = `"{\\"@context\\":\\"http://schema.org/extensions\\",\\"@type\\":\\"MessageCard\\",\\"text\\":\\"@channel: New release *<https://git.hub/some/project/releases/v1.0.0|v1.0.0>*\\\\n*My Notes*\\\\n• PR <google.com|some link>\\"}"`;
+
+exports[`createPost should call slack api with custom atTarget 1`] = `"{\\"@context\\":\\"http://schema.org/extensions\\",\\"@type\\":\\"MessageCard\\",\\"text\\":\\"@here: New release *<https://git.hub/some/project/releases/v1.0.0|v1.0.0>*\\\\n*My Notes*\\\\n• PR <google.com|some link>\\"}"`;
+
+exports[`createPost should call slack api with minimal config 1`] = `"{\\"@context\\":\\"http://schema.org/extensions\\",\\"@type\\":\\"MessageCard\\",\\"text\\":\\"@channel: New release *<https://git.hub/some/project/releases/v1.0.0|v1.0.0>*\\\\n*My Notes*\\\\n• PR <google.com|some link>\\"}"`;
+
+exports[`createPost should remove markdown code types from block 1`] = `"{\\"@context\\":\\"http://schema.org/extensions\\",\\"@type\\":\\"MessageCard\\",\\"text\\":\\"@channel: New release *<https://git.hub/some/project/releases/v1.0.0|v1.0.0>*\\\\n*My Notes*\\\\n\`json\`:\\\\n\\\\n\`\`\`\\\\n{ \\\\\\"foo\\\\\\": \\\\\\"bar\\\\\\" }\`\`\`\\\\n• PR <google.com|some link>\\"}"`;