Merge pull request #4788 from linuxfoundation/dev

Sync `main` with `dev`.

Author: lukaszgryglicki

.github/workflows/deploy-dev.yml

@@ -164,7 +164,7 @@ jobs:
           echo "Validating v2 backend using endpoint: ${v2_url}"
           curl --fail -XGET ${v2_url}
           exit_code=$?
-          if [[ ${exit_coe} -eq 0 ]]; then
+          if [[ ${exit_code} -eq 0 ]]; then
             echo "Successful response from endpoint: ${v2_url}"
           else
             echo "Failed to get a successful response from endpoint: ${v2_url}"
@@ -174,7 +174,7 @@ jobs:
           echo "Validating v3 backend using endpoint: ${v3_url}"
           curl --fail -XGET ${v3_url}
           exit_code=$?
-          if [[ ${exit_coe} -eq 0 ]]; then
+          if [[ ${exit_code} -eq 0 ]]; then
             echo "Successful response from endpoint: ${v3_url}"
             # JSON response should include "Status": "healthy"
             if [[ `curl -s -XGET ${v3_url} | jq -r '.Status'` == "healthy" ]]; then
@@ -207,7 +207,7 @@ jobs:
           echo "Validating v4 backend using endpoint: ${v4_url}"
           curl --fail -XGET ${v4_url}
           exit_code=$?
-          if [[ ${exit_coe} -eq 0 ]]; then
+          if [[ ${exit_code} -eq 0 ]]; then
             echo "Successful response from endpoint: ${v4_url}"
             # JSON response should include "Status": "healthy"
             if [[ `curl -s -XGET ${v4_url} | jq -r '.Status'` == "healthy" ]]; then

.github/workflows/deploy-prod.yml

@@ -130,7 +130,7 @@ jobs:
           echo "Validating v2 backend using endpoint: ${v2_url}"
           curl --fail -XGET ${v2_url}
           exit_code=$?
-          if [[ ${exit_coe} -eq 0 ]]; then
+          if [[ ${exit_code} -eq 0 ]]; then
             echo "Successful response from endpoint: ${v2_url}"
           else
             echo "Failed to get a successful response from endpoint: ${v2_url}"
@@ -140,7 +140,7 @@ jobs:
           echo "Validating v3 backend using endpoint: ${v3_url}"
           curl --fail -XGET ${v3_url}
           exit_code=$?
-          if [[ ${exit_coe} -eq 0 ]]; then
+          if [[ ${exit_code} -eq 0 ]]; then
             echo "Successful response from endpoint: ${v3_url}"
             # JSON response should include "Status": "healthy"
             if [[ `curl -s -XGET ${v3_url} | jq -r '.Status'` == "healthy" ]]; then
@@ -172,7 +172,7 @@ jobs:
           echo "Validating v4 backend using endpoint: ${v4_url}"
           curl --fail -XGET ${v4_url}
           exit_code=$?
-          if [[ ${exit_coe} -eq 0 ]]; then
+          if [[ ${exit_code} -eq 0 ]]; then
             echo "Successful response from endpoint: ${v4_url}"
             # JSON response should include "Status": "healthy"
             if [[ `curl -s -XGET ${v4_url} | jq -r '.Status'` == "healthy" ]]; then

.gitignore

@@ -258,3 +258,4 @@ cover.out
 src.txt
 src.txt.*
 out.json
+body.json

BOT_ALLOWLIST.md

