Skip to content

Commit 1257074

Browse files
HuangYanyan-AmberfranklwyLiu Wenyuashorezfc11zyw0599
authored
Feature/ccm (#187)
* Add files via upload add huaweicloud Kafka custodian * Changes set-config Delete json-diff * delete import * rename set_config * Feature/dns (#9) add dns actions, filters, UTs * Feature/dns (#10) * add readme_dns * add readme_dns * add readme_dns * Update readme_dns.md * Update readme_dns.md * add dns * update readme_dns * update kafka * update client * update dns * update dns * update dns add dns_test * update dns_test update mock * add mock * update dns * Delete tools/c7n_huaweicloud/c7n_huaweicloud/resources/dns_files directory * update dns lint * lint modify * lint modify * modify * modify * update test --------- Co-authored-by: Liu Wenyu <[email protected]> * Create readme_dns.md * feat:ccm服务开发 * feat:scm服务开发 * feat:mock文件提交 * fix:修复查询DC资源测试用例报错的问题 * fix:修改lint门禁 * fix:lint门禁修改 * fix:lint门禁修改 * fix:test门禁修改 * fix:test门禁修改 * fix:修改lint门禁 * fix:mock文件修改 * Update ci.yml * feat:修改scm代码 * fix:test门禁处理 * fix:test门禁处理 * fix:test门禁处理 * fix:test门禁修改 * fix:test门禁修改 * fix:test门禁处理 * fix:门禁处理 * fix:test门禁修改 * fix:删除poetry.lock文件中阿里云镜像依赖 * fxi:删除阿里云镜像依赖 * fix: client change * Update ci.yml * fix:tag_resource_type修改 * fix:修改test门禁 * feat:添加tag_resource_type相关代码 * feat:ccm新需求开发 * feat:ccm服务新需求开发 * feat:ccm资源名称修改及ccm标签增强 * fix:lint门禁修改 * feat:修改查询标签的client * fix:修改lint门禁 * fix:test门禁修改 * feat:删除多余重复代码 * feat:ccm需求更改 * fix:lint门禁修改 * fix:test门禁处理 * feat:ccm需求更改 * fix:lint门禁修改 * fix:lint门禁修改 --------- Co-authored-by: franklwy <[email protected]> Co-authored-by: Liu Wenyu <[email protected]> Co-authored-by: zfc1996 <[email protected]> Co-authored-by: zyw0599 <[email protected]>
1 parent 066f37e commit 1257074

24 files changed

+2870
-88
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,5 @@ custodian*/
6161
venv*/
6262

6363
# files generated during "make data-update"
64-
iam_docs/
64+
iam_docs/
65+
huaweicloudsdkccm

tools/c7n_huaweicloud/c7n_huaweicloud/client.py

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@
137137
from huaweicloudsdkcdn.v2.region.cdn_region import CdnRegion
138138
from huaweicloudsdkworkspace.v2 import WorkspaceClient, ListDesktopsDetailRequest
139139
from huaweicloudsdkworkspace.v2.region.workspace_region import WorkspaceRegion
140+
from huaweicloudsdkccm.v1 import CcmClient, ListCertificateAuthorityRequest, ListCertificateRequest
141+
from huaweicloudsdkccm.v1.region.ccm_region import CcmRegion
140142

141143
log = logging.getLogger("custodian.huaweicloud.client")
142144

@@ -480,7 +482,7 @@ def client(self, service):
480482
.with_region(SwrRegion.value_of(self.region))
481483
.build()
482484
)
483-
elif service == 'scm':
485+
elif service == 'ccm-ssl-certificate':
484486
client = (
485487
ScmClient.new_builder()
486488
.with_credentials(globalCredentials)
@@ -529,6 +531,13 @@ def client(self, service):
529531
.with_region(AomRegion.value_of(self.region))
530532
.build()
531533
)
534+
elif service in ['ccm-private-ca', 'ccm-private-certificate']:
535+
client = (
536+
CcmClient.new_builder()
537+
.with_credentials(globalCredentials)
538+
.with_region(CcmRegion.value_of("ap-southeast-3"))
539+
.build()
540+
)
532541
return client
533542

534543
def region_client(self, service, region):
@@ -657,7 +666,7 @@ def request(self, service):
657666
request = ListReposDetailsRequest()
658667
elif service == 'swr-image':
659668
request = ListRepositoryTagsRequest()
660-
elif service == 'scm':
669+
elif service == 'ccm-ssl-certificate':
661670
request = ListCertificatesRequest()
662671
request.expired_days_since = 1095
663672
elif service == 'dc':
@@ -670,4 +679,8 @@ def request(self, service):
670679
request = ListSubscriptionsRequest()
671680
elif service == 'aom':
672681
request = ListMetricOrEventAlarmRuleRequest(enterprise_project_id="all_granted_eps")
682+
elif service == 'ccm-private-ca':
683+
request = ListCertificateAuthorityRequest()
684+
elif service == 'ccm-private-certificate':
685+
request = ListCertificateRequest()
673686
return request

tools/c7n_huaweicloud/c7n_huaweicloud/query.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,9 @@ def _non_pagination(self, manager, enum_op, path):
231231
if "id" not in resources[0]:
232232
for data in resources:
233233
data["id"] = data[manager.id]
234-
234+
if "tag_resource_type" not in resources[0]:
235+
for data in resources:
236+
data["tag_resource_type"] = manager.tag_resource_type
235237
self._get_obs_account_id(response, manager, resources)
236238

237239
return resources

0 commit comments

Comments
 (0)