Test cicd

.github/workflows/cd-build-backend.yml

@@ -0,0 +1,26 @@
+name: 
+  Build Backend
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+
+      - name: Build Docker Image
+        run: docker build -t berkeleytime-backend ./backend/
+
+      - name: Save Docker Image as Tarball
+        run: docker save berkeleytime-backend:latest -o berkeleytime-backend.tar
+
+      - name: Upload Docker Image as Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: backend
+          path: berkeleytime-backend.tar

.github/workflows/cd-build-frontend.yml

@@ -0,0 +1,32 @@
+name: 
+  Build Frontend
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+
+      - name: echo
+        run: pwd
+
+      - name: node
+        run: node -v
+
+      - name: Build Docker Image
+        run: docker build -t berkeleytime-frontend ./frontend/
+
+      - name: Save Docker Image as Tarball
+        run: docker save berkeleytime-frontend:latest -o berkeleytime-frontend.tar
+
+      - name: Upload Docker Image as Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: frontend
+          path: berkeleytime-frontend.tar

.github/workflows/cd-dev.yml

@@ -0,0 +1,45 @@
+name: 
+  Deploy to Dev
+
+on:
+    repository_dispatch:
+      types: [trigger-workflow]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+    - name: Login to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Build Backend Image
+      run: docker build -t berkeleytime-backend ./backend/
+    - name: Tag Backend Image
+      run: docker tag berkeleytime-backend ${{ secrets.DOCKER_USERNAME }}/berkeleytime-backend:${{ github.sha }}
+    - name: Push Backend Image
+      run: docker push ${{ secrets.DOCKER_USERNAME }}/berkeleytime-backend:${{ github.sha }}
+    - name: Build Frontend Image
+      run: docker build -t berkeleytime-frontend ./frontend/
+    - name: Tag Frontend Image
+      run: docker tag berkeleytime-frontend ${{ secrets.DOCKER_USERNAME }}/berkeleytime-frontend:${{ github.sha }}
+    - name: Push Frontend Image
+      run: docker push ${{ secrets.DOCKER_USERNAME }}/berkeleytime-frontend:${{ github.sha }}
+    - name: executing remote ssh commands using ssh key
+      uses: appleboy/[email protected]
+      with:
+        host: hozer-51.ocf.berkeley.edu
+        username: root
+        key: ${{ secrets.SSH_KEY }}
+        port: 22
+        script: |
+          helm install bt-dev-app-${{ github.sha }} ./app --namespace=bt \
+            --set host=${{ github.event.client_payload.param1 }}.stanfurdtime.com \
+            --set mongoUri=mongodb://bt-dev-mongo-mongodb.bt.svc.cluster.local:27017/bt \
+            --set redisUri=redis://bt-dev-redis-master.bt.svc.cluster.local:6379 \
+            --set nodeEnv=development
+          helm release ttl bt-dev-app-${{ github.sha }} --set='${{ github.event.client_payload.param2 }}'

.github/workflows/cd-prod.yml

@@ -0,0 +1,41 @@
+name: 
+  Deploy to Prod
+
+on:
+  repository_dispatch:
+      types: [trigger-workflow]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+    - name: Login to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Build Backend Image
+      run: docker build -t berkeleytime-backend ./backend/
+    - name: Tag Backend Image
+      run: docker tag berkeleytime-backend ${{ secrets.DOCKER_USERNAME }}/berkeleytime-backend:prod
+    - name: Push Backend Image
+      run: docker push ${{ secrets.DOCKER_USERNAME }}/berkeleytime-backend:prod
+    - name: Build Frontend Image
+      run: docker build -t berkeleytime-frontend ./frontend/
+    - name: Tag Frontend Image
+      run: docker tag berkeleytime-frontend ${{ secrets.DOCKER_USERNAME }}/berkeleytime-frontend:prod
+    - name: Push Frontend Image
+      run: docker push ${{ secrets.DOCKER_USERNAME }}/berkeleytime-frontend:prod
+    - name: executing remote ssh commands using ssh key
+      uses: appleboy/[email protected]
+      with:
+        host: hozer-51.ocf.berkeley.edu
+        username: root
+        key: ${{ secrets.SSH_KEY }}
+        port: 22
+        script: |
+            kubectl rollout restart deployment bt-prod-app-backend
+            kubectl rollout restart deployment bt-prod-app-frontend

.github/workflows/cd-staging.yml

@@ -0,0 +1,41 @@
+name: 
+  Deploy to Staging
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+    - name: Login to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Build Backend Image
+      run: docker build -t berkeleytime-backend ./backend/
+    - name: Tag Backend Image
+      run: docker tag berkeleytime-backend ${{ secrets.DOCKER_USERNAME }}/berkeleytime-backend:staging
+    - name: Push Backend Image
+      run: docker push ${{ secrets.DOCKER_USERNAME }}/berkeleytime-backend:staging
+    - name: Build Frontend Image
+      run: docker build -t berkeleytime-frontend ./frontend/
+    - name: Tag Frontend Image
+      run: docker tag berkeleytime-frontend ${{ secrets.DOCKER_USERNAME }}/berkeleytime-frontend:staging
+    - name: Push Frontend Image
+      run: docker push ${{ secrets.DOCKER_USERNAME }}/berkeleytime-frontend:staging
+    - name: executing remote ssh commands using ssh key
+      uses: appleboy/[email protected]
+      with:
+        host: hozer-51.ocf.berkeley.edu
+        username: root
+        key: ${{ secrets.SSH_KEY }}
+        port: 22
+        script: |
+          kubectl rollout restart deployment bt-staging-app-backend
+          kubectl rollout restart deployment bt-staging-app-frontend

