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

Update development branch in sync with main branch #439

Merged
merged 295 commits into from
Oct 24, 2023
Merged

Update development branch in sync with main branch #439

merged 295 commits into from
Oct 24, 2023

Conversation

duggalsu
Copy link
Contributor

  • Get development branch up-to-date with main branch to create future PRs

dennyabrain and others added 28 commits October 4, 2023 09:34
* changes to code snippet

* final-changes-made
* Weekly Security Update
- Updated Node LTS version
- Updated accompanying NPM version
- Updated node image in dockerfile
- Updated readme to reflect changes

* Update node version to reflect docker image version
- Updated node version in plugin package.json
- Updated node version api-server package.json
- Updated node and npm to fixed versions in readme
This fixes the image breaking in production.
While developing Uli locally, we use docker compose to mount our code directory into the image. Because of this we never realized that the docker image itself wasn't copying source code files. As a result when you look at the uli container in production cluster, it only has package.json in it.
We've tested the lexicon with the two partner organizations. The metadata fields may change in the future but not dramatically. 

For reference:
- Annotation guideline (for meaning of each label): https://docs.google.com/document/d/18H4TlLFB2GXK054oMj1uXVJ2OCFW08Gi/edit
- partner annotations here: https://docs.google.com/spreadsheets/d/15YrV8Q-5PTorHRo71ZBkdL0bePPaUNC9FTU41ET91V4/edit#gid=0


These are the fields that we need for now:
| Field Name    | Field Type |  Possible Values |  Optional?|
| ------------- | ---------- |----------------- |------- |
| Level of Severity  |  Single option | low, mid, high  | No |
| Casual  |  Binary | Yes, No  | No |
| Appropriated  |  Binary | Yes, No  | No |
| If, Appropriated is it by community or others?  |  Binary | Community, Others  | yes |
| What makes it problematic?  |  Text |        | yes |
| Category of Abuse |   pick multiple |  gendered, sexualized, religion, ethnicity , political affiliation, caste, class, body shaming,  abelist,  sexual identity,  other | pick at least one, at most 4 |

---------

Co-authored-by: Denny <[email protected]>
- Added setting up custom node version for build PR reviews
- Updated node version
- Updated node docker image
- Updated extension readme
- Fixed npm critical severity vulnerability in plugin using audit fix
- Updated testing script paths to default
* Weekly dependency update
- Pinned new dependencies
- Updated package versions with no breaking changes affecting us

* - Updated package lock files

* Add custom node version
- Added setting up custom node version for build PR reviews

* Weekly node and docker update
- Updated node version
- Updated node docker image
- Updated extension readme
- Fixed npm critical severity vulnerability in plugin using audit fix
- Updated testing script paths to default
- Resolved merge conflicts
- Verified breaking no breaking changes from commit logs
- Updated eslint-config-prettier version in package.json
- Updated package lock file
- Updated non-breaking plugin packages
- Updated non-breaking api-server packages
@gitguardian
Copy link

gitguardian bot commented Oct 24, 2023

⚠️ GitGuardian has uncovered 3 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id Secret Commit Filename
- Username Password 59bd5a2 browser-extension/docker-compose.yml View secret
- Username Password 86063e3 browser-extension/api-server/db/config/config.js View secret
- Username Password 0c34ff1 browser-extension/api-server/db/config/config.js View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!

@duggalsu duggalsu merged commit 9a230e7 into development Oct 24, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants