diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/include/aws/iam/model/CreateAccountRequest.h b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/include/aws/iam/model/CreateAccountRequest.h index 8fb017ba47a6b2ea071d3b7ec8a41b6bfc38486b..a6d663ce30a4ab4868acbe0509b1384c7475cf23 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/include/aws/iam/model/CreateAccountRequest.h +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/include/aws/iam/model/CreateAccountRequest.h @@ -575,8 +575,16 @@ namespace Model inline CreateAccountRequest& WithSelfDefineSecretAccessKeyId(const char* value) { SetSelfDefineSecretAccessKeyId(value); return *this;} + inline int GetPasswordType() const{ return m_passwordType; } + inline bool PasswordTypeHasBeenSet() const { return m_passwordTypeHasBeenSet; } + inline void SetPasswordType(int value) { m_passwordTypeHasBeenSet = true; m_passwordType = value; } + inline CreateAccountRequest& WithPasswordType(int value) { SetPasswordType(value); return *this;} + private: + int m_passwordType; + bool m_passwordTypeHasBeenSet; + Aws::String m_selfDefineSecretAccessKeyId; bool m_selfDefineSecretAccessKeyIdHasBeenSet; diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAccountRequest.h b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAccountRequest.h index e9be64cb323992938b41b1c57709edc9aa21557f..dafaade9d6201386621f8c5c7ff7ec6713022815 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAccountRequest.h +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/include/aws/iam/model/UpdateAccountRequest.h @@ -584,9 +584,15 @@ namespace Model */ inline UpdateAccountRequest& WithDescription(const char* value) { SetDescription(value); return *this;} - + inline int GetPasswordType() const{ return m_passwordType; } + inline bool PasswordTypeHasBeenSet() const { return m_passwordTypeHasBeenSet; } + inline void SetPasswordType(int value) { m_passwordTypeHasBeenSet = true; m_passwordType = value; } + inline UpdateAccountRequest& WithPasswordType(int value) { SetPasswordType(value); return *this;} private: + int m_passwordType; + bool m_passwordTypeHasBeenSet; + Aws::String m_oldPassWord; bool m_oldPassWordHasBeenSet; diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/source/model/CreateAccountRequest.cpp b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/source/model/CreateAccountRequest.cpp index ae3ae882420e86326ce7ed2809dd5fb4d4c6c105..78eea2742bd2563e4e20633bfe60ca63f40c54ab 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/source/model/CreateAccountRequest.cpp +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/source/model/CreateAccountRequest.cpp @@ -7,6 +7,12 @@ #include #include +#include +#include +#include +#include + + using namespace Aws::IAM::Model; using namespace Aws::Utils; @@ -19,7 +25,8 @@ CreateAccountRequest::CreateAccountRequest() : m_accessTypeHasBeenSet(false), m_descriptionHasBeenSet(false), m_selfDefineAccessKeyIdHasBeenSet(false), - m_selfDefineSecretAccessKeyIdHasBeenSet(false) + m_selfDefineSecretAccessKeyIdHasBeenSet(false), + m_passwordTypeHasBeenSet(false) { } @@ -35,8 +42,25 @@ Aws::String CreateAccountRequest::SerializePayload() const if(m_passwordHasBeenSet) { - ss << "Password=" << StringUtils::URLEncode(m_password.c_str()) << "&"; + Aws::String out = m_password; + if (m_passwordTypeHasBeenSet) + { + int pwdtype = m_passwordType; + if (1 == pwdtype) + { + int str_size = m_password.size(); + unsigned char *cs = new unsigned char[str_size]; + memcpy(cs, &m_password[0], m_password.size()); + Aws::Utils::Base64::Base64 base64; + Aws::Utils::Array buf(cs,m_password.size()); + out = base64.Encode(buf); + pwdtype = 2; + } + ss << "PasswordType=" << pwdtype << "&"; + } + ss << "Password=" << StringUtils::URLEncode(out.c_str()) << "&"; } + if(m_emailHasBeenSet) { ss << "Email=" << StringUtils::URLEncode(m_email.c_str()) << "&"; diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/source/model/UpdateAccountRequest.cpp b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/source/model/UpdateAccountRequest.cpp index a1dc4a03e0300ec2ccbb4be2072469f505647329..ae6bb89ac65f62dbc42260a1064c541d5ee9465a 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/source/model/UpdateAccountRequest.cpp +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-iam/source/model/UpdateAccountRequest.cpp @@ -21,66 +21,107 @@ UpdateAccountRequest::UpdateAccountRequest() : m_changeAccountDescription(false), m_descriptionHasBeenSet(false), m_newPassWordHasBeenSet(false), - m_oldPassWordHasBeenSet(false) + m_oldPassWordHasBeenSet(false), + m_passwordTypeHasBeenSet(false) { } Aws::String UpdateAccountRequest::SerializePayload() const { - Aws::StringStream ss; - if(m_updateAccountQuota) - { - ss << "Action=UpdateAccountQuota&"; - }else if(m_changeAccountPassword){ - ss << "Action=ChangeAccountPassword&"; - }else if(m_changeAccountDescription){ - ss << "Action=ChangeAccountDescription&"; - }else{ - ss << "Action=UpdateUser&"; - } - - if(m_descriptionHasBeenSet) + Aws::StringStream ss; + if(m_updateAccountQuota) + { + ss << "Action=UpdateAccountQuota&"; + }else if(m_changeAccountPassword){ + ss << "Action=ChangeAccountPassword&"; + }else if(m_changeAccountDescription){ + ss << "Action=ChangeAccountDescription&"; + }else{ + ss << "Action=UpdateUser&"; + } + + if(m_descriptionHasBeenSet) { ss << "Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } - if(m_oldPassWordHasBeenSet) + if(m_passwordTypeHasBeenSet) + { + Aws::String old_out = m_oldPassWord; + Aws::String new_out = m_newPassWord; + int pwd_type = m_passwordType; + if(m_oldPassWordHasBeenSet) + { + if(1 == m_passwordType) + { + int str_size = m_oldPassWord.size(); + unsigned char *cs = new unsigned char[str_size]; + memcpy(cs, &m_oldPassWord[0], m_oldPassWord.size()); + Aws::Utils::Base64::Base64 base64; + Aws::Utils::Array buf(cs,m_oldPassWord.size()); + old_out = base64.Encode(buf); + pwd_type = 2; + } + ss << "OldPassword=" << StringUtils::URLEncode(old_out.c_str()) << "&"; + } + + if(m_newPassWordHasBeenSet) + { + if(1 == m_passwordType) + { + int str_size = m_newPassWord.size(); + unsigned char *cs = new unsigned char[str_size]; + memcpy(cs, &m_newPassWord[0], m_newPassWord.size()); + Aws::Utils::Base64::Base64 base64; + Aws::Utils::Array buf(cs,m_newPassWord.size()); + new_out = base64.Encode(buf); + pwd_type = 2; + } + ss << "NewPassword=" << StringUtils::URLEncode(new_out.c_str()) << "&"; + } + + ss << "PasswordType=" << pwd_type << "&"; + } + else + { + if(m_oldPassWordHasBeenSet) + { + ss << "OldPassword=" << StringUtils::URLEncode(m_oldPassWord.c_str()) << "&"; + } + + if(m_newPassWordHasBeenSet) + { + ss << "NewPassword=" << StringUtils::URLEncode(m_newPassWord.c_str()) << "&"; + } + } + + if(m_capacitySizeQuotaHasBeenSet) + { + ss << "CapacitySizeQuota=" << StringUtils::URLEncode(m_capacitySizeQuota.c_str()) << "&"; + } + + if(m_objectNumberQuotaHasBeenSet) + { + ss << "ObjectNumberQuota=" << StringUtils::URLEncode(m_objectNumberQuota.c_str()) << "&"; + } + + if(m_accountNameHasBeenSet) + { + ss << "AccountName=" << StringUtils::URLEncode(m_accountName.c_str()) << "&"; + } + + if(m_newPathHasBeenSet) { - ss << "OldPassword=" << StringUtils::URLEncode(m_oldPassWord.c_str()) << "&"; + ss << "NewPath=" << StringUtils::URLEncode(m_newPath.c_str()) << "&"; } - if(m_newPassWordHasBeenSet) + if(m_newAccountNameHasBeenSet) { - ss << "NewPassword=" << StringUtils::URLEncode(m_newPassWord.c_str()) << "&"; + ss << "NewUserName=" << StringUtils::URLEncode(m_newAccountName.c_str()) << "&"; } - if(m_capacitySizeQuotaHasBeenSet) - { - ss << "CapacitySizeQuota=" << StringUtils::URLEncode(m_capacitySizeQuota.c_str()) << "&"; - } - - if(m_objectNumberQuotaHasBeenSet) - { - ss << "ObjectNumberQuota=" << StringUtils::URLEncode(m_objectNumberQuota.c_str()) << "&"; - } - - if(m_accountNameHasBeenSet) - { - ss << "AccountName=" << StringUtils::URLEncode(m_accountName.c_str()) << "&"; - } - - if(m_newPathHasBeenSet) - { - ss << "NewPath=" << StringUtils::URLEncode(m_newPath.c_str()) << "&"; - } - - if(m_newAccountNameHasBeenSet) - { - ss << "NewUserName=" << StringUtils::URLEncode(m_newAccountName.c_str()) << "&"; - } - - ss << "Version=2010-05-08"; - return ss.str(); + ss << "Version=2010-05-08"; +return ss.str(); } diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/PutBucketLifecycleConfigurationRequest.cpp b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/PutBucketLifecycleConfigurationRequest.cpp index 01a3ba632ac51134aa54ef2db85e3e6c56ad23fe..0c95ee69cd50e6290f1190cdd4bc228a82e2fe4b 100644 --- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/PutBucketLifecycleConfigurationRequest.cpp +++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/PutBucketLifecycleConfigurationRequest.cpp @@ -34,7 +34,7 @@ Aws::String PutBucketLifecycleConfigurationRequest::SerializePayload() const m_lifecycleConfiguration.AddToNode(parentNode); if(parentNode.HasChildren()) { - std::cout<