backend/src/bootstrap/loaders/passport.ts

@@ -26,6 +26,7 @@ const SCOPE = ['profile', 'email']
 
 export default async (app: Application) => {
   // init
+  app.use('trust proxy')
   app.use(session({
     secret: config.SESSION_SECRET,
     name: 'sessionId',

backend/src/scripts/update-catalog.ts

@@ -15,7 +15,7 @@ const SIS_SECTION_URL = 'https://gateway.api.berkeley.edu/sis/v1/classes/section
 
 const semToTermId = (s: SemesterType) => {
     // term-id is computed by dropping the century digit of the year, then adding the term code
-    const termMap: { [key: string] : number} = {'Fall': 8, 'Spring': 2, 'Summer': 5}
+    const termMap: { [key: string]: number } = { 'Fall': 8, 'Spring': 2, 'Summer': 5 }
     return `${Math.floor(s.year / 1000)}${s.year % 100}${termMap[s.term]}`
 }
 
@@ -31,21 +31,21 @@ const queryPages = async <T>(url: string, params: any, headers: any, field: stri
         let resp: AxiosResponse<SISResponse<T>>;
 
         try {
-            resp = await axios.get(url, { params: { 'page-number': page, ...params}, headers });
+            resp = await axios.get(url, { params: { 'page-number': page, ...params }, headers });
         } catch (err) {
             if (axios.isAxiosError(err) && err.response?.status === 404) {
                 break;
             } else {
                 console.log(`Unexpected err querying SIS API. Error: ${err}.`)
-                
+
                 if (retries > 0) {
                     retries--;
                     console.log(`Retrying...`)
                     continue;
                 } else {
                     console.log(`Too many errors querying SIS API for courses. Terminating update...`)
                     throw err;
-                } 
+                }
             }
         }
 
@@ -71,7 +71,7 @@ const updateCourses = async () => {
     const courses = await queryPages<CourseType>(SIS_COURSE_URL, params, headers, 'courses');
 
     console.log("Updating database with new course data...")
-    
+
     const bulkOps = courses.map(c => ({
         replaceOne: {
             filter: { classDisplayName: c.classDisplayName },
@@ -80,7 +80,7 @@ const updateCourses = async () => {
         }
     }));
 
-    const options = { strict: 'throw' } as MongooseBulkWriteOptions;
+    const options = { } as MongooseBulkWriteOptions;
 
     const res = await CourseModel.bulkWrite(bulkOps, options);
 
@@ -95,7 +95,7 @@ const updateClasses = async () => {
 
     const activeSemesters = await SemesterModel.find({ active: true }).lean();
     const classes: ClassType[] = [];
-    
+
     for (const s of activeSemesters) {
         console.log(`Updating classses for ${s.term} ${s.year}...`)
 
@@ -117,7 +117,7 @@ const updateClasses = async () => {
         }
     }));
 
-    const options = { strict: 'throw' } as MongooseBulkWriteOptions;
+    const options = { } as MongooseBulkWriteOptions;
 
     const res = await ClassModel.bulkWrite(bulkOps, options);
 
@@ -132,7 +132,7 @@ const updateSections = async () => {
 
     const activeSemesters = await SemesterModel.find({ active: true }).lean();
     const sections: SectionType[] = [];
-    
+
     for (const s of activeSemesters) {
         console.log(`Updating sections for ${s.term} ${s.year}...`)
 
@@ -154,7 +154,7 @@ const updateSections = async () => {
         }
     }));
 
-    const options = { strict: 'throw' } as MongooseBulkWriteOptions;
+    const options = { } as MongooseBulkWriteOptions;
 
     const res = await SectionModel.bulkWrite(bulkOps, options);
 
@@ -180,4 +180,4 @@ const updateSections = async () => {
     }
 
     process.exit(0);
-})();
+})();

frontend/Dockerfile

@@ -8,6 +8,7 @@ ENTRYPOINT npm start
 
 FROM dev AS prod
 RUN npm install -g serve
+RUN node -v
 RUN npm run build
 RUN rm -rf node_modules
 ENTRYPOINT npm run prod

infra/.gitignore

@@ -0,0 +1 @@
+*.tgz

infra/app/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

infra/app/Chart.yaml

@@ -0,0 +1,24 @@
+apiVersion: v2
+name: bt-app
+description: A Helm chart for the frontend and backend of the Berkeleytime application.
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "2.0.0-alpha"

infra/app/templates/_helpers.tpl

@@ -0,0 +1,37 @@
+{{/*
+Chart name and version
+*/}}
+{{- define "bt-app.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Labels applied to all resources.
+*/}}
+{{- define "bt-app.labels" -}}
+helm.sh/chart: {{ include "bt-app.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
+{{- define "bt-app.backendLabels" -}}
+app.kubernetes.io/name: backend
+{{ include "bt-app.labels" . }}
+{{- end -}}
+
+{{- define "bt-app.frontendLabels" -}}
+app.kubernetes.io/name: frontend
+{{ include "bt-app.labels" . }}
+{{- end -}}
+
+{{- define "bt-app.backendName" -}}
+{{ .Release.Name }}-backend
+{{- end -}}
+
+{{- define "bt-app.frontendName" -}}
+{{ .Release.Name }}-frontend
+{{- end -}}
+
+{{- define "bt-app.cronJobName" -}}
+{{ .Release.Name }}-cronjob
+{{- end -}}