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.

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

Update cryptography to fixed 43.0.0 version #1562

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions cfy_manager/tests/test_certificates.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def _mock_small_cert_size():
In tests, we don't need to create large certs. Making the size small
makes these tests faster by an order of magnitude.
"""
with mock.patch('cfy_manager.utils.certificates.CERT_SIZE', 512):
with mock.patch('cfy_manager.utils.certificates.CERT_SIZE', 1024):
yield


Expand Down Expand Up @@ -77,7 +77,7 @@ def ca_cert(tmpdir):

key = rsa.generate_private_key(
public_exponent=65537,
key_size=512, # no need for a big key in tests
key_size=1024, # cryptography 42.0.3/changelog/3.3
)
key_password = 'key_password1'

Expand Down Expand Up @@ -289,7 +289,7 @@ def test_remove_key_encryption(tmpdir, ca_cert):

key = rsa.generate_private_key(
public_exponent=65537,
key_size=512,
key_size=1024,
)
with open(source_key, 'wb') as key_file:
key_pem = key.private_bytes(
Expand Down
6 changes: 3 additions & 3 deletions jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@ pipeline {
source .venv/bin/activate
cfy profile use ${env.MANAGER_IP} -u ${env.MANAGER_USERNAME} -p ${env.MANAGER_PASSWORD} -t ${env.MANAGER_TENANT} --ssl
pushd 'bp'
cfy install -b ec2-manager-install-blueprint-${env.BRANCH_NAME}-${env.BUILD_NUMBER} ec2-manager-install-blueprint.yaml
cfy install -b ec2-manager-install-blueprint-${env.BUILD_NUMBER} ec2-manager-install-blueprint.yaml
popd
cfy deployments capabilities ec2-manager-install-blueprint-${env.BRANCH_NAME}-${env.BUILD_NUMBER} --json > capabilities.json
cfy deployments capabilities ec2-manager-install-blueprint-${env.BUILD_NUMBER} --json > capabilities.json
jq -r '.key_content.value' capabilities.json > ~/.ssh/ec2_ssh_key && chmod 600 ~/.ssh/ec2_ssh_key
sleep 160
ssh-keyscan -H \$(jq -r '.endpoint.value' capabilities.json) >> ~/.ssh/known_hosts
Expand Down Expand Up @@ -372,7 +372,7 @@ sudo /home/centos/${env.PROJECT}/jenkins/validate_status.sh "${env.CONTAINER_NAM
echo 'Uninstall and delete blueprint from manager'
sh """#!/bin/bash
source .venv/bin/activate
cfy uninstall ec2-manager-install-blueprint-${env.BRANCH_NAME}-${env.BUILD_NUMBER} --force --allow-custom-parameters -p ignore_failures=true
cfy uninstall ec2-manager-install-blueprint-${env.BUILD_NUMBER} --force --allow-custom-parameters -p ignore_failures=true
"""
}
}
Expand Down
2 changes: 1 addition & 1 deletion jenkins/bp/ec2-manager-install-blueprint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
description: >
This blueprint deploy EC2 for cloudify-manager-install
imports:
- http://cloudify.co/spec/cloudify/6.3.0/types.yaml
- cloudify/types/types.yaml
- plugin:cloudify-aws-plugin?version= >=3.0.3
- plugin:cloudify-utilities-plugin?version= >=1.22.1

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def package_files(directory):
'psutil==5.7.2',
'requests>=2.32.0,<3.0.0',
'retrying==1.3.3',
'cryptography',
'cryptography==43.0.0',
'distro', # replacing deprecated platform.linux_distribution
# supervisor is not used in this package directly, but it is
# installed here to provide the `supervisord` executable
Expand Down