@@ -146,6 +146,7 @@ To add first `skip_cla` value for an organization:
 ```
 aws --profile lfproduct-prod --region us-east-1 dynamodb update-item --table-name "cla-prod-github-orgs" --key '{"organization_name": {"S": "open-telemetry"}}' --update-expression 'SET skip_cla = :val' --expression-attribute-values '{":val": {"M": {"otel-arrow":{"S":";re:^\\d+\\+Copilot@users\\.noreply\\.github\\.com$;copilot-swe-agent[bot]"}}}}'
 aws --profile lfproduct-prod --region us-east-1 dynamodb update-item --table-name "cla-prod-github-orgs" --key '{"organization_name": {"S": "openfga"}}' --update-expression 'SET skip_cla = :val' --expression-attribute-values '{":val": {"M": {"vscode-ext":{"S":";re:^\\d+\\+Copilot@users\\.noreply\\.github\\.com$;copilot-swe-agent[bot]"}}}}'
+aws --profile lfproduct-prod --region us-east-1 dynamodb update-item --table-name "cla-prod-github-orgs" --key '{"organization_name": {"S": "eslint"}}' --update-expression 'SET skip_cla = :val' --expression-attribute-values '{":val": {"M": {"*":{"S":"[Copilot;re:^\\d+\\+Copilot@users\\.noreply\\.github\\.com$;copilot-swe-agent[bot]||;re:^\\d+\\+Copilot@users\\.noreply\\.github\\.com$;copilot-swe-agent[bot]||Copilot;re:^\\d+\\+copilot@users\\.noreply\\.github\\.com$;Copilot]"}}}}'
 ```
 
 To add additional repositories entries without overwriting the existing `skip_cla` value:

cla-backend-go/swagger/cla.v2.yaml

@@ -351,6 +351,7 @@ paths:
         - $ref: "#/parameters/x-email"
         - name: claGroupInput
           in: body
+          required: true
           schema:
             $ref: '#/definitions/create-cla-group-input'
       responses:
@@ -2663,6 +2664,7 @@ paths:
         - $ref: "#/parameters/path-userID"
         - name: body
           in: body
+          required: true
           schema:
             type: object
             required:
@@ -2829,6 +2831,7 @@ paths:
         - $ref: "#/parameters/path-companyID"
         - $ref: "#/parameters/path-projectSFID"
         - name: body
+          required: true
           in: body
           schema:
             type: object
@@ -2998,6 +3001,7 @@ paths:
         - $ref: "#/parameters/path-companyID"
         - name: body
           in: body
+          required: true
           schema:
             type: object
             x-nullable: false
@@ -3043,6 +3047,7 @@ paths:
         - $ref: "#/parameters/path-companyID"
         - name: body
           in: body
+          required: true
           schema:
             type: object
             x-nullable: false
@@ -4637,7 +4642,9 @@ parameters:
     description: the Salesforce ID of the Foundation
     in: query
     type: string
-    pattern: '^[a-zA-Z0-9]{18}|[a-zA-Z0-9]{15}$' # see: https://stackoverflow.com/questions/9742913/validating-a-salesforce-id
+    pattern: '^([0-9A-Za-z]{15}|[0-9A-Za-z]{18})$' # see: https://stackoverflow.com/questions/9742913/validating-a-salesforce-id
+    minLength: 15
+    maxLength: 18
   companyID:
     name: companyID
     description: The internal company ID representing signing entity name instance (EasyCLA)
@@ -4658,18 +4665,18 @@ parameters:
     in: path
     type: string
     required: true
-    pattern: '^[a-zA-Z0-9]{18}|[a-zA-Z0-9]{15}$' # see: https://stackoverflow.com/questions/9742913/validating-a-salesforce-id
-    minLength: 5
-    maxLength: 255
+    pattern: '^([0-9A-Za-z]{15}|[0-9A-Za-z]{18})$' # see: https://stackoverflow.com/questions/9742913/validating-a-salesforce-id
+    minLength: 15
+    maxLength: 18
   path-projectSFID:
     name: projectSFID
     description: the Salesforce ID of the project
     in: path
     type: string
     required: true
-    pattern: '^[a-zA-Z0-9]{18}|[a-zA-Z0-9]{15}$' # see: https://stackoverflow.com/questions/9742913/validating-a-salesforce-id
-    minLength: 5
-    maxLength: 255
+    pattern: '^([0-9A-Za-z]{15}|[0-9A-Za-z]{18})$' # see: https://stackoverflow.com/questions/9742913/validating-a-salesforce-id
+    minLength: 15
+    maxLength: 18
   path-userID:
     name: userID
     description: v1 EasyCLA user Admin ID
@@ -4699,7 +4706,9 @@ parameters:
     in: path
     type: string
     required: true
