aberlaas-setup 2.14.1 → 2.16.0

package/lib/circleci.js

@@ -16,21 +16,23 @@ export default {
 
     // Fail early if no token available
     if (!circleCiHelper.hasToken()) {
-      this.__consoleError(
-        `[circleci]: No ABERLAAS_CIRCLECI_TOKEN found, please visit ${followUrl} to enable manually.`,
-      );
+      this.__consoleError(`CircleCI: ABERLAAS_CIRCLECI_TOKEN environment variable must be set`);
+      this.__consoleInfo(`  Create a token at CircleCI account settings`);
+      this.__consoleInfo(`  https://circleci.com/account/api\n`);
       return false;
     }
 
     // Do nothing if already enabled
     if (await this.isEnabled()) {
-      this.__consoleInfo(`CircleCI already enabled: ${projectUrl}`);
+      this.__consoleSuccess(`CircleCI: Already configured`);
+      this.__consoleInfo(`  ${projectUrl}\n`);
       return true;
     }
 
     // Follow the repo
     await this.followRepo();
-    this.__consoleSuccess(`CircleCI enabled: ${projectUrl}`);
+    this.__consoleSuccess(`CircleCI: Repository configured`);
+    this.__consoleInfo(`  ${projectUrl}\n`);
     return true;
   },
   /**

package/lib/github.js

@@ -1,6 +1,14 @@
-import { consoleError, consoleSuccess } from 'firost';
+import { consoleError, consoleInfo, consoleSuccess } from 'firost';
+import { _ } from 'golgoth';
 import githubHelper from './helpers/github.js';
 
+const gitHubSettings = {
+  allow_merge_commit: false,
+  allow_rebase_merge: true,
+  allow_squash_merge: true,
+  delete_branch_on_merge: true,
+};
+
 export default {
   /**
    * Configure the GitHub repo with default settings:
@@ -10,33 +18,57 @@ export default {
    */
   async enable() {
     const { username, repo } = await githubHelper.repoData();
-    const repoUrl = `https://github.com/${username}/${repo}`;
-    const manualUrl = `${repoUrl}/settings`;
+    const settingsUrl = `https://github.com/${username}/${repo}/settings`;
 
     // Fail early if no token available
     if (!githubHelper.hasToken()) {
-      this.__consoleError(
-        `[github]: No ABERLAAS_GITHUB_TOKEN found, please visit ${manualUrl} to configure manually.`,
-      );
+      this.__consoleError(`GitHub: ABERLAAS_GITHUB_TOKEN environment variable must be set`);
+      this.__consoleInfo(`  Create a Classic token with 'repo' scope`);
+      this.__consoleInfo(`  https://github.com/settings/tokens\n`);
       return false;
     }
 
-    const settings = {
-      allow_merge_commit: false,
-      allow_rebase_merge: true,
-      allow_squash_merge: true,
-      delete_branch_on_merge: true,
-    };
+    // Check if already configured
+    try {
+      if (await this.isAlreadyConfigured()) {
+        this.__consoleSuccess(`GitHub: Already configured`);
+        this.__consoleInfo(`  ${settingsUrl}\n`);
+        return true;
+      }
+    } catch (error) {
+      if (error.status === 401) {
+        this.__consoleError(`GitHub: ABERLAAS_GITHUB_TOKEN is invalid`);
+        this.__consoleInfo(`  Create a Classic token with 'repo' scope`);
+        this.__consoleInfo(`  https://github.com/settings/tokens\n`);
+        return false;
+      }
+      throw error;
+    }
 
     await githubHelper.octokit('repos.update', {
       owner: username,
       repo,
-      ...settings,
+      ...gitHubSettings,
     });
 
-    this.__consoleSuccess(`GitHub repo configured: ${repoUrl}`);
+    this.__consoleSuccess(`GitHub: Repository configured`);
+    this.__consoleInfo(`  ${settingsUrl}\n`);
     return true;
   },
+  /**
+   * Check if GitHub repo is already configured with desired settings
+   * @returns {boolean} True if already configured, false otherwise
+   */
+  async isAlreadyConfigured() {
+    const { username, repo } = await githubHelper.repoData();
+    const repoData = await githubHelper.octokit('repos.get', {
+      owner: username,
+      repo,
+    });
+
+    return _.isMatch(repoData, gitHubSettings);
+  },
   __consoleSuccess: consoleSuccess,
