Merge pull request #4523 from communitybridge/unicron-4519

4519: Fix edge case - when there are no corporate contributors

Author: mlehotskylf

.github/workflows/build-pr.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.8'
           cache: 'pip'
       - name: Cache Go modules
         uses: actions/cache@v2
@@ -103,4 +103,4 @@ jobs:
 
       - name: Go Lint
         working-directory: cla-backend-go
-        run: make lint
+        run: make lint

.github/workflows/deploy-dev.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.8'
           cache: 'pip'
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4

.github/workflows/deploy-prod.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.8'
           cache: 'pip'
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4

.github/workflows/deploy-staging.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.8'
           cache: 'pip'
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4

cla-backend-go/signatures/repository.go

@@ -4704,6 +4704,9 @@ func (repo repository) GetClaGroupCorporateContributors(ctx context.Context, cla
 	}
 
 	out := &models.CorporateContributorList{List: make([]*models.CorporateContributor, 0)}
+	if totalCount == 0 {
+		return out, nil
+	}
 	var lastEvaluatedKey string
 
 	currentCount := int64(0)

cla-backend/requirements.txt

@@ -60,4 +60,3 @@ Werkzeug==0.15.5
 wrapt==1.11.2
 zipp==3.15.0
 markupsafe==2.0.1
-setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability

utils/cla_group_corporate_contributors.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+# API_URL=https://[xyz].ngrok-free.app (defaults to localhost:5000)
+# cla_group='01af041c-fa69-4052-a23c-fb8c1d3bef24'
+# company_id='1dd8c59d-24cd-4155-9c6f-d4ac15ad5857'
+# TOKEN='...' - Auth0 JWT bearer token
+# XACL='...' - X-ACL
+# DEBUG=1 ./utils/cla_group_corporate_contributors.sh 01af041c-fa69-4052-a23c-fb8c1d3bef24 1dd8c59d-24cd-4155-9c6f-d4ac15ad5857
+
+if [ -z "$TOKEN" ]
+then
+  # source ./auth0_token.secret
+  TOKEN="$(cat ./auth0.token.secret)"
+fi
+
+if [ -z "$TOKEN" ]
+then
+  echo "$0: TOKEN not specified and unable to obtain one"
+  exit 1
+fi
+
+if [ -z "$XACL" ]
+then
+  XACL="$(cat ./x-acl.secret)"
+fi
+
+if [ -z "$XACL" ]
+then
+  echo "$0: XACL not specified and unable to obtain one"
+  exit 2
+fi
+
+if [ -z "$1" ]
+then
+  echo "$0: you need to specify cla_group UUID as a 1st parameter, example: '01af041c-fa69-4052-a23c-fb8c1d3bef24'"
+  exit 3
+fi
+export cla_group="$1"
+
+if [ -z "$2" ]
+then
+  echo "$0: you need to specify company_id as a 2nd parameter, example: '1dd8c59d-24cd-4155-9c6f-d4ac15ad5857'"
+  exit 4
+fi
+export company_id="$2"
+
+if [ -z "$3" ]
+then
+  echo "$0: assuming page_size 9999, you can specify page size as a 3rd argument"
+  export page_size="9999"
+else
+  export page_size="$3"
+fi
+
+if [ -z "$API_URL" ]
+then
+  export API_URL="http://localhost:5000"
+fi
+
+if [ ! -z "$DEBUG" ]
+then
+  echo "curl -s -XGET -H 'X-ACL: ${XACL}' -H 'Authorization: Bearer ${TOKEN}' -H 'Content-Type: application/json' '${API_URL}/v4/cla-services/cla-group/${cla_group}/corporate-contributors?companyID=${company_id}&pageSize=${page_size}'"
+fi
+curl -s -XGET -H "X-ACL: ${XACL}" -H "Authorization: Bearer ${TOKEN}" -H "Content-Type: application/json" "${API_URL}/v4/cla-group/${cla_group}/corporate-contributors?companyID=${company_id}&pageSize=${page_size}"

utils/company_project_contributors.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+# API_URL=https://[xyz].ngrok-free.app (defaults to localhost:5000)
+# company_id='1dd8c59d-24cd-4155-9c6f-d4ac15ad5857'
+# project_sfid='a09P000000DsCE5IAN'
+# TOKEN='...' - Auth0 JWT bearer token
+# XACL='...' - X-ACL
+# DEBUG=1 ./utils/company_project_contributors.sh 1dd8c59d-24cd-4155-9c6f-d4ac15ad5857 a09P000000DsCE5IAN
+
+if [ -z "$TOKEN" ]
+then
+  # source ./auth0_token.secret
+  TOKEN="$(cat ./auth0.token.secret)"
+fi
+
+if [ -z "$TOKEN" ]
+then
+  echo "$0: TOKEN not specified and unable to obtain one"
+  exit 1
+fi
+
+if [ -z "$XACL" ]
+then
+  XACL="$(cat ./x-acl.secret)"
+fi
+
+if [ -z "$XACL" ]
+then
+  echo "$0: XACL not specified and unable to obtain one"
+  exit 2
+fi
+
+if [ -z "$1" ]
+then
+  echo "$0: you need to specify company_id as a 1st parameter, example: '1dd8c59d-24cd-4155-9c6f-d4ac15ad5857'"
+  exit 3
+fi
+export company_id="$1"
+
+if [ -z "$2" ]
+then
+  echo "$0: you need to specify project_sfid as a 2nd parameter, example: 'a09P000000DsCE5IAN'"
+  exit 4
+fi
+export project_sfid="$2"
+
+
+if [ -z "$API_URL" ]
+then
+  export API_URL="http://localhost:5000"
+fi
+
+if [ ! -z "$DEBUG" ]
+then
+  echo "curl -s -XGET -H 'X-ACL: ${XACL}' -H 'Authorization: Bearer ${TOKEN}' -H 'Content-Type: application/json' '${API_URL}/v4/company/${company_id}/project/${project_sfid}/contributors'"
+fi
+curl -s -XGET -H "X-ACL: ${XACL}" -H "Authorization: Bearer ${TOKEN}" -H "Content-Type: application/json" "${API_URL}/v4/company/${company_id}/project/${project_sfid}/contributors"