Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

val → prod #139435

Merged
merged 46 commits into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
34430e6
Snyk scan sambr (#139366)
samzsam Jul 7, 2023
f838c38
update architecture diagram
braxex Jul 17, 2023
9c5ba99
Implementing secret scanning tools Gitleaks and Precommit (#139387)
KaushikSamtek Jul 19, 2023
60f4bfe
updated snyk custom action version (#139386)
ateklu7 Jul 24, 2023
59afca3
mdct-2555 fix submitAndUncertify e2e (#139411)
britt-mo Jul 24, 2023
a88fc33
Remove section fix corrections (#139373)
britt-mo Jul 25, 2023
fbd5999
[MDCT-2753] update to Enterprise-CMCS repos (#139414)
BearHanded Jul 25, 2023
940060a
[MDCT-2555] Stabilize carts e2e smoke test (#139420)
BearHanded Jul 27, 2023
14bd1f9
Bump semver from 5.7.1 to 5.7.2 in /services/ui-src (#139381)
dependabot[bot] Jul 27, 2023
463fd79
Bump webpack from 5.72.0 to 5.88.2 (#139395)
dependabot[bot] Jul 27, 2023
e156b75
Bump tough-cookie from 4.0.0 to 4.1.3 in /services/app-api (#139379)
dependabot[bot] Jul 27, 2023
8d0b32f
Task/update carts serverless (#139418)
cassandradanger Jul 27, 2023
5a0ea5d
Bump semver from 5.7.1 to 5.7.2 in /services/carts-bigmac-streams (#1…
dependabot[bot] Jul 27, 2023
b85cf70
Bump terser from 4.8.0 to 4.8.1 in /services/ui-src (#139397)
dependabot[bot] Jul 27, 2023
0a9f9fb
Bump browserslist from 4.16.0 to 4.21.9 in /services/carts-bigmac-str…
dependabot[bot] Jul 27, 2023
c0fedbd
Bump semver from 5.7.1 to 5.7.2 (#139382)
dependabot[bot] Jul 27, 2023
72f0ae4
Bump decode-uri-component from 0.2.0 to 0.2.2 in /services/carts-bigm…
dependabot[bot] Jul 27, 2023
b825547
Bump async from 2.6.3 to 2.6.4 in /services/ui-src (#139396)
dependabot[bot] Jul 27, 2023
23b9202
Bump eventsource from 1.1.0 to 1.1.2 in /services/ui-src (#139393)
dependabot[bot] Jul 27, 2023
776949e
Bump glob-parent from 5.1.1 to 5.1.2 in /services/carts-bigmac-stream…
dependabot[bot] Jul 27, 2023
88f4bb9
Bump ws from 7.4.1 to 7.5.9 in /services/carts-bigmac-streams (#139409)
dependabot[bot] Jul 27, 2023
b9c8cbd
Bump semver from 5.7.1 to 5.7.2 in /tests/cypress (#139380)
dependabot[bot] Jul 27, 2023
d0cb154
Bump loader-utils from 1.4.0 to 1.4.2 in /services/carts-bigmac-strea…
dependabot[bot] Jul 27, 2023
98bf1ed
Bump jsdom from 16.4.0 to 16.7.0 in /services/carts-bigmac-streams (#…
dependabot[bot] Jul 27, 2023
cb8c132
Bump tmpl from 1.0.4 to 1.0.5 in /services/carts-bigmac-streams (#139…
dependabot[bot] Jul 27, 2023
4cf38cc
Bump hosted-git-info from 2.8.8 to 2.8.9 in /services/carts-bigmac-st…
dependabot[bot] Jul 27, 2023
6186cbb
Bump minimatch from 3.0.4 to 3.1.2 in /services/carts-bigmac-streams …
dependabot[bot] Jul 27, 2023
1e88307
Bump word-wrap from 1.2.3 to 1.2.5 in /services/carts-bigmac-streams …
dependabot[bot] Jul 27, 2023
72036b1
Bump ansi-regex from 5.0.0 to 5.0.1 in /services/carts-bigmac-streams…
dependabot[bot] Jul 27, 2023
c4fa679
Bump word-wrap from 1.2.3 to 1.2.5 (#139413)
dependabot[bot] Jul 27, 2023
c62b642
Bump minimatch from 3.0.4 to 3.1.2 in /services/app-api (#139405)
dependabot[bot] Jul 27, 2023
a9a2835
Dependabot Alerts: loader-utils Patch (#139425)
karla-vm Jul 27, 2023
c674d92
Bump path-parse from 1.0.6 to 1.0.7 in /services/carts-bigmac-streams…
dependabot[bot] Jul 27, 2023
63f09fa
Bump word-wrap from 1.2.3 to 1.2.5 in /services/ui-src (#139421)
dependabot[bot] Jul 27, 2023
3424d79
Bump word-wrap from 1.2.3 to 1.2.5 in /services/app-api (#139423)
dependabot[bot] Jul 27, 2023
a2d7d3f
updating security hub from 1.0.1 to 1.0.2 (#139426)
KaushikSamtek Jul 28, 2023
ff25905
Bump moment from 2.29.2 to 2.29.4 in /services/ui-src (#139392)
dependabot[bot] Aug 1, 2023
317e60a
MDCT-2664: Update destroy to actually destroy (#139428)
gmrabian Aug 1, 2023
6594bfa
Bump lodash from 4.17.20 to 4.17.21 in /services/carts-bigmac-streams…
dependabot[bot] Aug 1, 2023
e0d4891
test → val (#139429)
braxex Aug 3, 2023
e252040
internal user initial setup (#139431)
braxex Aug 8, 2023
74c67ab
update REDIRECT_SIGNOUT based on env (#139427)
ailZhou Aug 9, 2023
efe1f87
Sechub Sync - 1.0.3 (#139432)
BearHanded Aug 10, 2023
26870e4
updated action and added assignee (#139433)
ateklu7 Aug 16, 2023
3ddf57a
Carts E2E Turn off failOnStatusCode (#139436)
ailZhou Aug 17, 2023
7f041d0
test → val (#139434)
braxex Aug 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env_example
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ stageEnrollmentCountsTableArn=local_nonsense_if_unset_we_search_CF_for
DYNAMODB_URL=http://localhost:8000
COGNITO_USER_POOL_ID=placeholder
COGNITO_USER_POOL_CLIENT_ID=placeholder
POST_SIGNOUT_REDIRECT=http://localhost:3000/
API_URL=http://localhost:3030/local
S3_LOCAL_ENDPOINT=http://localhost:4569
S3_ATTACHMENTS_BUCKET_NAME=local-uploads
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/git-secrets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: gitleaks
on: [pull_request, push, workflow_dispatch]
jobs:
gitleaks-scan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Run gitlakes docker
uses: docker://zricethezav/gitleaks
with:
args: detect --source /github/workspace/ --no-git --verbose
2 changes: 1 addition & 1 deletion .github/workflows/schedule-jira-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
role-to-assume: ${{ secrets.PRODUCTION_SYNC_OIDC_ROLE }}
- name: Sync Security Hub and Jira
uses: Enterprise-CMCS/[email protected].1
uses: Enterprise-CMCS/mac-fc-[email protected].3
with:
jira-token: ${{ secrets.JIRA_SERVICE_USER_TOKEN }}
jira-username: ${{ secrets.JIRA_SERVICE_USERNAME }}
Expand Down
57 changes: 57 additions & 0 deletions .github/workflows/snyk-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Snyk Scan and Report

on:
pull_request:
branches: [main]
schedule:
- cron: "0 4 * * *" # run every day at midnight

permissions:
id-token: write

jobs:
snyk_run:
name: Snyk Run (for PR and push)
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'

steps:
- name: Check out repository
uses: actions/checkout@v2

- name: Install Snyk and Run Snyk test
run: |
npm install -g snyk
snyk test --all-projects --json > snyk_output.txt || true
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

snyk_nightly_run:
name: Snyk Nightly Run (for nightly cron with JIRA)
runs-on: ubuntu-latest
if: github.event_name == 'schedule'
steps:
- name: Check out repository
uses: actions/checkout@v2

- name: Install Snyk and Run Snyk test
run: |
npm install -g snyk
snyk test --all-projects --json > snyk_output.txt || true
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

- name: use the custom github action to parse Snyk output
uses: Enterprise-CMCS/[email protected]
with:
jira-username: ${{ secrets.JIRA_SERVICE_USERNAME }}
jira-token: ${{ secrets.JIRA_SERVICE_USER_TOKEN }}
jira-host: "qmacbis.atlassian.net"
jira-project-key: "MDCT"
jira-issue-type: "Task"
jira-custom-field-key-value: '{ "customfield_10007" : "MDCT-2280", "customfield_14154" : [{"id": "16958", "value": "CARTS"}] }'
jira-labels: "CARTS,snyk"
jira-title-prefix: "[CARTS] - Snyk :"
assign-jira-ticket-to: "620e936fa715c6006914c7d2" # pragma: allowlist secret (Jira user ID for Rehman)
scan-output-path: "snyk_output.txt"
scan-type: "snyk"
2 changes: 2 additions & 0 deletions .gitleaks.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[allowlist]
files = [ "*.test.json" ]
4 changes: 1 addition & 3 deletions .images/architecture.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,12 @@ repos:
- services/uploads/src/test.json
- --exclude-files
- tests/cypress/cypress.json
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.0.272
hooks:
- id: ruff
- repo: https://github.com/zricethezav/gitleaks
rev: v8.12.0
hooks:
- id: gitleaks
10 changes: 10 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.25.0
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
ignore:
SNYK-JS-JSON5-3182856:
- '*':
reason: None Given
expires: 2023-05-18T00:00:00.000Z
created: 2023-05-16T13:38:44.312Z
patch: {}
Loading
Loading