Update teamId to workspaceId

atomist-attic · Aug 3, 2018 · fcc185f · fcc185f
1 parent 20659a3
commit fcc185f
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 13 deletions.
diff --git a/lib/commands/editor/node/updateAtomistTeam.ts b/lib/commands/editor/node/updateAtomistTeam.ts
@@ -14,14 +14,37 @@
  * limitations under the License.
  */
 
-import { HandlerContext } from "@atomist/automation-client";
-import { Project } from "@atomist/automation-client/project/Project";
+import {
+    HandlerContext,
+    logger,
+} from "@atomist/automation-client";
+import {
+    File,
+} from "@atomist/automation-client/project/File";
+import {
+    Project,
+} from "@atomist/automation-client/project/Project";
+import * as path from "path";
 
 export async function updateAtomistTeam(project: Project, ctx: HandlerContext) {
-    const atomistConfigFile = await project.findFile("src/atomist.config.ts");
-    const content = await atomistConfigFile.getContent();
-    const newContent = content.replace(/teamIds:\s*\[[^\]]*]/,
-        `teamIds: ["${ctx.teamId}"]`);
-    await atomistConfigFile.setContent(newContent);
+    try {
+        let atomistConfigFile: File;
+        for (const dir of ["src", "lib"]) {
+            atomistConfigFile = await project.getFile(path.join(dir, "atomist.config.ts"));
+            if (atomistConfigFile) {
+                break;
+            }
+        }
+        if (!atomistConfigFile) {
+            return project;
+        }
+        const content = await atomistConfigFile.getContent();
+        const newContent = content
+            .replace(/\bworkspaceIds\s*:\s*\[[^\]]*]/, `workspaceIds: ["${ctx.workspaceId}"]`)
+            .replace(/\bteamIds\s*:\s*\[[^\]]*]/, `workspaceIds: ["${ctx.workspaceId}"]`);
+        await atomistConfigFile.setContent(newContent);
+    } catch (e) {
+        logger.warn(`Failed to update Atomist workspace: ${e.message}`);
+    }
     return project;
 }
diff --git a/test/commands/editor/node/updateAtomistTeam.test.ts b/test/commands/editor/node/updateAtomistTeam.test.ts
@@ -24,7 +24,7 @@ import { updateAtomistTeam } from "../../../../lib/commands/editor/node/updateAt
 describe("update Atomist Team", () => {
 
     const fakeContext = {
-        teamId: "TEAMYAY",
+        workspaceId: "TEAMYAY",
     } as any as HandlerContext;
 
     it("changes the team", done => {
@@ -35,7 +35,7 @@ describe("update Atomist Team", () => {
 export const configuration: Configuration = {
     name: pj.name,
     version: pj.version,
-    teamIds: ["T5964N9B7"], // <-- run @atomist pwd in your slack team to obtain the team id
+    workspaceIds: ["T5964N9B7"], // <-- run @atomist pwd in your slack team to obtain the team id
     commands: assembled.commandHandlers.concat([
         HelloWorld,
         () => affirmationEditor,
@@ -47,13 +47,12 @@ export const configuration: Configuration = {
 };
 `,
         });
-        const ec = `teamIds: ["TEAMYAY"], // <-- run @atomist pwd in your slack team to obtain the team id`;
         updateAtomistTeam(p, fakeContext)
             .then(
                 edited => edited.findFile("src/atomist.config.ts"))
             .then(f => f.getContent())
             .then(content => {
-                assert(content.includes(ec),
+                assert(content.includes(`workspaceIds: ["TEAMYAY"], // <-- run @atomist pwd in your slack team to obt`),
                     "content: " + content);
             })
             .then(done, done);
@@ -67,7 +66,7 @@ export const configuration: Configuration = {
 export const configuration: Configuration = {
     name: pj.name,
     version: pj.version,
-    teamIds: [
+    workspaceIds: [
         //  "T1JVCMVH7",
         "T5964N9B7",    // spring-team
         //  "T29E48P34",    // Atomist community
@@ -88,7 +87,7 @@ export const configuration: Configuration = {
                 edited => edited.findFile("src/atomist.config.ts"))
             .then(f => f.getContent())
             .then(content => {
-                assert(content.includes(`teamIds: ["TEAMYAY"],\n    commands:`),
+                assert(content.includes(`workspaceIds: ["TEAMYAY"],\n    commands:`),
                     "content: " + content);
             })
             .then(done, done);