+  __consoleInfo: consoleInfo,
   __consoleError: consoleError,
 };

package/lib/helpers/github.js

@@ -58,6 +58,12 @@ export default {
       const githubToken = this.token();
       this.__cache.octokit = new this.__Octokit({
         auth: githubToken,
+        log: {
+          debug: this.__noOp,
+          info: this.__noOp,
+          warn: this.__noOp,
+          error: this.__noOp
+        }
       });
     }
 
@@ -69,4 +75,5 @@ export default {
   __run: run,
   __Octokit: Octokit,
   __cache: {},
+  __noOp: () => {},
 };

package/lib/renovate.js

@@ -1,4 +1,4 @@
-import { consoleError, consoleSuccess } from 'firost';
+import { consoleError, consoleInfo, consoleSuccess } from 'firost';
 import githubHelper from './helpers/github.js';
 
 export default {
@@ -23,16 +23,23 @@ export default {
   async enable() {
     const { username, repo } = await githubHelper.repoData();
     const manualUrl = `https://github.com/settings/installations/${this.renovateId}`;
-    const renovateDashboardUrl = `https://app.renovatebot.com/dashboard#github/${username}/${repo}`;
+    const renovateDashboardUrl = `https://developer.mend.io/github/${username}/${repo}`;
 
     // Fail early if no token available
     if (!githubHelper.hasToken()) {
-      this.__consoleError(
-        `[renovate]: No ABERLAAS_GITHUB_TOKEN found, please visit ${manualUrl} to enable manually.`,
-      );
+      this.__consoleError(`Renovate: ABERLAAS_GITHUB_TOKEN environment variable must be set`);
+      this.__consoleInfo(`  Create a Classic token with 'repo' scope`);
+      this.__consoleInfo(`  https://github.com/settings/tokens\n`);
       return false;
     }
 
+    // Check if already enabled
+    if (await this.isAlreadyEnabled()) {
+      this.__consoleSuccess(`Renovate: Already configured`);
+      this.__consoleInfo(`  ${renovateDashboardUrl}\n`);
+      return true;
+    }
+
     try {
       const repositoryId = await this.getRepositoryId();
       await githubHelper.octokit('apps.addRepoToInstallation', {
@@ -40,15 +47,36 @@ export default {
         repository_id: repositoryId,
       });
     } catch (_err) {
-      this.__consoleError(
-        `Renovate is not installed with this GitHub account, please visit ${manualUrl} to install it first.`,
-      );
+      this.__consoleError(`Renovate is not installed with this GitHub account`);
+      this.__consoleInfo(`  Please visit the installation page to install it first`);
+      this.__consoleInfo(`  ${manualUrl}\n`);
       return false;
     }
 
-    this.__consoleSuccess(`Renovate enabled: ${renovateDashboardUrl}`);
+    this.__consoleSuccess(`Renovate: Repository configured`);
+    this.__consoleInfo(`  ${renovateDashboardUrl}\n`);
     return true;
   },
+  /**
+   * Check if Renovate is already enabled for this repository
+   * @returns {boolean} True if already enabled, false otherwise
+   */
+  async isAlreadyEnabled() {
+    try {
+      const { username, repo } = await githubHelper.repoData();
+      const installations = await githubHelper.octokit('apps.listReposAccessibleToInstallation', {
+        installation_id: this.renovateId,
+      });
+      
+      return installations.repositories.some(
+        repoData => repoData.owner.login === username && repoData.name === repo
+      );
+    } catch {
+      // API call fails if Renovate app is not installed - treat as not enabled
+      return false;
+    }
+  },
   __consoleSuccess: consoleSuccess,
+  __consoleInfo: consoleInfo,
   __consoleError: consoleError,
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "aberlaas-setup",
   "type": "module",
   "description": "aberlaas setup helper: Setup third parties like GitHub, Netlify or CircleCI",
-  "version": "2.14.1",
+  "version": "2.16.0",
   "repository": "pixelastic/aberlaas",
   "homepage": "https://projects.pixelastic.com/aberlaas/",
   "author": "Tim Carry (@pixelastic)",
@@ -40,5 +40,5 @@
     "golgoth": "3.0.0",
     "parse-github-repo-url": "1.4.1"
   },
-  "gitHead": "9d3129416837258f78a26173327ec33c3b3d2b8f"
+  "gitHead": "804fd02ef9f200681b17ff72e226078d49619e9c"
 }