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.

Sign up for GitHub

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

Bump serverless from 3.32.2 to 3.33.0 in /cla-backend-go #4003

Closed
wants to merge 7 commits into from
Closed

Bump serverless from 3.32.2 to 3.33.0 in /cla-backend-go #4003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6f93cbb
Bump serverless from 3.32.2 to 3.33.0 in /cla-backend
dependabot[bot] Jul 3, 2023
3480e3e
[#4002] upgrade docusign library
umeshlumbhani247 Jul 4, 2023
69b411e
[#3846] Feature/Merge Group Gating
nickmango Jul 4, 2023
a720891
Merge pull request #4008 from nickmango/feature/merge-group-event
nickmango Jul 4, 2023
b75d608
Merge pull request #4007 from communitybridge/feature/upgrade_docusign
nickmango Jul 4, 2023
63f236f
Merge pull request #4004 from communitybridge/dependabot/npm_and_yarn…
nickmango Jul 5, 2023
73c011f
Bump serverless from 3.32.2 to 3.33.0 in /cla-backend-go
dependabot[bot] Jul 5, 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
79 changes: 39 additions & 40 deletions cla-backend-go/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cla-backend-go/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"dependencies": {
"install": "^0.13.0",
"node.extend": "^2.0.2",
"serverless": "^3.32.2",
"serverless": "^3.33.0",
"serverless-finch": "^4.0.3",
"serverless-layers": "^2.6.1",
"serverless-plugin-tracing": "^2.0.0",
Expand Down
34 changes: 17 additions & 17 deletions cla-backend-go/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ available-typed-arrays@^1.0.5:
version "1.0.5"
resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"

aws-sdk@^2.1329.0, aws-sdk@^2.1389.0:
aws-sdk@^2.1329.0, aws-sdk@^2.1404.0:
version "2.1386.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1386.0.tgz#6005b33d6c8e9769268d899b3640695e88ce36fd"
dependencies:
Expand Down Expand Up @@ -793,9 +793,9 @@ d@1, d@^1.0.1:
es5-ext "^0.10.50"
type "^1.0.1"

dayjs@^1.11.7:
version "1.11.7"
resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"
dayjs@^1.11.8:
version "1.11.9"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.9.tgz#9ca491933fadd0a60a2c19f6c237c03517d71d1a"

debug@4, debug@^4.1.1, debug@^4.3.4:
version "4.3.4"
Expand Down Expand Up @@ -901,9 +901,9 @@ dotenv-expand@^10.0.0:
version "10.0.0"
resolved "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz"

dotenv@^16.1.3:
version "16.1.3"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.1.3.tgz#0c67e90d0ddb48d08c570888f709b41844928210"
dotenv@^16.3.1:
version "16.3.1"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"

duration@^0.2.2:
version "0.2.2"
Expand Down Expand Up @@ -2321,9 +2321,9 @@ semver@^6.0.0:
version "6.3.0"
resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"

semver@^7.3.2, semver@^7.3.5, semver@^7.3.8, semver@^7.5.1:
version "7.5.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
semver@^7.3.2, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3:
version "7.5.3"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
dependencies:
lru-cache "^6.0.0"

Expand Down Expand Up @@ -2362,27 +2362,27 @@ serverless-prune-plugin@^2.0.2:
dependencies:
bluebird "^3.7.2"

serverless@^3.32.2:
version "3.32.2"
resolved "https://registry.yarnpkg.com/serverless/-/serverless-3.32.2.tgz#7d55a44eb2e08cbb8349b9c8c68b747ba4e4a462"
serverless@^3.33.0:
version "3.33.0"
resolved "https://registry.yarnpkg.com/serverless/-/serverless-3.33.0.tgz#7d4aacfacb5f122a24e8c6a8d2972cce99746c0c"
dependencies:
"@serverless/dashboard-plugin" "^6.2.3"
"@serverless/platform-client" "^4.3.2"
"@serverless/utils" "^6.11.1"
ajv "^8.12.0"
ajv-formats "^2.1.1"
archiver "^5.3.1"
aws-sdk "^2.1389.0"
aws-sdk "^2.1404.0"
bluebird "^3.7.2"
cachedir "^2.3.0"
chalk "^4.1.2"
child-process-ext "^2.1.1"
ci-info "^3.8.0"
cli-progress-footer "^2.3.2"
d "^1.0.1"
dayjs "^1.11.7"
dayjs "^1.11.8"
decompress "^4.2.1"
dotenv "^16.1.3"
dotenv "^16.3.1"
dotenv-expand "^10.0.0"
essentials "^1.2.0"
ext "^1.7.0"
Expand Down Expand Up @@ -2410,7 +2410,7 @@ serverless@^3.32.2:
process-utils "^4.0.0"
promise-queue "^2.2.5"
require-from-string "^2.0.2"
semver "^7.5.1"
semver "^7.5.3"
signal-exit "^3.0.7"
stream-buffers "^3.0.2"
strip-ansi "^6.0.1"
Expand Down
21 changes: 20 additions & 1 deletion cla-backend/cla/controllers/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,10 @@ def activity(action: str, event_type: str, body: dict):
elif event_type == "issue_comment":
cla.log.debug(f'{fn} - received issue_comment action: {action}...')
handle_pull_request_comment_event(action, body)

# Github Merge Group Event
elif event_type == 'merge_group':
handle_merge_group_event(action, body)

else:
cla.log.debug(f'{fn} - ignoring github activity event, action: {action}...')
Expand Down Expand Up @@ -350,7 +354,7 @@ def handle_pull_request_event(action: str, body: dict):
cla.log.debug(f'{func_name} - processing github pull_request activity callback...')

# New PR opened
if action == 'opened' or action == 'reopened' or action == 'synchronize' or action == 'enqueued':
if action == 'opened' or action == 'reopened' or action == 'synchronize':
cla.log.debug(f'{func_name} - processing github pull_request activity for action: {action}')
# Copied from repository_service.py
service = cla.utils.get_repository_service('github')
Expand All @@ -359,6 +363,20 @@ def handle_pull_request_event(action: str, body: dict):
else:
cla.log.debug(f'{func_name} - ignoring github pull_request activity for action: {action}')

def handle_merge_group_event(action: str, body: dict):
func_name = 'github.activity.handle_merge_group_event'
cla.log.debug(f'{func_name} - processing github merge_group activity callback...')

# Checks Requested action
if action == 'checks_requested':
cla.log.debug(f'{func_name} - processing github merge_group activity for action: {action}')
# Copied from repository_service.py
service = cla.utils.get_repository_service('github')
result = service.received_activity(body)
return result
else:
cla.log.debug(f'{func_name} - ignoring github merge_group activity for action: {action}')


def handle_pull_request_comment_event(action: str, body: dict):
func_name = 'github.activity.handle_pull_request_comment_event'
Expand Down Expand Up @@ -581,6 +599,7 @@ def notify_project_managers(repositories):
f' to managers: {recipients}'
f' for project {project} with '
f' repositories: {repositories}')



def unable_to_do_cla_check_email_content(project, managers, repositories):
Expand Down
Loading