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

Jump to bottom

fix aliyun cloud typeerror #49650

Merged
merged 3 commits into from Sep 30, 2018
Merged

fix aliyun cloud typeerror #49650

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e4ae23
fix aliyun cloud typeerror
Yxnt Sep 14, 2018
1f227fc
use stringutils instead of hard code
Yxnt Sep 28, 2018
b18095e
Merge branch 'develop' into fix-aliyuncloud_TypeError
Yxnt Sep 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion salt/cloud/clouds/aliyun.py
View file
Open in desktop
Expand Up @@ -50,6 +50,7 @@
SaltCloudExecutionFailure,
SaltCloudExecutionTimeout
)
from salt.utils.stringutils import to_bytes

# Import 3rd-party libs
from salt.ext import six
Expand Down Expand Up @@ -770,7 +771,7 @@ def percent_encode(line):
# All aliyun API only support GET method
stringToSign = 'GET&%2F&' + percent_encode(canonicalizedQueryString[1:])

h = hmac.new(access_key_secret + "&", stringToSign, sha1)
h = hmac.new(to_bytes(access_key_secret + "&"), stringToSign, sha1)
signature = base64.encodestring(h.digest()).strip()
return signature

Expand Down