Revert "Update platform for cryptography"

This reverts commit 2d86423.
communitybridge · Jul 28, 2023 · 15d60ca · 15d60ca
1 parent 2d86423
commit 15d60ca
Show file tree

Hide file tree

Showing 8 changed files with 170 additions and 278 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -51,7 +51,6 @@ jobs:
       - name: Python Setup
         working-directory: cla-backend
         run: |
-          pip install --platform manylinux_2_12_x86_64 --only-binary=:all: --target=/opt/hostedtoolcache/Python/3.7.17/x64/lib/python3.7/site-packages cryptography 
           pip install -r requirements.txt
 
       - name: Python Lint

diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -88,7 +88,6 @@ jobs:
       - name: Python Setup
         working-directory: cla-backend
         run: |
-          pip install --platform manylinux_2_12_x86_64 --only-binary=:all: --target=/opt/hostedtoolcache/Python/3.7.17/x64/lib/python3.7/site-packages cryptography 
           pip install -r requirements.txt
 
       - name: Python Lint

diff --git a/cla-backend-go/serverless.yml b/cla-backend-go/serverless.yml
@@ -233,8 +233,9 @@ provider:
     SF_USERNAME: ${file(./env.json):sf-username, ssm:/cla-sf-username-${opt:stage}}
     SF_PASSWORD: ${file(./env.json):sf-password, ssm:/cla-sf-password-${opt:stage}}
     DOCRAPTOR_API_KEY: ${file(./env.json):doc-raptor-api-key, ssm:/cla-doc-raptor-api-key-${opt:stage}}
-    DOCUSIGN_AUTH_SERVER: ${file(./env.json):docusign-auth-server, ssm:/cla-docusign-auth-server-${sls:stage}}
-    DOCUSIGN_USER_ID: ${file(./env.json):docusign-user-id, ssm:/cla-docusign-user-id-${sls:stage}}
+    DOCUSIGN_ROOT_URL: ${file(./env.json):docusign-root-url, ssm:/cla-docusign-root-url-${opt:stage}}
+    DOCUSIGN_USERNAME: ${file(./env.json):docusign-username, ssm:/cla-docusign-username-${opt:stage}}
+    DOCUSIGN_PASSWORD: ${file(./env.json):docusign-password, ssm:/cla-docusign-password-${opt:stage}}
     DOCUSIGN_INTEGRATOR_KEY: ${file(./env.json):docusign-integrator-key, ssm:/cla-docusign-integrator-key-${opt:stage}}
     CLA_API_BASE: ${file(./env.json):cla-api-base, ssm:/cla-api-base-${opt:stage}}
     CLA_CONTRIBUTOR_BASE: ${file(./env.json):cla-contributor-base, ssm:/cla-contributor-base-${opt:stage}}

diff --git a/cla-backend/Makefile b/cla-backend/Makefile
@@ -12,7 +12,6 @@ setup:
 .PHONY: setup_circle
 setup_circle:
 	npm install; \
-	sudo pip install --platform manylinux_2_12_x86_64 --only-binary=:all: --target=/opt/hostedtoolcache/Python/3.7.17/x64/lib/python3.7/site-packages cryptography; \
 	sudo pip install -r requirements.txt; \
 
 # username: LFID username

diff --git a/cla-backend/cla/models/docusign_models.py b/cla-backend/cla/models/docusign_models.py
diff --git a/cla-backend/cla/utils.py b/cla-backend/cla/utils.py
@@ -346,9 +346,7 @@ def get_signing_service(conf=None, initialize=True):
         raise Exception('Invalid signing service selected in configuration: %s' % signing_service)
     signing_service_instance = signing()
     if initialize:
-        resp = signing_service_instance.initialize(conf)
-        if resp != None:
-            raise Exception('docusign authentication error : %s' % resp["errors"])
+        signing_service_instance.initialize(conf)
     return signing_service_instance
 
 

diff --git a/cla-backend/requirements.txt b/cla-backend/requirements.txt
@@ -33,6 +33,7 @@ packaging==20.5
 pluggy==0.13.1
 py==1.10.0
 pyasn1==0.4.8
+pydocusign==2.2
 PyGithub==1.55
 PyJWT==2.7.0
 pylint==1.5.2
@@ -58,5 +59,4 @@ wcwidth==0.1.7
 Werkzeug==0.15.5
 wrapt==1.11.2
 zipp==3.15.0
-markupsafe==2.0.1
-docusign-esign==3.22.0
+markupsafe==2.0.1
diff --git a/cla-backend/serverless.yml b/cla-backend/serverless.yml
@@ -318,8 +318,9 @@ provider:
     SF_USERNAME: ${file(./env.json):sf-username, ssm:/cla-sf-username-${sls:stage}}
     SF_PASSWORD: ${file(./env.json):sf-password, ssm:/cla-sf-password-${sls:stage}}
     DOCRAPTOR_API_KEY: ${file(./env.json):doc-raptor-api-key, ssm:/cla-doc-raptor-api-key-${sls:stage}}
-    DOCUSIGN_AUTH_SERVER: ${file(./env.json):docusign-auth-server, ssm:/cla-docusign-auth-server-${sls:stage}}
-    DOCUSIGN_USER_ID: ${file(./env.json):docusign-user-id, ssm:/cla-docusign-user-id-${sls:stage}}
+    DOCUSIGN_ROOT_URL: ${file(./env.json):docusign-root-url, ssm:/cla-docusign-root-url-${sls:stage}}
+    DOCUSIGN_USERNAME: ${file(./env.json):docusign-username, ssm:/cla-docusign-username-${sls:stage}}
+    DOCUSIGN_PASSWORD: ${file(./env.json):docusign-password, ssm:/cla-docusign-password-${sls:stage}}
     DOCUSIGN_INTEGRATOR_KEY: ${file(./env.json):docusign-integrator-key, ssm:/cla-docusign-integrator-key-${sls:stage}}
     CLA_API_BASE: ${file(./env.json):cla-api-base, ssm:/cla-api-base-${sls:stage}}
     CLA_CONTRIBUTOR_BASE: ${file(./env.json):cla-contributor-base, ssm:/cla-contributor-base-${sls:stage}}