Try to fix the deployment 32

Signed-off-by: Lukasz Gryglicki <[email protected]>

Author: lukaszgryglicki

.github/workflows/deploy-dev.yml

@@ -73,7 +73,7 @@ jobs:
           python -m venv .venv
           source .venv/bin/activate
           pip install --upgrade pip
-          pip install python-jose
+          pip install python-jose pynamodb
           pip install -r requirements.txt
 
       - name: Python Lint
@@ -155,7 +155,6 @@ jobs:
           if [[ ! -f bin/gitlab-repository-check-lambda ]]; then echo "Missing bin/gitlab-repository-check-lambda binary file. Exiting..."; exit 1; fi
           if [[ ! -f serverless.yml ]]; then echo "Missing serverless.yml file. Exiting..."; exit 1; fi
           if [[ ! -f serverless-authorizer.yml ]]; then echo "Missing serverless-authorizer.yml file. Exiting..."; exit 1; fi
-          find bin/
           yarn sls deploy --force --stage ${STAGE} --region us-east-1 --verbose
 
       - name: EasyCLA v1 Service Check
@@ -199,7 +198,6 @@ jobs:
           if [[ ! -f bin/user-subscribe-lambda ]]; then echo "Missing bin/user-subscribe-lambda binary file. Exiting..."; exit 1; fi
           rm -rf ./node_modules/
           yarn install
-          find bin/
           yarn sls deploy --force --stage ${STAGE} --region us-east-2 --verbose
 
       - name: EasyCLA v2 Service Check

cla-backend/cla/models/dynamo_models.py

@@ -939,7 +939,7 @@ class DocumentModel(MapAttribute):
     document_preamble = UnicodeAttribute(null=True)
     document_legal_entity_name = UnicodeAttribute(null=True)
     document_s3_url = UnicodeAttribute(null=True)
-    document_tabs = ListAttribute(of=DocumentTabModel, default=[])
+    document_tabs = ListAttribute(of=DocumentTabModel)
 
 
 class Document(model_interfaces.Document):
@@ -1142,9 +1142,9 @@ class Meta:
     project_external_id = UnicodeAttribute()
     project_name = UnicodeAttribute()
     project_name_lower = UnicodeAttribute(null=True)
-    project_individual_documents = ListAttribute(of=DocumentModel, default=[])
-    project_corporate_documents = ListAttribute(of=DocumentModel, default=[])
-    project_member_documents = ListAttribute(of=DocumentModel, default=[])
+    project_individual_documents = ListAttribute(of=DocumentModel)
+    project_corporate_documents = ListAttribute(of=DocumentModel)
+    project_member_documents = ListAttribute(of=DocumentModel)
     project_icla_enabled = BooleanAttribute(default=True)
     project_ccla_enabled = BooleanAttribute(default=True)
     project_ccla_requires_icla_signature = BooleanAttribute(default=False)
@@ -1158,7 +1158,7 @@ class Meta:
     project_name_lower_search_index = ProjectNameLowerIndex()
     foundation_sfid_project_name_index = ProjectFoundationIDIndex()
 
-    project_acl = UnicodeSetAttribute(default=set())
+    project_acl = UnicodeSetAttribute(default=set)
     # Default is v1 for all of our models - override for this model so that we can redirect to new UI when ready
     # version = UnicodeAttribute(default="v2")  # Schema version is v2 for Project Models
 
@@ -1567,7 +1567,7 @@ class Meta:
     user_id = UnicodeAttribute(hash_key=True)
     # User Emails are specifically GitHub Emails
     user_external_id = UnicodeAttribute(null=True)
-    user_emails = UnicodeSetAttribute(default=set())
+    user_emails = UnicodeSetAttribute(default=set)
     user_name = UnicodeAttribute(null=True)
     user_company_id = UnicodeAttribute(null=True)
     user_github_id = NumberAttribute(null=True)
@@ -3491,7 +3491,7 @@ class Meta:
     company_name_index = CompanyNameIndex()
     signing_entity_name_index = SigningEntityNameIndex()
     company_external_id_index = ExternalCompanyIndex()
-    company_acl = UnicodeSetAttribute(default=set())
+    company_acl = UnicodeSetAttribute(default=set)
     note = UnicodeAttribute(null=True)
 
 
@@ -4562,7 +4562,7 @@ class Meta:
             host = "http://localhost:8000"
 
     username = UnicodeAttribute(hash_key=True)
-    projects = UnicodeSetAttribute(default=set())
+    projects = UnicodeSetAttribute(default=set)
 
 
 class UserPermissions(model_interfaces.UserPermissions):  # pylint: disable=too-many-public-methods
@@ -5262,7 +5262,7 @@ class Meta:
     project_id = UnicodeAttribute(null=True)
     project_name = UnicodeAttribute(null=True)
     request_status = UnicodeAttribute(null=True)
-    user_emails = UnicodeSetAttribute(default=set())
+    user_emails = UnicodeSetAttribute(default=set)
     user_id = UnicodeAttribute(null=True)
     user_github_id = UnicodeAttribute(null=True)
     user_github_username = UnicodeAttribute(null=True)

cla-backend/requirements.txt

@@ -37,7 +37,7 @@ pydocusign==2.2
 PyGithub==1.55
 PyJWT==2.7.0
 pylint==2.11.1
-pynamodb==4.4.0
+## pynamodb==4.4.0
 pyparsing==2.4.5
 pytest==5.0.1
 pytest-clarity==0.3.0a0

utils/health_python_v2.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# API_URL=https://[xyz].ngrok-free.app (defaults to localhost:5000)
+if [ -z "$API_URL" ]
+then
+  export API_URL="http://localhost:5000"
+fi
+curl -s --fail -XGET "${API_URL}/v2/health"
+r=$?
+if [[ ${r} -eq 0 ]]
+then
+  echo "Successful response"
+else
+  echo "Failed to get a successful response"
+  exit ${r}
+fi

utils/health_v2.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# API_URL=https://[xyz].ngrok-free.app (defaults to localhost:5000)
+if [ -z "$API_URL" ]
+then
+  export API_URL="http://localhost:5000"
+fi
+curl -s --fail -XGET "${API_URL}/v3/ops/health"
+r=$?
+if [[ ${r} -eq 0 ]]
+then
+  echo "Successful response"
+else
+  echo "Failed to get a successful response"
+  exit ${r}
+fi

utils/health_v3.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# API_URL=https://[xyz].ngrok-free.app (defaults to localhost:5000)
+if [ -z "$API_URL" ]
+then
+  export API_URL="http://localhost:5000"
+fi
+curl -s --fail -XGET "${API_URL}/v4/ops/health"
+r=$?
+if [[ ${r} -eq 0 ]]
+then
+  echo "Successful response"
+else
+  echo "Failed to get a successful response"
+  exit ${r}
+fi