-    pattern: '^[a-zA-Z0-9]{18}|[a-zA-Z0-9]{15}$' # see: https://stackoverflow.com/questions/9742913/validating-a-salesforce-id
+    pattern: '^([0-9A-Za-z]{15}|[0-9A-Za-z]{18})$' # see: https://stackoverflow.com/questions/9742913/validating-a-salesforce-id
+    minLength: 15
+    maxLength: 18
   path-companyName:
     name: companyName
     description: the company name

cla-backend-go/swagger/common/properties/external-id.yaml

@@ -3,4 +3,6 @@
 
 type: string
 example: "00117000015vpjXAAQ"
-pattern: '^[a-zA-Z0-9]{18}|[a-zA-Z0-9]{15}$' # see: https://stackoverflow.com/questions/9742913/validating-a-salesforce-id
+pattern: '^([0-9A-Za-z]{15}|[0-9A-Za-z]{18})$' # see: https://stackoverflow.com/questions/9742913/validating-a-salesforce-id
+minLength: 15
+maxLength: 18

cla-backend-go/v2/cla_manager/service.go

@@ -1167,8 +1167,14 @@ func (s *service) NotifyCLAManagers(ctx context.Context, notifyCLAManagers *mode
 	// Search for Easy CLA User
 	log.WithFields(f).Debugf("Getting user by ID: %s", notifyCLAManagers.UserID)
 	userModel, userErr := s.easyCLAUserService.GetUser(notifyCLAManagers.UserID)
+	// log.WithFields(f).Debugf("Got user by ID: %s -> (%+v, %+v)", notifyCLAManagers.UserID, userModel, userErr)
 	if userErr != nil {
-		msg := fmt.Sprintf("Problem getting user by ID: %s ", notifyCLAManagers.UserID)
+		msg := fmt.Sprintf("Problem getting user by ID: %s: %v", notifyCLAManagers.UserID, userErr)
+		log.WithFields(f).Warn(msg)
+		return ErrCLAUserNotFound
+	}
+	if userModel == nil {
+		msg := fmt.Sprintf("Problem getting user by ID: %s", notifyCLAManagers.UserID)
 		log.WithFields(f).Warn(msg)
 		return ErrCLAUserNotFound
 	}

cla-backend-go/v2/signatures/service.go

@@ -381,6 +381,10 @@ func (s *Service) InvalidateICLA(ctx context.Context, claGroupID string, userID
 		log.WithFields(f).Debug("unable to get user record")
 		return userErr
 	}
+	if user == nil {
+		log.WithFields(f).Debug("unable to get user record")
+		return fmt.Errorf("user not found for userID: %s", userID)
+	}
 
 	log.WithFields(f).Debug("invalidating signature record ...")
 	note := fmt.Sprintf("Signature invalidated (approved set to false) by %s for %s ", authUser.UserName, utils.GetBestUsername(user))

cla-backend/requirements.txt

@@ -56,3 +56,4 @@ wrapt==1.17.2
 astroid==3.3.8
 pluggy==1.5.0
 gunicorn==22.0.0
+PyNaCl==1.5.0

tests/functional/README.md

@@ -90,6 +90,10 @@ You can ask for example `.env` file over slack.
 - Run `npx cypress install`
 - Run tests using cmd `npx cypress run`. Or `xvfb-run -a npx cypress run` when runnign over SSH.
 - Run tests using UI `npx cypress open`. Choose **E2E testing**, select **Chrome** browser.
+- Run single E2E spec file: `` [ALLOW_FAIL=1] ./utils/run-single-test.sh github-repositories ``.
+- Run single test from E2E spec file: `` [ALLOW_FAIL=1] ./utils/run-single-test.sh github-repositories 'test name regexp' ``.
+- Additional options include: `TOKEN=xxxx`, `XACL=xxxx`, `DEBUG=1`, `LOCAL=1`, `ALL=1`.
+- To format E2E tests: `` npx prettier --write cypress/e2e/* ``.
 - View test reports in the `cypress-report` directory.
 - Explore source code files for detailed implementation.