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

Github Action to Deploy Talawa-API to GoDaddy VPS #1491

Merged
merged 37 commits into from
Jan 12, 2024

Conversation

vasujain275
Copy link
Contributor

What kind of change does this PR introduce?

It is a feature, this pr introduces deploy.yml file which can be used to trigger github actions on every push to deploy branch that pushes talawa-api to ec2 instance.

Issue Number:

Fixes #1428

Did you add tests for your changes?

N/A

Snapshots/Videos:
This snapshot is from my fork of talawa-api that shows github action working correctly.(https://github.com/vasujain275/talawa-api/actions/runs/7185962040)
image

If relevant, did you update the documentation?

Summary

Solves this issue - #1428

Does this PR introduce a breaking change?
No

Other information

So, this solution as you can see deploy the whole talwa-api on aws free ec2 in ~15mins which is alot. I first run this commands on fresh ec2 machine

sudo apt-get update && sudo apt-get upgrade
sudo apt-get install curl
sudo curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
source ~/.bashrc
nvm install --lts
sudo apt-get install docker.io -y

sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose

sudo chmod +x /usr/local/bin/docker-compose
git clone https://github.com/PalisadoesFoundation/talawa-api.git
cd talawa-api
npm install
npm run setup

Then the action can deploy talawa-api using action secrets which are HOST that is IP of ec2 instance, USERNAME that is ubuntu for our ubuntu ec2, PORT that is 22 for sshing and private key that we need to generate on our ec2 first.

Have you read the contributing guide?
Yes

@palisadoes @kb-0311 @noman2002 any suggestion for how to reduce build time? I am actively looking for a better solution and will commit the changes once I found a better solution.

Copy link

Our Pull Request Approval Process

We have these basic policies to make the approval process smoother for our volunteer team.

Testing Your Code

Please make sure your code passes all tests. Our test code coverage system will fail if these conditions occur:

  1. The overall code coverage drops below the target threshold of the repository
  2. Any file in the pull request has code coverage levels below the repository threshold
  3. Merge conflicts

The process helps maintain the overall reliability of the code base and is a prerequisite for getting your PR approved. Assigned reviewers regularly review the PR queue and tend to focus on PRs that are passing.

Reviewers

When your PR has been assigned reviewers contact them to get your code reviewed and approved via:

  1. comments in this PR or
  2. our slack channel

Reviewing Your Code

Your reviewer(s) will have the following roles:

  1. arbitrators of future discussions with other contributors about the validity of your changes
  2. point of contact for evaluating the validity of your work
  3. person who verifies matching issues by others that should be closed.
  4. person who gives general guidance in fixing your tests

CONTRIBUTING.md

Read our CONTRIBUTING.md file. Most importantly:

  1. PRs with issues not assigned to you will be closed by the reviewer
  2. Fix the first comment in the PR so that each issue listed automatically closes

Other

  1. 🎯 Please be considerate of our volunteers' time. Contacting the person who assigned the reviewers is not advised unless they ask for your input. Do not @ the person who did the assignment otherwise.
  2. Read the CONTRIBUTING.md file make

@palisadoes
Copy link
Contributor

Please answer my question on the GoDaddy VPS.

With that solution we would have a fixed cost and not have to worry about unexpected cloud charges.

Let me know

Copy link
Contributor

@palisadoes palisadoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1428

Please answer this question. The EC2 solution is premature. The contributors feel it's high risk

@vasujain275
Copy link
Contributor Author

@palisadoes

  1. Got access to demo vps using ssh.
  2. I am currently looking into optimizing the build times, once done I will commit the changes to this pr.

@kb-0311
Copy link
Contributor

kb-0311 commented Dec 13, 2023

@vasujain275 @palisadoes Here are my thoughts.

  1. It's okay if you are not able to optimize the build time, I suggest that it can be looked at later the priority should be to implement the deployment pipeline which is most suitable first with the main branch. I guess the main bottle neck is during pruning and restarting the docker services during build time on push.

I first run this commands on fresh ec2 machine

For now, I will just collectively use the term VM to refer to ec2 or a vps.
If I am not wrong our VPS or ec2 instance will have persistent storage so those command sequences you listed in the original issue will only be needed once initially just to configure our VM, correct me if I am wrong.
3. You have not mentioned how pulling the latest main branch from the talawa-api/repo dir will be handled. Right now in your workflow file on every push, we will be executing remote commands to pull the latest branch and restart the docker services when this workflow is triggered. What happens if a particular command fails (like a connection time out error during pulling a docker image while running compose )? How do you think we can handle.
4. Regarding the roles part, I agree with @vasujain275 approach let the all the manual routine checkups and introspection be made available to unprivileged accounts but let the IAM sudo user have the privilege to modify the services/packages.

Also if @palisadoes @vasujain275 please do create a channel and add me, I think we should have a small meet regarding this when we will be free.

@palisadoes
Copy link
Contributor

The #talawa-workflows slack channel has been created

@vasujain275
Copy link
Contributor Author

@kb-0311

  1. I will try to optimize the pruning and restarting of the docker services, otherwise as you suggested, I will focus on basic implementation for now.
  2. Yes commands listed are only required to run once when setting up the VM for the first time.
  3. The action first pulls the latest branch and builds containers again but all errors are not handled right now. However, according to me the actions can't have a connection timeout error as I have mentioned a connection time of 200min, the only error I can think of this error in building the docker image of talawa-api which is I think prevented by our tests. Correct me if I am wrong.
  4. I got ssh access to the IAM sudo user on the demo VPS and will get that up and running in a few hours.

@palisadoes, As @kb-0311 suggested a small meeting regarding this would be helpful.

@vasujain275
Copy link
Contributor Author

@kb-0311 @palisadoes
Multiple changes are required to this PR like the addition of MongoDB reset script, redis rate limiter, etc as discussed in the meeting. How do you think I should proceed with this? Make different PRs for each of them or include them here only?

@palisadoes
Copy link
Contributor

Make separate PRs for each and link them to:

@kb-0311
Copy link
Contributor

kb-0311 commented Dec 20, 2023

@vasujain275 Yes there should be different PRs for both of those tasks. You can make an issue for now and tag me as reviewer.

@vasujain275
Copy link
Contributor Author

@vasujain275 Yes there should be different PRs for both of those tasks. You can make an issue for now and tag me as reviewer.

Got it, making different prs for them

Copy link

codecov bot commented Dec 21, 2023

Codecov Report

Attention: 91 lines in your changes are missing coverage. Please review.

Comparison is base (c0468a4) 98.17% compared to head (d32d6ab) 97.45%.
Report is 123 commits behind head on develop.

Files Patch % Lines
src/utilities/PII/decryption.ts 0.00% 17 Missing ⚠️
src/resolvers/Mutation/updateUserProfile.ts 70.90% 1 Missing and 15 partials ⚠️
src/resolvers/middleware/currentUserExists.ts 45.83% 13 Missing ⚠️
src/utilities/PII/encryption.ts 0.00% 13 Missing ⚠️
src/utilities/PII/isAuthorised.ts 0.00% 11 Missing ⚠️
...tilities/encodedVideoStorage/uploadEncodedVideo.ts 90.12% 8 Missing ⚠️
src/resolvers/Mutation/createPost.ts 86.95% 6 Missing ⚠️
src/resolvers/Mutation/removeAdvertisement.ts 92.85% 2 Missing ⚠️
...c/resolvers/Query/postsByOrganizationConnection.ts 33.33% 2 Missing ⚠️
src/resolvers/Subscription/onPluginUpdate.ts 0.00% 2 Missing ⚠️
... and 1 more
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1491      +/-   ##
===========================================
- Coverage    98.17%   97.45%   -0.73%     
===========================================
  Files          184      214      +30     
  Lines        10767    12949    +2182     
  Branches       835     1042     +207     
===========================================
+ Hits         10571    12620    +2049     
- Misses         186      299     +113     
- Partials        10       30      +20     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@vasujain275
Copy link
Contributor Author

  1. The issue is that setup.ts is going to change soon. So you'll need to let the person who is working on the MongoDB automation know your requirements for deployment.
  2. We don't want this to break within a week of implementation

Understood, reverted all the changes to setup.ts and informed the person working on this about my requirements for deployment here - #1605 (comment)

@palisadoes palisadoes changed the title Github Action to Deploy Talawa-API to EC2 Github Action to Deploy Talawa-API to GoDaddy VPS Jan 1, 2024
@palisadoes
Copy link
Contributor

palisadoes commented Jan 2, 2024

@vasujain275

  1. In order to get this PR closed and the cloud API instance automation, restore your changes to setup.ts. There is no guarantee that the other issue will be finished in time.
  2. With those restored changes will this PR be ready to implement the cloud API instance?
  3. Is anything else necessary?

@kb-0311
Copy link
Contributor

kb-0311 commented Jan 2, 2024

@vasujain275 @palisadoes I think we keep Vasu's changes to the setup.ts as is.

I have reviewed this PR and the scripts are fine.

@palisadoes
Copy link
Contributor

Kanishka, should we merge this now?

@vasujain275
Copy link
Contributor Author

vasujain275 commented Jan 2, 2024

@palisadoes @kb-0311

  1. The changes in setup.ts are not needed for the functioning of the cloud instance.
  2. They will be needed to setup cloud instance easily next time.
  3. The pr is not ready to merge as I have to add instructions to for creating cronjobs in documentation.
  4. I will implement them in 4-5 hours today itself, then the pr will be ready to merge.

So, we can wait for the changes in setup.ts to be implemented in #1605 as it doesn't directly affect the cloud instance -

@kb-0311
Copy link
Contributor

kb-0311 commented Jan 2, 2024

@vasujain275 Noted. Do let me know when then PR is ready for review

@vasujain275
Copy link
Contributor Author

@kb-0311
All scripts, containers,cronjobs are working on vps and well documented for anyone to replicate. But I have a doubt - I haven't configured RECAPTCHA_SECERT_KEY, MAIL_USERNAME, MAIL_PASSWORD as they require a google account to generate all of these, how should I add them?

@kb-0311
Copy link
Contributor

kb-0311 commented Jan 2, 2024

@vasujain275 cool I will review everything tomorrow.

I have a doubt - I haven't configured RECAPTCHA_SECERT_KEY, MAIL_USERNAME, MAIL_PASSWORD as they require a google account to generate all of these, how should I add them

@palisadoes any suggestions ?

@palisadoes
Copy link
Contributor

@kb-0311 I have no further comments. Please take a look

Copy link
Contributor

@palisadoes palisadoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment

.github/workflows/deploy.yml Outdated Show resolved Hide resolved
@vasujain275
Copy link
Contributor Author

I have a doubt - I haven't configured RECAPTCHA_SECERT_KEY, MAIL_USERNAME, MAIL_PASSWORD as they require a google account to generate all of these, how should I add them

@kb-0311 any update?

@kb-0311
Copy link
Contributor

kb-0311 commented Jan 8, 2024

@vasujain275 sorry for the late reply.

  1. You can create a dummy google account for now and share it with @palisadoes. You can use this account for the env variables. Once we have made sure that the pipeline is working fine, we can change the account and those variables anytime.
  2. While generating the recaptha secret key v3 make sure to save the corresponding site key somewhere we will need it to configure the clients apps that will be accessing the deployed API.

@palisadoes anything else you would like to add?

@vasujain275
Copy link
Contributor Author

@kb-0311 Created the demo account and added the required recaptcha parms to .env and sent all the details to @palisadoes

@kb-0311
Copy link
Contributor

kb-0311 commented Jan 9, 2024

Cool then please do take a look at my review, @palisadoes anything you want to add?

@palisadoes
Copy link
Contributor

Cool then please do take a look at my review, @palisadoes anything you want to add?

  1. I sent the Palisadoes keys to @vasujain275
  2. @vasujain275 where is the .env file in this PR? Will it be autogenerated? If so, we should store the captcha keys as repo secrets for the best security

@vasujain275
Copy link
Contributor Author

@palisadoes

  1. Added secret keys to .env file on vps.
  2. The .env file is stored in /home/talawa-api/develop/talawa-api/ directory on the Godaddy VPS. It will not be autogenerated and needed to be manually set by the person setting up the vps as mentioned in /scripts/cloud-api-demo/README.md.
  3. Yes it will be best to store the captcha keys as repo secrets for the best security.

@palisadoes palisadoes merged commit ac99a0c into PalisadoesFoundation:develop Jan 12, 2024
6 of 9 checks passed
@vasujain275 vasujain275 deleted the deployment branch January 12, 2024 22:14
@vasujain275 vasujain275 restored the deployment branch January 12, 2024 22:14
lakshz pushed a commit to lakshz/talawa-api that referenced this pull request Jan 16, 2024
…on#1491)

* Added deploy.yml

* Added action to run when push on deploy branch too

* refactor: changed push to all branches

* test: ec2 ci/cd pipeline test1

* test: ec2 ci/cd pipeline test2

* refactor: Added Port to deploy.yml

* test: ec2 ci/cd pipeline test3

* test: ec2 ci/cd pipeline test4

* test: ec2 ci/cd pipeline test5

* refactor: typo in cd command

* refactor: added command to delete repo after docker compose

* refactor: added sudo to required commands

* refactor: Simplifed the script in deploy.yml

* refactor: removed timeout issue

* refactor: Optimized the Build process of Docker Compose

* refactor : Added Password field to Action

* refactor: removed sudo from commands

* refactor : removed the password field as it was not needed

* refactor: Added main branch for on push in github-action

* refactor: always run code from develop

* refactor: Added API_DEMO Suffix to env variables and testing for talawa-api user

* refactor: removed the triger for push on deployement branch

* Added MongoDB Reset Script

* refactor: Fixed Bug in Setup.ts related MongoDB url env variable

* Added SSL Certs renew script

* docs: Added docs to setup cloud instance for future refrence

* refactor: import sample data after dropping the database in reset_mongo.sh

* refactor: Changed File Structure as needed

* fixed conflict in setup.ts

* reverted all changes in setup.ts

* refactor: Added detailed comments in scripts

* refactor: removed perm check from each script as dedicateted script checks for it

* refactor: fixed cert_renew.sh

* docs: Completed the Cloud API Demo Readme

* docs: added solution to cors error

* refactor: removed deployment branch from deploy.yml
palisadoes added a commit that referenced this pull request Jan 16, 2024
* Replace package vm2 with isolated-vm (#1532)

* Replace package vm2 with isolated-vm

* Removed package isolated-vm

* chore(deps): bump follow-redirects from 1.15.3 to 1.15.4 (#1668)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.3...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* base branch checking job in pull_request.yml

* Convert Private Orgs to `userRegistrationRequired` Orgs (#1643)

* updated node version

* fix falling test

* removed private org

* fix redis port

* fix failing test case

* Revert "restored countline.py functionality to our github action flow (#1568)" (#1572)

This reverts commit 195d148.

* restored countline.py functionality to our github action flow (#1573)

* setup script will now ask for superAdmin email

* asked changes

* Update setup.ts

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* Added script to generate table of content (#1587)

* Added script to generate table of content

* git hook to generate toc when markdown files are changed.

* script for toc

* Revert "Added script to generate table of content (#1587)" (#1592)

This reverts commit 74a9f67.

* table of content script (#1600)

* Update INSTALLATION.md

* chore(deps): bump @types/i18n from 0.13.8 to 0.13.10 (#1616)

Bumps [@types/i18n](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/i18n) from 0.13.8 to 0.13.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/i18n)

---
updated-dependencies:
- dependency-name: "@types/i18n"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* updated express-rate-limit package (#1621)

* fix: Removed depricated xss-clean package (#1536)

Signed-off-by: Akhilender <[email protected]>

* updated node version

* fix falling test

* fix

* Added script to generate table of content (#1587)

* Added script to generate table of content

* git hook to generate toc when markdown files are changed.

* script for toc

* fix: Removed depricated xss-clean package (#1536)

Signed-off-by: Akhilender <[email protected]>

* Added script to generate table of content (#1587)

* Added script to generate table of content

* git hook to generate toc when markdown files are changed.

* script for toc

* table of content script (#1600)

* Update INSTALLATION.md

* chore(deps): bump @types/i18n from 0.13.8 to 0.13.10 (#1616)

Bumps [@types/i18n](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/i18n) from 0.13.8 to 0.13.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/i18n)

---
updated-dependencies:
- dependency-name: "@types/i18n"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Removed depricated xss-clean package (#1536)

Signed-off-by: Akhilender <[email protected]>

* updated node version

* removed comments

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* added userRegistrationRequired field in schema

* fix redis port

* fix failing test

* Create weekly event recurring instance (#1602)

* Create weekly event recurring instance

* test for weekly recurring events

* Weekly Recurring Events bug fixes

* Revert "Create weekly event recurring instance (#1602)" (#1649)

This reverts commit e7c043d.

* Added Github Action to check number of files submitted during PR. (#1596)

* Added script in workflows to check no of files submitted during PR.

* Update pull-request.yml to run the script added.

* Update pull-request.yml

* Changed logic of script

* Optimized pull-request.yml according to script

* Modified script to add default value to max_files in argsparse

* Added context to the job step in PR.yml for ease

* Added flag in argparser for better optimization

* Updated pr.yml file to be more concise

* Lint only updated files with stricter linting (#1635)

* Replace package vm2 with isolated-vm (#1532)

* Replace package vm2 with isolated-vm

* Removed package isolated-vm

* init: lint-staged for linting staged files only

* feat: convert warn to error in eslintrc

* fix: failing tests

* fix: package.json

* fix: package-lock

---------

Co-authored-by: Sarthak Patel <[email protected]>

* Revert "Lint only updated files with stricter linting (#1635)" (#1652)

This reverts commit 269b8bd.

* Create weekly event recurring instance (#1602)

* Create weekly event recurring instance

* test for weekly recurring events

* Weekly Recurring Events bug fixes

* Revert "Create weekly event recurring instance (#1602)" (#1649)

This reverts commit e7c043d.

* Lint only updated files with stricter linting (#1635)

* Replace package vm2 with isolated-vm (#1532)

* Replace package vm2 with isolated-vm

* Removed package isolated-vm

* init: lint-staged for linting staged files only

* feat: convert warn to error in eslintrc

* fix: failing tests

* fix: package.json

* fix: package-lock

---------

Co-authored-by: Sarthak Patel <[email protected]>

* Revert "Lint only updated files with stricter linting (#1635)" (#1652)

This reverts commit 269b8bd.

* Create weekly event recurring instance (#1602)

* Create weekly event recurring instance

* test for weekly recurring events

* Weekly Recurring Events bug fixes

* Revert "Create weekly event recurring instance (#1602)" (#1649)

This reverts commit e7c043d.

* Lint only updated files with stricter linting (#1635)

* Replace package vm2 with isolated-vm (#1532)

* Replace package vm2 with isolated-vm

* Removed package isolated-vm

* init: lint-staged for linting staged files only

* feat: convert warn to error in eslintrc

* fix: failing tests

* fix: package.json

* fix: package-lock

---------

Co-authored-by: Sarthak Patel <[email protected]>

* Revert "Lint only updated files with stricter linting (#1635)" (#1652)

This reverts commit 269b8bd.

* Create weekly event recurring instance (#1602)

* Create weekly event recurring instance

* test for weekly recurring events

* Weekly Recurring Events bug fixes

* Revert "Create weekly event recurring instance (#1602)" (#1649)

This reverts commit e7c043d.

* Lint only updated files with stricter linting (#1635)

* Replace package vm2 with isolated-vm (#1532)

* Replace package vm2 with isolated-vm

* Removed package isolated-vm

* init: lint-staged for linting staged files only

* feat: convert warn to error in eslintrc

* fix: failing tests

* fix: package.json

* fix: package-lock

---------

Co-authored-by: Sarthak Patel <[email protected]>

* Revert "Lint only updated files with stricter linting (#1635)" (#1652)

This reverts commit 269b8bd.

* updated node version

* fix falling test

* removed private org

* fix redis port

* Revert "restored countline.py functionality to our github action flow (#1568)" (#1572)

This reverts commit 195d148.

* restored countline.py functionality to our github action flow (#1573)

* setup script will now ask for superAdmin email

* asked changes

* Update setup.ts

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* Added script to generate table of content (#1587)

* Added script to generate table of content

* git hook to generate toc when markdown files are changed.

* script for toc

* Revert "Added script to generate table of content (#1587)" (#1592)

This reverts commit 74a9f67.

* table of content script (#1600)

* Update INSTALLATION.md

* chore(deps): bump @types/i18n from 0.13.8 to 0.13.10 (#1616)

Bumps [@types/i18n](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/i18n) from 0.13.8 to 0.13.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/i18n)

---
updated-dependencies:
- dependency-name: "@types/i18n"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Removed depricated xss-clean package (#1536)

Signed-off-by: Akhilender <[email protected]>

* updated node version

* fix falling test

* fix

* Added script to generate table of content (#1587)

* Added script to generate table of content

* git hook to generate toc when markdown files are changed.

* script for toc

* fix: Removed depricated xss-clean package (#1536)

Signed-off-by: Akhilender <[email protected]>

* Added script to generate table of content (#1587)

* Added script to generate table of content

* git hook to generate toc when markdown files are changed.

* script for toc

* table of content script (#1600)

* Update INSTALLATION.md

* chore(deps): bump @types/i18n from 0.13.8 to 0.13.10 (#1616)

Bumps [@types/i18n](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/i18n) from 0.13.8 to 0.13.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/i18n)

---
updated-dependencies:
- dependency-name: "@types/i18n"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Removed depricated xss-clean package (#1536)

Signed-off-by: Akhilender <[email protected]>

* updated node version

* fix

* fix

* fix

* fix

* fix

* fix

* added userRegistrationRequired field in schema

* fix redis port

* Create weekly event recurring instance (#1602)

* Create weekly event recurring instance

* test for weekly recurring events

* Weekly Recurring Events bug fixes

* Revert "Create weekly event recurring instance (#1602)" (#1649)

This reverts commit e7c043d.

* Lint only updated files with stricter linting (#1635)

* Replace package vm2 with isolated-vm (#1532)

* Replace package vm2 with isolated-vm

* Removed package isolated-vm

* init: lint-staged for linting staged files only

* feat: convert warn to error in eslintrc

* fix: failing tests

* fix: package.json

* fix: package-lock

---------

Co-authored-by: Sarthak Patel <[email protected]>

* Revert "Lint only updated files with stricter linting (#1635)" (#1652)

This reverts commit 269b8bd.

* updated node version

* fix falling test

* removed private org

* fix redis port

* Revert "restored countline.py functionality to our github action flow (#1568)" (#1572)

This reverts commit 195d148.

* restored countline.py functionality to our github action flow (#1573)

* setup script will now ask for superAdmin email

* asked changes

* Update setup.ts

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* Added script to generate table of content (#1587)

* Added script to generate table of content

* git hook to generate toc when markdown files are changed.

* script for toc

* Revert "Added script to generate table of content (#1587)" (#1592)

This reverts commit 74a9f67.

* table of content script (#1600)

* Update INSTALLATION.md

* chore(deps): bump @types/i18n from 0.13.8 to 0.13.10 (#1616)

Bumps [@types/i18n](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/i18n) from 0.13.8 to 0.13.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/i18n)

---
updated-dependencies:
- dependency-name: "@types/i18n"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Removed depricated xss-clean package (#1536)

Signed-off-by: Akhilender <[email protected]>

* updated node version

* fix falling test

* fix

* Added script to generate table of content (#1587)

* Added script to generate table of content

* git hook to generate toc when markdown files are changed.

* script for toc

* fix: Removed depricated xss-clean package (#1536)

Signed-off-by: Akhilender <[email protected]>

* Added script to generate table of content (#1587)

* Added script to generate table of content

* git hook to generate toc when markdown files are changed.

* script for toc

* table of content script (#1600)

* Update INSTALLATION.md

* chore(deps): bump @types/i18n from 0.13.8 to 0.13.10 (#1616)

Bumps [@types/i18n](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/i18n) from 0.13.8 to 0.13.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/i18n)

---
updated-dependencies:
- dependency-name: "@types/i18n"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Removed depricated xss-clean package (#1536)

Signed-off-by: Akhilender <[email protected]>

* updated node version

* removed comments

* fix

* fix

* fix

* fix

* fix

* fix

* added userRegistrationRequired field in schema

* fix redis port

* updated node version

* fix falling test

* removed private org

* fix redis port

* Revert "restored countline.py functionality to our github action flow (#1568)" (#1572)

This reverts commit 195d148.

* restored countline.py functionality to our github action flow (#1573)

* setup script will now ask for superAdmin email

* asked changes

* Update setup.ts

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* new commit

* Added script to generate table of content (#1587)

* Added script to generate table of content

* git hook to generate toc when markdown files are changed.

* script for toc

* Revert "Added script to generate table of content (#1587)" (#1592)

This reverts commit 74a9f67.

* table of content script (#1600)

* Update INSTALLATION.md

* chore(deps): bump @types/i18n from 0.13.8 to 0.13.10 (#1616)

Bumps [@types/i18n](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/i18n) from 0.13.8 to 0.13.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/i18n)

---
updated-dependencies:
- dependency-name: "@types/i18n"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Removed depricated xss-clean package (#1536)

Signed-off-by: Akhilender <[email protected]>

* updated node version

* fix falling test

* fix

* Added script to generate table of content (#1587)

* Added script to generate table of content

* git hook to generate toc when markdown files are changed.

* script for toc

* fix: Removed depricated xss-clean package (#1536)

Signed-off-by: Akhilender <[email protected]>

* Added script to generate table of content (#1587)

* Added script to generate table of content

* git hook to generate toc when markdown files are changed.

* script for toc

* table of content script (#1600)

* Update INSTALLATION.md

* chore(deps): bump @types/i18n from 0.13.8 to 0.13.10 (#1616)

Bumps [@types/i18n](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/i18n) from 0.13.8 to 0.13.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/i18n)

---
updated-dependencies:
- dependency-name: "@types/i18n"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Removed depricated xss-clean package (#1536)

Signed-off-by: Akhilender <[email protected]>

* updated node version

* fix

* fix

* fix

* fix

* fix

* fix

* added userRegistrationRequired field in schema

* fix redis port

* fix version

* fix script

* fix

* fix readme

* fix failing test

* made the requested changes

* fix test

* fix version

fix script

fix

Create weekly event recurring instance (#1602)

* Create weekly event recurring instance

* test for weekly recurring events

* Weekly Recurring Events bug fixes

Revert "Create weekly event recurring instance (#1602)" (#1649)

This reverts commit e7c043d.

Lint only updated files with stricter linting (#1635)

* Replace package vm2 with isolated-vm (#1532)

* Replace package vm2 with isolated-vm

* Removed package isolated-vm

* init: lint-staged for linting staged files only

* feat: convert warn to error in eslintrc

* fix: failing tests

* fix: package.json

* fix: package-lock

---------

Co-authored-by: Sarthak Patel <[email protected]>

Revert "Lint only updated files with stricter linting (#1635)" (#1652)

This reverts commit 269b8bd.

fix readme

fix failing test

made the requested changes

fix test

* made the requested changes

* added test

* fix failing test'

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Akhilender <[email protected]>
Co-authored-by: Peter Harrison <[email protected]>
Co-authored-by: Aditya Rai <[email protected]>
Co-authored-by: Balveer Singh Rao <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Akhilender Bongirwar <[email protected]>
Co-authored-by: Sarthak Patel <[email protected]>
Co-authored-by: Anubhav Banerjee <[email protected]>
Co-authored-by: IntelloManiac <[email protected]>

* Github Action to Deploy Talawa-API to GoDaddy VPS (#1491)

* Added deploy.yml

* Added action to run when push on deploy branch too

* refactor: changed push to all branches

* test: ec2 ci/cd pipeline test1

* test: ec2 ci/cd pipeline test2

* refactor: Added Port to deploy.yml

* test: ec2 ci/cd pipeline test3

* test: ec2 ci/cd pipeline test4

* test: ec2 ci/cd pipeline test5

* refactor: typo in cd command

* refactor: added command to delete repo after docker compose

* refactor: added sudo to required commands

* refactor: Simplifed the script in deploy.yml

* refactor: removed timeout issue

* refactor: Optimized the Build process of Docker Compose

* refactor : Added Password field to Action

* refactor: removed sudo from commands

* refactor : removed the password field as it was not needed

* refactor: Added main branch for on push in github-action

* refactor: always run code from develop

* refactor: Added API_DEMO Suffix to env variables and testing for talawa-api user

* refactor: removed the triger for push on deployement branch

* Added MongoDB Reset Script

* refactor: Fixed Bug in Setup.ts related MongoDB url env variable

* Added SSL Certs renew script

* docs: Added docs to setup cloud instance for future refrence

* refactor: import sample data after dropping the database in reset_mongo.sh

* refactor: Changed File Structure as needed

* fixed conflict in setup.ts

* reverted all changes in setup.ts

* refactor: Added detailed comments in scripts

* refactor: removed perm check from each script as dedicateted script checks for it

* refactor: fixed cert_renew.sh

* docs: Completed the Cloud API Demo Readme

* docs: added solution to cors error

* refactor: removed deployment branch from deploy.yml

* Test file for createPlugin.ts (#1646)

* Improved code coverage

* Revert "Improved code coverage"

This reverts commit 1ac5f89.

* Tests for createPlugin.ts file

* Auto Detect MongoDB URL during setup, Fixes #1605 (#1678)

* refactor: Improved MongoDB configuration during setup

* refactor: Checks for existing url in .env

* Feature: Audit trail fields in Schema (#1542)

* fixed failing tests for model changes

* Event, EventProject, File, Feedback model updated

* Update model and updatedBy resolver for organization

* Add resolvers for Post, Task, Event, EventProject, Organization

* replace creator with createdBy

* fix failing tests

* fix failing tests

* removed updatedBy field from schema

* replaced createdBy with creatorId

* creatorId in database field and creator in graphql schema

* fixed non-nullable fields mismatch in graphql schema and database

* creatorId required: true in models

* fix failing tests

* fix failing deleteAdvertisementById test

* creator as nullable, timestamps non-nullable, visibleInSearch non-nullable

* creatorId required in database schema

* changes in graphql types

* endDate of event as non-nullable

* removed isPublic from Organization

---------

Co-authored-by: Lakshya Satpal <[email protected]>

* Update .gitignore

* Update .gitignore

* Update .gitignore

* Update push.yml

* Update documentation

* Update push.yml

* Update documentation

* Update push.yml

* Update documentation

* Feature Request: Add update Advertisement feature (#1575)

* add : adding mutations, inputs and resolvers for editing advertisements

* add: test for update advertisement

* fix : consolidate input and update tests

* fix test: getAdvertisement

* fix: input name

* fix: variable name, add : advertisement helper

* fix: scalars, validation, test

* fix : scalars and tests

* fix: type field of Advertisement

* fix: resolver, add: tests

* merge fix

* fix: update payload and tests

* fix :tests

* fix: translate test case error

* fix: translate test case error

* fix: startDate test case failure

* add : role based auth

* merge

* fix: tests

* fix: role based auth && tests

* fix: downgraded to [email protected] (#1684)

- this is to fix `import:sample-data` script

* fix: Removed `organizationUserBelongsTo` field (#1683)

- Removed all organizationUserBelongsTo field from User Collection.
- As it is not being used in other applications except in MemberDetail.tsx in talawa admin where it is
  not being modified.

Signed-off-by: Akhilender <[email protected]>

* Renamed isPublic to userRegistrationRequired in sample-data and added import-sample-data generator github actions (#1686)

* fix: removes all unused containers and images after deploy.yaml workflow (#1687)

* Lint only updated files stricter linting and update the PR workflow (#1677)

* Replace package vm2 with isolated-vm (#1532)

* Replace package vm2 with isolated-vm

* Removed package isolated-vm

* init: lint-staged for linting staged files only

* feat: convert warn to error in eslintrc

* fix: failing tests

* fix: package.json

* fix: package-lock

* chore(deps): bump follow-redirects from 1.15.3 to 1.15.4 (#1668)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.3...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: workflow job runs for changed files in the pushed commit only

* fix: resolve conflict with upstream/develop

* fix:package-lock

* fix: attemp#2 merge conflict

* fix: merge conflict #3

* fix: npm script instead of npx, filter git diff command

* fix: package.json conflict

* fix: remove vite

* resolve merge conflict

* attempt #2 fix conflict

* update package-lock

* update package-lock

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Sarthak Patel <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump rimraf from 3.0.2 to 5.0.5 (#1688)

Bumps [rimraf](https://github.com/isaacs/rimraf) from 3.0.2 to 5.0.5.
- [Changelog](https://github.com/isaacs/rimraf/blob/main/CHANGELOG.md)
- [Commits](isaacs/rimraf@v3.0.2...v5.0.5)

---
updated-dependencies:
- dependency-name: rimraf
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump @types/shortid from 0.0.29 to 0.0.32 (#1692)

Bumps [@types/shortid](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/shortid) from 0.0.29 to 0.0.32.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/shortid)

---
updated-dependencies:
- dependency-name: "@types/shortid"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* updated pull_request.yml

* updated pull_request.yml

* removed success message step

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Akhilender <[email protected]>
Co-authored-by: Sarthak Patel <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: ANKIT VARSHNEY <[email protected]>
Co-authored-by: Peter Harrison <[email protected]>
Co-authored-by: Aditya Rai <[email protected]>
Co-authored-by: Balveer Singh Rao <[email protected]>
Co-authored-by: Akhilender Bongirwar <[email protected]>
Co-authored-by: Anubhav Banerjee <[email protected]>
Co-authored-by: IntelloManiac <[email protected]>
Co-authored-by: Vasu Jain <[email protected]>
Co-authored-by: Priyanshu Bartwal <[email protected]>
Co-authored-by: Lakshya Satpal <[email protected]>
Co-authored-by: TASNEEM KOUSHAR <[email protected]>
Co-authored-by: Vaishali Thakur <[email protected]>
Co-authored-by: Chaitanya Shahare <[email protected]>
Co-authored-by: Alok Gupta <[email protected]>
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.

Cloud Based API Instance for Developers
3 participants