Skip to content

Commit 0863f45

Browse files
HuangYanyan-AmberfranklwyLiu Wenyuashorezfc11
authored
Feature/ccm (#146)
* 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文件修改 * feat:修改scm代码 * fix:test门禁处理 * fix:test门禁处理 * fix:test门禁处理 * fix:test门禁修改 * fix:test门禁修改 * fix:test门禁处理 * fix:门禁处理 * fix:test门禁修改 * fix:删除poetry.lock文件中阿里云镜像依赖 * fxi:删除阿里云镜像依赖 --------- Co-authored-by: franklwy <[email protected]> Co-authored-by: Liu Wenyu <[email protected]> Co-authored-by: zfc1996 <[email protected]>
1 parent 7ff23e5 commit 0863f45

File tree

9 files changed

+79
-429
lines changed

9 files changed

+79
-429
lines changed

tools/c7n_huaweicloud/c7n_huaweicloud/client.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ def client(self, service):
439439
.with_region(SwrRegion.value_of(self.region))
440440
.build()
441441
)
442-
elif service == 'certificate':
442+
elif service == 'scm':
443443
client = (
444444
ScmClient.new_builder()
445445
.with_credentials(globalCredentials)
@@ -590,8 +590,9 @@ def request(self, service):
590590
request = ListReposDetailsRequest()
591591
elif service == 'swr-image':
592592
request = ListRepositoryTagsRequest()
593-
elif service == 'certificate':
593+
elif service == 'scm':
594594
request = ListCertificatesRequest()
595+
request.expired_days_since = 1095
595596
elif service == 'dc':
596597
request = ListDirectConnectsRequest()
597598
elif service == "bms":

tools/c7n_huaweicloud/c7n_huaweicloud/resources/resource_map.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
"huaweicloud.ram-shared-principals": "c7n_huaweicloud.resources.ram.RAMSharedPrincipals",
4646
"huaweicloud.antiddos-eip": "c7n_huaweicloud.resources.antiddos.Eip",
4747
"huaweicloud.kafka": "c7n_huaweicloud.resources.kafka.Kafka",
48+
"huaweicloud.scm": "c7n_huaweicloud.resources.scm.Scm",
4849
"huaweicloud.swr": "c7n_huaweicloud.resources.swr.Swr",
4950
"huaweicloud.swr-image": "c7n_huaweicloud.resources.swr.SwrImage",
5051
"huaweicloud.eip": "c7n_huaweicloud.resources.eip.EIP",
51-
"huaweicloud.certificate": "c7n_huaweicloud.resources.scm.Certificate",
5252
"huaweicloud.dc": "c7n_huaweicloud.resources.dc.DC",
5353
"huaweicloud.cc-cloud-connection": "c7n_huaweicloud.resources.cc.CloudConnection",
5454
"huaweicloud.rds": "c7n_huaweicloud.resources.rds.RDS",

tools/c7n_huaweicloud/c7n_huaweicloud/resources/scm.py

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,11 @@
1616
log = logging.getLogger('custodian.huaweicloud.scm')
1717

1818

19-
@resources.register('certificate')
20-
class Certificate(QueryResourceManager):
21-
"""Huawei Cloud SSL Certificate Manager
22-
23-
:Example:
24-
25-
.. code-block:: yaml
26-
27-
policies:
28-
- name: certificate-expiring-soon
29-
resource: huaweicloud.certificate
30-
filters:
31-
- type: value
32-
key: status
33-
value: ISSUED
34-
"""
19+
@resources.register('scm')
20+
class Scm(QueryResourceManager):
3521

3622
class resource_type(TypeInfo):
37-
service = 'certificate'
23+
service = 'scm'
3824
enum_spec = ('list_certificates', 'certificates', None)
3925
id = 'id'
4026
name = 'name'
@@ -45,7 +31,7 @@ class resource_type(TypeInfo):
4531
tag_resource_type = 'scm_cert'
4632

4733

48-
@Certificate.action_registry.register('delete')
34+
@Scm.action_registry.register('delete')
4935
class DeleteCertificateAction(HuaweiCloudBaseAction):
5036
"""Delete Certificate Action
5137
@@ -55,7 +41,7 @@ class DeleteCertificateAction(HuaweiCloudBaseAction):
5541
5642
policies:
5743
- name: delete-expired-certificates
58-
resource: huaweicloud.certificate
44+
resource: huaweicloud.scm
5945
filters:
6046
- type: value
6147
key: status

0 commit comments

Comments
 (0)