Merge branch 'master' into cpsc310-remove-schedule-branch

Author: winstan

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: cimg/node:12.22.1
+      - image: cimg/node:12.22.7
       - image: circleci/mongo:3.6
 
       # Specify service dependencies here if necessary
@@ -176,7 +176,7 @@ jobs:
 
   build_run_stop:
     machine:
-      image: ubuntu-1604:201903-01
+      image: ubuntu-2004:202201-02
     working_directory: ~/project
 
     environment:

.dockerignore

@@ -20,4 +20,3 @@ testOutput
 .rysncexclude
 LICENSE
 README.md
-yarn.lock

.gitignore

@@ -54,13 +54,18 @@ packages/portal/backend/src/custom/CustomCourseRoutes.ts
 **/.env*
 
 # Misc
-ssl/
 /data/
 .rsyncexclude
 testOutput/
 packages/autotest/testOutput/
 packages/autotest/test/data/
 
+# SSL
+ssl/
+copy-certs.sh.log
+start-classy.sh.log
+stop-classy.sh.log
+
 # Excludes plugins aside default plugin
 plugins/*
 !plugins/default/
@@ -69,3 +74,5 @@ plugins/default/**/*.js.map
 !plugins/example/
 plugins/example/**/*.js
 plugins/example/**/*.js.map
+docker-compose.override.yml
+packages/proxy/nginx.rconf

helper-scripts/set-nginx-conf.sh

@@ -8,9 +8,9 @@ file="./plugins/$plugin/nginx/nginx.rconf"
 
 if [[ -f $file ]]; then
     echo "Nginx.rconf file found in $plugin plugin"
-    echo "Overwriting default Classy/packages/proxy/nginx.rconf file"
+    echo "Overriding Classy/packages/proxy/nginx.rconf.default"
     cp $file ./packages/proxy/nginx.rconf
-    echo "Default Classy/packages/proxy/nginx.rconf file overwritten"
+    echo "Classy/packages/proxy/nginx.rconf file written"
 else
-    echo "No nginx.conf found in $plugin plugin"
+    echo "$file not found."
 fi

package.json

@@ -43,13 +43,14 @@
         "webpack": "^5.38.1"
     },
     "dependencies": {
+        "@types/bson": "^4.2.0",
         "@types/mongodb": "^3.0.5",
         "@types/node-schedule": "^1.2.2",
         "dotenv": "4.0.0",
         "fs-extra": "5.0.0",
-        "jszip": "3.2.1",
+        "jszip": "3.7.0",
         "mongodb": "^3.0.2",
-        "node-fetch": "^2.6.0",
+        "node-fetch": "^2.6.7",
         "restify": "^8.4.0"
     },
     "resolutions": {

packages/autotest/Dockerfile

@@ -6,6 +6,7 @@ WORKDIR /app
 
 # The common package requires the .env file directly so we have to pass it through
 COPY .env ./
+COPY yarn.lock ./
 COPY package.json tsconfig.json ./
 COPY packages/common ./packages/common
 COPY packages/portal/backend ./packages/portal/backend

packages/autotest/package.json

@@ -24,7 +24,7 @@
     "dockerode": "^2.5.7",
     "dotenv": "4.0.0",
     "fs-extra": "5.0.0",
-    "jszip": "^3.2.1",
+    "jszip": "^3.7.0",
     "xunit-viewer": "^7.1.5",
     "mocha": "^9.0.0",
     "mocha-junit-reporter": "^1.17.0",

packages/portal/Dockerfile

@@ -10,6 +10,7 @@ WORKDIR /app
 
 # The common package requires the .env file directly so we have to pass it through
 COPY .env ./
+COPY yarn.lock ./
 COPY package.json tsconfig.json .env ./
 COPY packages/common ./packages/common
 COPY packages/portal ./packages/portal

packages/portal/backend/src/controllers/GitHubActions.ts

@@ -1327,7 +1327,7 @@ export class GitHubActions implements IGitHubActions {
 
         function initGitDir() {
             Log.info('GitHubActions::importRepoFS(..)::initGitDir() - start');
-            return exec(`cd ${cloneTempDir.path} && git init -q`)
+            return exec(`cd ${cloneTempDir.path} && git init -q && git branch -m main`)
                 .then(function(result: any) {
                     Log.info('GitHubActions::importRepoFS(..)::initGitDir() - done');
                     that.reportStdOut(result.stdout, 'GitHubActions::importRepoFS(..)::initGitDir()');
@@ -1361,7 +1361,7 @@ export class GitHubActions implements IGitHubActions {
         function pushToNewRepo() {
             const pushStart = Date.now();
             Log.info('GitHubActions::importRepoFS(..)::pushToNewRepo() - start');
-            const command = `cd ${cloneTempDir.path} && git push -q origin master`;
+            const command = `cd ${cloneTempDir.path} && git push -q origin main`;
             return exec(command)
                 .then(function(result: any) {
                     Log.info('GitHubActions::importRepoFS(..)::pushToNewRepo() - done; took: ' + Util.took(pushStart));

packages/portal/backend/src/controllers/GitHubController.ts

@@ -31,6 +31,8 @@ export interface IGitHubController {
     getRepositoryUrl(repo: Repository): Promise<string>;
 
     getTeamUrl(team: Team): Promise<string>;
+
+    releaseRepository(repo: Repository, teams: Team[], asCollaborators?: boolean): Promise<boolean>;
 }
 
 export interface GitTeamTuple {
@@ -516,4 +518,11 @@ export class TestGitHubController implements IGitHubController {
         Log.warn("TestGitHubController::updateBranchProtection(..) - TEST");
         return true;
     }
+
+    public async releaseRepository(repo: Repository,
+                                   teams: Team[],
+                                   asCollaborators: boolean = false): Promise<boolean> {
+        Log.warn("TestGitHubController::releaseRepository(..) - TEST");
+        return true;
+    }
 }