Skip to content

Commit b12398d

Browse files
author
欧林宝
authored
publish jdcloud-cli 1.1.1 (#48)
* publish jdcloud-cli 1.1.1 * remove repeated exec_start func
1 parent 26f7ec0 commit b12398d

41 files changed

Lines changed: 4850 additions & 712 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎jdcloud_cli/controllers/services/baseanti.py‎

Lines changed: 330 additions & 25 deletions
Large diffs are not rendered by default.

‎jdcloud_cli/controllers/services/cdn.py‎

Lines changed: 435 additions & 18 deletions
Large diffs are not rendered by default.

‎jdcloud_cli/controllers/services/cps.py‎

Lines changed: 671 additions & 114 deletions
Large diffs are not rendered by default.

‎jdcloud_cli/controllers/services/elite.py‎

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,72 @@ class Meta:
3636
stacked_on = 'base'
3737
stacked_type = 'nested'
3838

39+
@expose(
40+
arguments=[
41+
(['--region-id'], dict(help="""(string) 地域ID """, dest='regionId', required=False)),
42+
(['--report-order-info'], dict(help="""(reportOrderInfo) 上报订单信息 """, dest='reportOrderInfo', required=True)),
43+
(['--input-json'], dict(help='(json) 以json字符串或文件绝对路径形式作为输入参数。\n字符串方式举例：--input-json \'{"field":"value"}\';\n文件格式举例：--input-json file:///xxxx.json', dest='input_json', required=False)),
44+
(['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
45+
],
46+
formatter_class=RawTextHelpFormatter,
47+
help=''' 上报订单 ''',
48+
description='''
49+
上报订单。
50+
51+
示例: jdc elite jdx-report-order --report-order-info '{"":""}'
52+
''',
53+
)
54+
def jdx_report_order(self):
55+
client_factory = ClientFactory('elite')
56+
client = client_factory.get(self.app)
57+
if client is None:
58+
return
59+
60+
try:
61+
from jdcloud_sdk.services.elite.apis.JdxReportOrderRequest import JdxReportOrderRequest
62+
params_dict = collect_user_args(self.app)
63+
headers = collect_user_headers(self.app)
64+
req = JdxReportOrderRequest(params_dict, headers)
65+
resp = client.send(req)
66+
Printer.print_result(resp)
67+
except ImportError:
68+
print('{"error":"This api is not supported, please use the newer version"}')
69+
except Exception as e:
70+
print(e)
71+
72+
@expose(
73+
arguments=[
74+
(['--region-id'], dict(help="""(string) 地域ID """, dest='regionId', required=False)),
75+
(['--query-price-param'], dict(help="""(queryPriceParam) 查询价格参数 """, dest='queryPriceParam', required=True)),
76+
(['--input-json'], dict(help='(json) 以json字符串或文件绝对路径形式作为输入参数。\n字符串方式举例：--input-json \'{"field":"value"}\';\n文件格式举例：--input-json file:///xxxx.json', dest='input_json', required=False)),
77+
(['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
78+
],
79+
formatter_class=RawTextHelpFormatter,
80+
help=''' 查询价格 ''',
81+
description='''
82+
查询价格。
83+
84+
示例: jdc elite jdx-query-price --query-price-param '{"":""}'
85+
''',
86+
)
87+
def jdx_query_price(self):
88+
client_factory = ClientFactory('elite')
89+
client = client_factory.get(self.app)
90+
if client is None:
91+
return
92+
93+
try:
94+
from jdcloud_sdk.services.elite.apis.JdxQueryPriceRequest import JdxQueryPriceRequest
95+
params_dict = collect_user_args(self.app)
96+
headers = collect_user_headers(self.app)
97+
req = JdxQueryPriceRequest(params_dict, headers)
98+
resp = client.send(req)
99+
Printer.print_result(resp)
100+
except ImportError:
101+
print('{"error":"This api is not supported, please use the newer version"}')
102+
except Exception as e:
103+
print(e)
104+
39105
@expose(
40106
arguments=[
41107
(['--region-id'], dict(help="""(string) 地域ID """, dest='regionId', required=False)),
@@ -177,7 +243,7 @@ def get_store_service(self):
177243

178244
@expose(
179245
arguments=[
180-
(['--api'], dict(help="""(string) api name """, choices=['list-sale-service','get-sale-service-by-deliver-number','confirm-sale-service-delivery','get-store-service',], required=True)),
246+
(['--api'], dict(help="""(string) api name """, choices=['jdx-report-order','jdx-query-price','list-sale-service','get-sale-service-by-deliver-number','confirm-sale-service-delivery','get-store-service',], required=True)),
181247
],
182248
formatter_class=RawTextHelpFormatter,
183249
help=''' 生成单个API接口的json骨架空字符串 ''',

‎jdcloud_cli/controllers/services/function.py‎

Lines changed: 24 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,9 @@ def delete_alias(self):
212212
@expose(
213213
arguments=[
214214
(['--region-id'], dict(help="""(string) Region ID """, dest='regionId', required=False)),
215+
(['--list-all'], dict(help="""(bool) 是否返回所有函数 """, dest='listAll', required=True)),
216+
(['--page-number'], dict(help="""(int) 页码 """, dest='pageNumber', type=int, required=False)),
217+
(['--page-size'], dict(help="""(int) 分页大小 """, dest='pageSize', type=int, required=False)),
215218
(['--filters'], dict(help="""(array: filter) functionId -函数ID，精确匹配，支持多个; functionName - 函数名称，模糊匹配，支持单个; """, dest='filters', required=False)),
216219
(['--input-json'], dict(help='(json) 以json字符串或文件绝对路径形式作为输入参数。\n字符串方式举例：--input-json \'{"field":"value"}\';\n文件格式举例：--input-json file:///xxxx.json', dest='input_json', required=False)),
217220
(['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
@@ -221,7 +224,7 @@ def delete_alias(self):
221224
description='''
222225
查询函数列表。
223226
224-
示例: jdc function list-function
227+
示例: jdc function list-function --list-all true
225228
''',
226229
)
227230
def list_function(self):
@@ -245,14 +248,14 @@ def list_function(self):
245248
@expose(
246249
arguments=[
247250
(['--region-id'], dict(help="""(string) Region ID """, dest='regionId', required=False)),
248-
(['--name'], dict(help="""(string) 函数名称 """, dest='name', required=True)),
251+
(['--name'], dict(help="""(string) 函数名称 """, dest='name', required=False)),
249252
(['--description'], dict(help="""(string) 函数描述信息 """, dest='description', required=False)),
250-
(['--entrance'], dict(help="""(string) 函数入口，格式为入口文件.入口函数名 """, dest='entrance', required=True)),
251-
(['--memory'], dict(help="""(int) 函数运行最大内存 """, dest='memory', type=int, required=True)),
252-
(['--run-time'], dict(help="""(string) 函数运行环境 """, dest='runTime', required=True)),
253-
(['--over-time'], dict(help="""(int) 函数运行超时时间 """, dest='overTime', type=int, required=True)),
253+
(['--entrance'], dict(help="""(string) 函数入口，格式为入口文件.入口函数名 """, dest='entrance', required=False)),
254+
(['--memory'], dict(help="""(int) 函数运行最大内存 """, dest='memory', type=int, required=False)),
255+
(['--run-time'], dict(help="""(string) 函数运行环境 """, dest='runTime', required=False)),
256+
(['--over-time'], dict(help="""(int) 函数运行超时时间 """, dest='overTime', type=int, required=False)),
254257
(['--version'], dict(help="""(string) 函数版本，默认为LATEST """, dest='version', required=False)),
255-
(['--code'], dict(help="""(code) 函数代码包 """, dest='code', required=True)),
258+
(['--code'], dict(help="""(code) 函数代码包 """, dest='code', required=False)),
256259
(['--environment'], dict(help="""(env) 函数运行时环境变量 """, dest='environment', required=False)),
257260
(['--log-set-id'], dict(help="""(string) 函数指定的日志集Id """, dest='logSetId', required=False)),
258261
(['--log-topic-id'], dict(help="""(string) 函数指定的日志主题Id """, dest='logTopicId', required=False)),
@@ -266,7 +269,7 @@ def list_function(self):
266269
description='''
267270
创建函数。
268271
269-
示例: jdc function create-function --name xxx --entrance xxx --memory 0 --run-time xxx --over-time 0 --code '{"":""}'
272+
示例: jdc function create-function
270273
''',
271274
)
272275
def create_function(self):
@@ -324,18 +327,18 @@ def get_function(self):
324327
arguments=[
325328
(['--region-id'], dict(help="""(string) Region ID """, dest='regionId', required=False)),
326329
(['--function-name'], dict(help="""(string) 函数名称 """, dest='functionName', required=True)),
327-
(['--description'], dict(help="""(string) 函数描述信息 """, dest='description', required=True)),
328-
(['--entrance'], dict(help="""(string) 函数入口，格式为入口文件.入口函数名 """, dest='entrance', required=True)),
329-
(['--memory'], dict(help="""(int) 函数运行最大内存 """, dest='memory', type=int, required=True)),
330-
(['--run-time'], dict(help="""(string) 函数运行环境 """, dest='runTime', required=True)),
331-
(['--over-time'], dict(help="""(int) 函数运行超时时间 """, dest='overTime', type=int, required=True)),
330+
(['--description'], dict(help="""(string) 函数描述信息 """, dest='description', required=False)),
331+
(['--entrance'], dict(help="""(string) 函数入口，格式为入口文件.入口函数名 """, dest='entrance', required=False)),
332+
(['--memory'], dict(help="""(int) 函数运行最大内存 """, dest='memory', type=int, required=False)),
333+
(['--run-time'], dict(help="""(string) 函数运行环境 """, dest='runTime', required=False)),
334+
(['--over-time'], dict(help="""(int) 函数运行超时时间 """, dest='overTime', type=int, required=False)),
332335
(['--version'], dict(help="""(string) 函数版本 """, dest='version', required=False)),
333-
(['--code'], dict(help="""(code) 函数代码包 """, dest='code', required=True)),
334-
(['--environment'], dict(help="""(env) 函数运行时环境变量 """, dest='environment', required=True)),
335-
(['--log-set-id'], dict(help="""(string) 函数指定的日志集Id """, dest='logSetId', required=True)),
336-
(['--log-topic-id'], dict(help="""(string) 函数指定的日志主题Id """, dest='logTopicId', required=True)),
337-
(['--vpc-id'], dict(help="""(string) 函数配置的VPCId """, dest='vpcId', required=True)),
338-
(['--subnet-id'], dict(help="""(string) 函数配置的子网Id """, dest='subnetId', required=True)),
336+
(['--code'], dict(help="""(code) 函数代码包 """, dest='code', required=False)),
337+
(['--environment'], dict(help="""(env) 函数运行时环境变量 """, dest='environment', required=False)),
338+
(['--log-set-id'], dict(help="""(string) 函数指定的日志集Id """, dest='logSetId', required=False)),
339+
(['--log-topic-id'], dict(help="""(string) 函数指定的日志主题Id """, dest='logTopicId', required=False)),
340+
(['--vpc-id'], dict(help="""(string) 函数配置的VPCId """, dest='vpcId', required=False)),
341+
(['--subnet-id'], dict(help="""(string) 函数配置的子网Id """, dest='subnetId', required=False)),
339342
(['--input-json'], dict(help='(json) 以json字符串或文件绝对路径形式作为输入参数。\n字符串方式举例：--input-json \'{"field":"value"}\';\n文件格式举例：--input-json file:///xxxx.json', dest='input_json', required=False)),
340343
(['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
341344
],
@@ -344,7 +347,7 @@ def get_function(self):
344347
description='''
345348
更新函数。
346349
347-
示例: jdc function update-function --function-name xxx --description xxx --entrance xxx --memory 0 --run-time xxx --over-time 0 --code '{"":""}' --environment '{"":""}' --log-set-id xxx --log-topic-id xxx --vpc-id xxx --subnet-id xxx
350+
示例: jdc function update-function --function-name xxx
348351
''',
349352
)
350353
def update_function(self):
@@ -503,40 +506,6 @@ def get_trigger(self):
503506
except Exception as e:
504507
print(e)
505508

506-
@expose(
507-
arguments=[
508-
(['--region-id'], dict(help="""(string) Region ID """, dest='regionId', required=False)),
509-
(['--function-name'], dict(help="""(string) 函数名称 """, dest='functionName', required=True)),
510-
(['--version-name'], dict(help="""(string) 版本名称 """, dest='versionName', required=True)),
511-
(['--input-json'], dict(help='(json) 以json字符串或文件绝对路径形式作为输入参数。\n字符串方式举例：--input-json \'{"field":"value"}\';\n文件格式举例：--input-json file:///xxxx.json', dest='input_json', required=False)),
512-
(['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
513-
],
514-
formatter_class=RawTextHelpFormatter,
515-
help=''' 查询触发器列表 ''',
516-
description='''
517-
查询触发器列表。
518-
519-
示例: jdc function list-trigger --function-name xxx --version-name xxx
520-
''',
521-
)
522-
def list_trigger(self):
523-
client_factory = ClientFactory('function')
524-
client = client_factory.get(self.app)
525-
if client is None:
526-
return
527-
528-
try:
529-
from jdcloud_sdk.services.function.apis.ListTriggerRequest import ListTriggerRequest
530-
params_dict = collect_user_args(self.app)
531-
headers = collect_user_headers(self.app)
532-
req = ListTriggerRequest(params_dict, headers)
533-
resp = client.send(req)
534-
Printer.print_result(resp)
535-
except ImportError:
536-
print('{"error":"This api is not supported, please use the newer version"}')
537-
except Exception as e:
538-
print(e)
539-
540509
@expose(
541510
arguments=[
542511
(['--region-id'], dict(help="""(string) Region ID """, dest='regionId', required=False)),
@@ -674,7 +643,7 @@ def delete_version(self):
674643

675644
@expose(
676645
arguments=[
677-
(['--api'], dict(help="""(string) api name """, choices=['list-alias','create-alias','get-alias','update-alias','delete-alias','list-function','create-function','get-function','update-function','delete-function','invoke','async-invoke','get-trigger','list-trigger','list-version','create-version','get-version','delete-version',], required=True)),
646+
(['--api'], dict(help="""(string) api name """, choices=['list-alias','create-alias','get-alias','update-alias','delete-alias','list-function','create-function','get-function','update-function','delete-function','invoke','async-invoke','get-trigger','list-version','create-version','get-version','delete-version',], required=True)),
678647
],
679648
formatter_class=RawTextHelpFormatter,
680649
help=''' 生成单个API接口的json骨架空字符串 ''',

0 commit comments

Comments
 (0)