Merge remote-tracking branch 'origin' into cesium.com

.github/actions/check-for-CLA/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+package-lock.json

.github/actions/check-for-CLA/index.js

@@ -2,6 +2,8 @@ import { Octokit } from "@octokit/core";
 import { google } from "googleapis";
 import Handlebars from "handlebars";
 import fs from "fs-extra";
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
 
 const PULL_REQUST_INFO = {
   id: process.env.PULL_REQUEST_ID,
@@ -20,30 +22,26 @@ const GOOGLE_SHEETS_INFO = {
 const CONTRIBUTORS_URL =
   "https://github.com/CesiumGS/cesium/blob/main/CONTRIBUTORS.md";
 
-const main = async () => {
-  let hasSignedCLA;
-  let errorFoundOnCLACheck;
+const getGoogleSheetsApiClient = async () => {
+  const googleConfigFilePath = "GoogleConfig.json";
+  fs.writeFileSync(googleConfigFilePath, GOOGLE_SHEETS_INFO.APIKeys);
 
-  try {
-    hasSignedCLA = await checkIfUserHasSignedAnyCLA();
-  } catch (error) {
-    errorFoundOnCLACheck = error.toString();
-  }
+  const auth = new google.auth.GoogleAuth({
+    keyFile: googleConfigFilePath,
+    scopes: ["https://www.googleapis.com/auth/spreadsheets"],
+  });
+  const googleAuthClient = await auth.getClient();
 
-  const response = await postCommentOnPullRequest(
-    hasSignedCLA,
-    errorFoundOnCLACheck
-  );
+  return google.sheets({ version: "v4", auth: googleAuthClient });
 };
 
-const checkIfUserHasSignedAnyCLA = async () => {
-  let foundIndividualCLA = await checkIfIndividualCLAFound();
-  if (foundIndividualCLA) {
-    return true;
-  }
+const getValuesFromGoogleSheet = async (sheetId, cellRanges) => {
+  const googleSheetsApi = await getGoogleSheetsApiClient();
 
-  let foundCorporateCLA = await checkIfCorporateCLAFound();
-  return foundCorporateCLA;
+  return googleSheetsApi.spreadsheets.values.get({
+    spreadsheetId: sheetId,
+    range: cellRanges,
+  });
 };
 
 const checkIfIndividualCLAFound = async () => {
@@ -95,26 +93,34 @@ const checkIfCorporateCLAFound = async () => {
   return false;
 };
 
-const getValuesFromGoogleSheet = async (sheetId, cellRanges) => {
-  const googleSheetsApi = await getGoogleSheetsApiClient();
+const checkIfUserHasSignedAnyCLA = async () => {
+  const foundIndividualCLA = await checkIfIndividualCLAFound();
+  if (foundIndividualCLA) {
+    return true;
+  }
 
-  return googleSheetsApi.spreadsheets.values.get({
-    spreadsheetId: sheetId,
-    range: cellRanges,
-  });
+  const foundCorporateCLA = await checkIfCorporateCLAFound();
+  return foundCorporateCLA;
 };
 
-const getGoogleSheetsApiClient = async () => {
-  const googleConfigFilePath = "GoogleConfig.json";
-  fs.writeFileSync(googleConfigFilePath, GOOGLE_SHEETS_INFO.APIKeys);
+const getCommentBody = (hasSignedCLA, errorFoundOnCLACheck) => {
+  const commentTemplate = fs.readFileSync(
+    join(
+      dirname(fileURLToPath(import.meta.url)),
+      "templates/pullRequestComment.hbs"
+    ),
+    "utf-8"
+  );
 
-  const auth = new google.auth.GoogleAuth({
-    keyFile: googleConfigFilePath,
-    scopes: ["https://www.googleapis.com/auth/spreadsheets"],
+  const getCommentFromTemplate = Handlebars.compile(commentTemplate);
+  const commentBody = getCommentFromTemplate({
+    errorCla: errorFoundOnCLACheck,
+    hasCla: hasSignedCLA,
+    username: PULL_REQUST_INFO.username,
+    contributorsUrl: CONTRIBUTORS_URL,
   });
-  const googleAuthClient = await auth.getClient();
 
-  return google.sheets({ version: "v4", auth: googleAuthClient });
+  return commentBody;
 };
 
 const postCommentOnPullRequest = async (hasSignedCLA, errorFoundOnCLACheck) => {
@@ -136,21 +142,17 @@ const postCommentOnPullRequest = async (hasSignedCLA, errorFoundOnCLACheck) => {
   );
 };
 
-const getCommentBody = (hasSignedCLA, errorFoundOnCLACheck) => {
-  const commentTemplate = fs.readFileSync(
-    "./.github/actions/check-for-CLA/templates/pullRequestComment.hbs",
-    "utf-8"
-  );
+const main = async () => {
+  let hasSignedCLA;
+  let errorFoundOnCLACheck;
 
-  const getCommentFromTemplate = Handlebars.compile(commentTemplate);
-  const commentBody = getCommentFromTemplate({
-    errorCla: errorFoundOnCLACheck,
-    hasCla: hasSignedCLA,
-    username: PULL_REQUST_INFO.username,
-    contributorsUrl: CONTRIBUTORS_URL,
-  });
+  try {
+    hasSignedCLA = await checkIfUserHasSignedAnyCLA();
+  } catch (error) {
+    errorFoundOnCLACheck = error.toString();
+  }
 
-  return commentBody;
+  await postCommentOnPullRequest(hasSignedCLA, errorFoundOnCLACheck);
 };
 
 main();

.github/actions/check-for-CLA/package.json

@@ -0,0 +1,21 @@
+{
+    "name": "@cesium/check-for-cla",
+    "version": "0.1.0",
+    "main": "index.js",
+    "dependencies": {
+        "@octokit/core": "^6.1.2",
+        "fs-extra": "^11.2.0",
+        "googleapis": "^137.1.0",
+        "handlebars": "^4.7.8"
+    },
+    "type": "module",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/CesiumGS/cesium.git"
+    },
+    "license": "Apache-2.0",
+    "author": {
+        "name": "Cesium GS, Inc.",
+        "url": "https://cesium.com"
+    }
+}

.github/workflows/cla.yml

@@ -16,9 +16,11 @@ jobs:
         with:
           node-version: '20'
       - name: install npm packages
-        run: npm install googleapis @octokit/core handlebars fs-extra        
+        working-directory: ./.github/actions/check-for-CLA
+        run: npm install
       - name: run script
-        run: node .github/actions/check-for-CLA/index.js
+        working-directory: ./.github/actions/check-for-CLA
+        run: node index.js
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PULL_REQUEST_ID: ${{ github.event.number }}      

.slackbot.yml

@@ -1,11 +1,11 @@
 releaseSchedule:
   - jjspace, 4/1/2024
-  - jjhembd, 5/1/2024
-  - ggetz, 6/1/2024
+  - ggetz, 5/1/2024
+  - jjhembd, 6/1/2024
   - jjspace, 7/1/2024
-  - jjhembd, 8/1/2024
-  - ggetz, 9/1/2024
+  - ggetz, 8/1/2024
+  - jjhembd, 9/1/2024
   - jjspace, 10/1/2024
-  - jjhembd, 11/1/2024
-  - ggetz, 12/1/2024
+  - ggetz, 11/1/2024
+  - jjhembd, 12/1/2024