diff --git a/VERSION b/VERSION index 42ad10ed6..bb797738f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1594 \ No newline at end of file +1.36.1595 \ No newline at end of file diff --git a/resourcemanager/CMakeLists.txt b/resourcemanager/CMakeLists.txt index 9f41666eb..ef57fe57c 100644 --- a/resourcemanager/CMakeLists.txt +++ b/resourcemanager/CMakeLists.txt @@ -115,8 +115,6 @@ set(resourcemanager_public_header_model include/alibabacloud/resourcemanager/model/GetResourceDirectoryResult.h include/alibabacloud/resourcemanager/model/GetResourceGroupRequest.h include/alibabacloud/resourcemanager/model/GetResourceGroupResult.h - include/alibabacloud/resourcemanager/model/GetResourceGroupListAclModeRequest.h - include/alibabacloud/resourcemanager/model/GetResourceGroupListAclModeResult.h include/alibabacloud/resourcemanager/model/GetRoleRequest.h include/alibabacloud/resourcemanager/model/GetRoleResult.h include/alibabacloud/resourcemanager/model/GetServiceLinkedRoleDeletionStatusRequest.h @@ -302,8 +300,6 @@ set(resourcemanager_src src/model/GetResourceDirectoryResult.cc src/model/GetResourceGroupRequest.cc src/model/GetResourceGroupResult.cc - src/model/GetResourceGroupListAclModeRequest.cc - src/model/GetResourceGroupListAclModeResult.cc src/model/GetRoleRequest.cc src/model/GetRoleResult.cc src/model/GetServiceLinkedRoleDeletionStatusRequest.cc diff --git a/resourcemanager/include/alibabacloud/resourcemanager/ResourceManagerClient.h b/resourcemanager/include/alibabacloud/resourcemanager/ResourceManagerClient.h index 55859fb7f..4c198f51c 100644 --- a/resourcemanager/include/alibabacloud/resourcemanager/ResourceManagerClient.h +++ b/resourcemanager/include/alibabacloud/resourcemanager/ResourceManagerClient.h @@ -116,8 +116,6 @@ #include "model/GetResourceDirectoryResult.h" #include "model/GetResourceGroupRequest.h" #include "model/GetResourceGroupResult.h" -#include "model/GetResourceGroupListAclModeRequest.h" -#include "model/GetResourceGroupListAclModeResult.h" #include "model/GetRoleRequest.h" #include "model/GetRoleResult.h" #include "model/GetServiceLinkedRoleDeletionStatusRequest.h" @@ -356,9 +354,6 @@ namespace AlibabaCloud typedef Outcome GetResourceGroupOutcome; typedef std::future GetResourceGroupOutcomeCallable; typedef std::function&)> GetResourceGroupAsyncHandler; - typedef Outcome GetResourceGroupListAclModeOutcome; - typedef std::future GetResourceGroupListAclModeOutcomeCallable; - typedef std::function&)> GetResourceGroupListAclModeAsyncHandler; typedef Outcome GetRoleOutcome; typedef std::future GetRoleOutcomeCallable; typedef std::function&)> GetRoleAsyncHandler; @@ -637,9 +632,6 @@ namespace AlibabaCloud GetResourceGroupOutcome getResourceGroup(const Model::GetResourceGroupRequest &request)const; void getResourceGroupAsync(const Model::GetResourceGroupRequest& request, const GetResourceGroupAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; GetResourceGroupOutcomeCallable getResourceGroupCallable(const Model::GetResourceGroupRequest& request) const; - GetResourceGroupListAclModeOutcome getResourceGroupListAclMode(const Model::GetResourceGroupListAclModeRequest &request)const; - void getResourceGroupListAclModeAsync(const Model::GetResourceGroupListAclModeRequest& request, const GetResourceGroupListAclModeAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; - GetResourceGroupListAclModeOutcomeCallable getResourceGroupListAclModeCallable(const Model::GetResourceGroupListAclModeRequest& request) const; GetRoleOutcome getRole(const Model::GetRoleRequest &request)const; void getRoleAsync(const Model::GetRoleRequest& request, const GetRoleAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; GetRoleOutcomeCallable getRoleCallable(const Model::GetRoleRequest& request) const; diff --git a/resourcemanager/include/alibabacloud/resourcemanager/model/BindSecureMobilePhoneRequest.h b/resourcemanager/include/alibabacloud/resourcemanager/model/BindSecureMobilePhoneRequest.h index cc0ed786c..f4899dc49 100644 --- a/resourcemanager/include/alibabacloud/resourcemanager/model/BindSecureMobilePhoneRequest.h +++ b/resourcemanager/include/alibabacloud/resourcemanager/model/BindSecureMobilePhoneRequest.h @@ -30,8 +30,6 @@ class ALIBABACLOUD_RESOURCEMANAGER_EXPORT BindSecureMobilePhoneRequest : public public: BindSecureMobilePhoneRequest(); ~BindSecureMobilePhoneRequest(); - std::string getInheritSecureMobilePhoneFrom() const; - void setInheritSecureMobilePhoneFrom(const std::string &inheritSecureMobilePhoneFrom); std::string getSecureMobilePhone() const; void setSecureMobilePhone(const std::string &secureMobilePhone); std::string getAccountId() const; @@ -40,7 +38,6 @@ public: void setVerificationCode(const std::string &verificationCode); private: - std::string inheritSecureMobilePhoneFrom_; std::string secureMobilePhone_; std::string accountId_; std::string verificationCode_; diff --git a/resourcemanager/include/alibabacloud/resourcemanager/model/CreateResourceAccountRequest.h b/resourcemanager/include/alibabacloud/resourcemanager/model/CreateResourceAccountRequest.h index b2c79bfbe..0836da863 100644 --- a/resourcemanager/include/alibabacloud/resourcemanager/model/CreateResourceAccountRequest.h +++ b/resourcemanager/include/alibabacloud/resourcemanager/model/CreateResourceAccountRequest.h @@ -36,14 +36,8 @@ public: ~CreateResourceAccountRequest(); std::vector getTag() const; void setTag(const std::vector &tag); - std::string getVerificationCode() const; - void setVerificationCode(const std::string &verificationCode); std::string getAccountNamePrefix() const; void setAccountNamePrefix(const std::string &accountNamePrefix); - std::string getInheritSecureMobilePhoneFrom() const; - void setInheritSecureMobilePhoneFrom(const std::string &inheritSecureMobilePhoneFrom); - std::string getSecureMobilePhone() const; - void setSecureMobilePhone(const std::string &secureMobilePhone); std::string getResellAccountType() const; void setResellAccountType(const std::string &resellAccountType); std::string getParentFolderId() const; @@ -55,10 +49,7 @@ public: private: std::vector tag_; - std::string verificationCode_; std::string accountNamePrefix_; - std::string inheritSecureMobilePhoneFrom_; - std::string secureMobilePhone_; std::string resellAccountType_; std::string parentFolderId_; std::string displayName_; diff --git a/resourcemanager/include/alibabacloud/resourcemanager/model/GetResourceGroupListAclModeRequest.h b/resourcemanager/include/alibabacloud/resourcemanager/model/GetResourceGroupListAclModeRequest.h deleted file mode 100644 index e87c0ff2b..000000000 --- a/resourcemanager/include/alibabacloud/resourcemanager/model/GetResourceGroupListAclModeRequest.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ALIBABACLOUD_RESOURCEMANAGER_MODEL_GETRESOURCEGROUPLISTACLMODEREQUEST_H_ -#define ALIBABACLOUD_RESOURCEMANAGER_MODEL_GETRESOURCEGROUPLISTACLMODEREQUEST_H_ - -#include -#include -#include -#include -#include - -namespace AlibabaCloud { -namespace ResourceManager { -namespace Model { -class ALIBABACLOUD_RESOURCEMANAGER_EXPORT GetResourceGroupListAclModeRequest : public RpcServiceRequest { -public: - GetResourceGroupListAclModeRequest(); - ~GetResourceGroupListAclModeRequest(); - -private: -}; -} // namespace Model -} // namespace ResourceManager -} // namespace AlibabaCloud -#endif // !ALIBABACLOUD_RESOURCEMANAGER_MODEL_GETRESOURCEGROUPLISTACLMODEREQUEST_H_ diff --git a/resourcemanager/include/alibabacloud/resourcemanager/model/GetResourceGroupListAclModeResult.h b/resourcemanager/include/alibabacloud/resourcemanager/model/GetResourceGroupListAclModeResult.h deleted file mode 100644 index 7d88287bd..000000000 --- a/resourcemanager/include/alibabacloud/resourcemanager/model/GetResourceGroupListAclModeResult.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ALIBABACLOUD_RESOURCEMANAGER_MODEL_GETRESOURCEGROUPLISTACLMODERESULT_H_ -#define ALIBABACLOUD_RESOURCEMANAGER_MODEL_GETRESOURCEGROUPLISTACLMODERESULT_H_ - -#include -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace ResourceManager - { - namespace Model - { - class ALIBABACLOUD_RESOURCEMANAGER_EXPORT GetResourceGroupListAclModeResult : public ServiceResult - { - public: - - - GetResourceGroupListAclModeResult(); - explicit GetResourceGroupListAclModeResult(const std::string &payload); - ~GetResourceGroupListAclModeResult(); - std::string getMode()const; - - protected: - void parse(const std::string &payload); - private: - std::string mode_; - - }; - } - } -} -#endif // !ALIBABACLOUD_RESOURCEMANAGER_MODEL_GETRESOURCEGROUPLISTACLMODERESULT_H_ \ No newline at end of file diff --git a/resourcemanager/src/ResourceManagerClient.cc b/resourcemanager/src/ResourceManagerClient.cc index eae0446fa..fe009b719 100644 --- a/resourcemanager/src/ResourceManagerClient.cc +++ b/resourcemanager/src/ResourceManagerClient.cc @@ -31,21 +31,21 @@ ResourceManagerClient::ResourceManagerClient(const Credentials &credentials, con RpcServiceClient(SERVICE_NAME, std::make_shared(credentials), configuration) { auto locationClient = std::make_shared(credentials, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "resourcemanager"); } ResourceManagerClient::ResourceManagerClient(const std::shared_ptr& credentialsProvider, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration) { auto locationClient = std::make_shared(credentialsProvider, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "resourcemanager"); } ResourceManagerClient::ResourceManagerClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, std::make_shared(accessKeyId, accessKeySecret), configuration) { auto locationClient = std::make_shared(accessKeyId, accessKeySecret, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "resourcemanager"); } ResourceManagerClient::~ResourceManagerClient() @@ -1743,42 +1743,6 @@ ResourceManagerClient::GetResourceGroupOutcomeCallable ResourceManagerClient::ge return task->get_future(); } -ResourceManagerClient::GetResourceGroupListAclModeOutcome ResourceManagerClient::getResourceGroupListAclMode(const GetResourceGroupListAclModeRequest &request) const -{ - auto endpointOutcome = endpointProvider_->getEndpoint(); - if (!endpointOutcome.isSuccess()) - return GetResourceGroupListAclModeOutcome(endpointOutcome.error()); - - auto outcome = makeRequest(endpointOutcome.result(), request); - - if (outcome.isSuccess()) - return GetResourceGroupListAclModeOutcome(GetResourceGroupListAclModeResult(outcome.result())); - else - return GetResourceGroupListAclModeOutcome(outcome.error()); -} - -void ResourceManagerClient::getResourceGroupListAclModeAsync(const GetResourceGroupListAclModeRequest& request, const GetResourceGroupListAclModeAsyncHandler& handler, const std::shared_ptr& context) const -{ - auto fn = [this, request, handler, context]() - { - handler(this, request, getResourceGroupListAclMode(request), context); - }; - - asyncExecute(new Runnable(fn)); -} - -ResourceManagerClient::GetResourceGroupListAclModeOutcomeCallable ResourceManagerClient::getResourceGroupListAclModeCallable(const GetResourceGroupListAclModeRequest &request) const -{ - auto task = std::make_shared>( - [this, request]() - { - return this->getResourceGroupListAclMode(request); - }); - - asyncExecute(new Runnable([task]() { (*task)(); })); - return task->get_future(); -} - ResourceManagerClient::GetRoleOutcome ResourceManagerClient::getRole(const GetRoleRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/resourcemanager/src/model/BindSecureMobilePhoneRequest.cc b/resourcemanager/src/model/BindSecureMobilePhoneRequest.cc index 1f55ce04b..04eef6408 100644 --- a/resourcemanager/src/model/BindSecureMobilePhoneRequest.cc +++ b/resourcemanager/src/model/BindSecureMobilePhoneRequest.cc @@ -25,15 +25,6 @@ BindSecureMobilePhoneRequest::BindSecureMobilePhoneRequest() BindSecureMobilePhoneRequest::~BindSecureMobilePhoneRequest() {} -std::string BindSecureMobilePhoneRequest::getInheritSecureMobilePhoneFrom() const { - return inheritSecureMobilePhoneFrom_; -} - -void BindSecureMobilePhoneRequest::setInheritSecureMobilePhoneFrom(const std::string &inheritSecureMobilePhoneFrom) { - inheritSecureMobilePhoneFrom_ = inheritSecureMobilePhoneFrom; - setParameter(std::string("InheritSecureMobilePhoneFrom"), inheritSecureMobilePhoneFrom); -} - std::string BindSecureMobilePhoneRequest::getSecureMobilePhone() const { return secureMobilePhone_; } diff --git a/resourcemanager/src/model/CreateResourceAccountRequest.cc b/resourcemanager/src/model/CreateResourceAccountRequest.cc index d47dd3df2..6c63d6bce 100644 --- a/resourcemanager/src/model/CreateResourceAccountRequest.cc +++ b/resourcemanager/src/model/CreateResourceAccountRequest.cc @@ -37,15 +37,6 @@ void CreateResourceAccountRequest::setTag(const std::vector - -using AlibabaCloud::ResourceManager::Model::GetResourceGroupListAclModeRequest; - -GetResourceGroupListAclModeRequest::GetResourceGroupListAclModeRequest() - : RpcServiceRequest("resourcemanager", "2020-03-31", "GetResourceGroupListAclMode") { - setMethod(HttpRequest::Method::Get); -} - -GetResourceGroupListAclModeRequest::~GetResourceGroupListAclModeRequest() {} - diff --git a/resourcemanager/src/model/GetResourceGroupListAclModeResult.cc b/resourcemanager/src/model/GetResourceGroupListAclModeResult.cc deleted file mode 100644 index b560bf811..000000000 --- a/resourcemanager/src/model/GetResourceGroupListAclModeResult.cc +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -using namespace AlibabaCloud::ResourceManager; -using namespace AlibabaCloud::ResourceManager::Model; - -GetResourceGroupListAclModeResult::GetResourceGroupListAclModeResult() : - ServiceResult() -{} - -GetResourceGroupListAclModeResult::GetResourceGroupListAclModeResult(const std::string &payload) : - ServiceResult() -{ - parse(payload); -} - -GetResourceGroupListAclModeResult::~GetResourceGroupListAclModeResult() -{} - -void GetResourceGroupListAclModeResult::parse(const std::string &payload) -{ - Json::Reader reader; - Json::Value value; - reader.parse(payload, value); - setRequestId(value["RequestId"].asString()); - if(!value["Mode"].isNull()) - mode_ = value["Mode"].asString(); - -} - -std::string GetResourceGroupListAclModeResult::getMode()const -{ - return mode_; -} -