publish jdcloud-cli 1.0.0 (#31)

Author: 欧林宝

cement/ext/ext_argparse.py

@@ -776,6 +776,9 @@ def _process_commands(self, controller):
             LOG.debug("processing arguments for '%s' " % command['label'] +
                       "command namespace")
             for arg, kw in command['arguments']:
+                if '--input-json' in controller.app.argv:
+                    kw['required'] = False
+
                 LOG.debug('adding argument (args=%s, kwargs=%s)' %
                           (arg, kw))
                 command_parser.add_argument(*arg, **kw)

jdcloud_cli/client_factory.py

@@ -18,37 +18,37 @@
 
 from jdcloud_sdk.core.config import Config
 from jdcloud_sdk.core.credential import Credential
-from jdcloud_sdk.services.vm.client.VmClient import VmClient
+from jdcloud_sdk.services.rds.client.RdsClient import RdsClient
+from jdcloud_sdk.services.jke.client.JkeClient import JkeClient
+from jdcloud_sdk.services.ams.client.AmsClient import AmsClient
+from jdcloud_sdk.services.streamcomputer.client.StreamcomputerClient import StreamcomputerClient
+from jdcloud_sdk.services.ipanti.client.IpantiClient import IpantiClient
+from jdcloud_sdk.services.datastar.client.DatastarClient import DatastarClient
+from jdcloud_sdk.services.oss.client.OssClient import OssClient
+from jdcloud_sdk.services.redis.client.RedisClient import RedisClient
 from jdcloud_sdk.services.kms.client.KmsClient import KmsClient
 from jdcloud_sdk.services.iam.client.IamClient import IamClient
-from jdcloud_sdk.services.disk.client.DiskClient import DiskClient
-from jdcloud_sdk.services.mongodb.client.MongodbClient import MongodbClient
-from jdcloud_sdk.services.ias.client.IasClient import IasClient
-from jdcloud_sdk.services.jdfusion.client.JdfusionClient import JdfusionClient
+from jdcloud_sdk.services.sop.client.SopClient import SopClient
 from jdcloud_sdk.services.function.client.FunctionClient import FunctionClient
-from jdcloud_sdk.services.mps.client.MpsClient import MpsClient
-from jdcloud_sdk.services.streambus.client.StreambusClient import StreambusClient
+from jdcloud_sdk.services.iothub.client.IothubClient import IothubClient
 from jdcloud_sdk.services.baseanti.client.BaseantiClient import BaseantiClient
-from jdcloud_sdk.services.jke.client.JkeClient import JkeClient
+from jdcloud_sdk.services.ias.client.IasClient import IasClient
+from jdcloud_sdk.services.mongodb.client.MongodbClient import MongodbClient
 from jdcloud_sdk.services.live.client.LiveClient import LiveClient
-from jdcloud_sdk.services.ipanti.client.IpantiClient import IpantiClient
-from jdcloud_sdk.services.httpdns.client.HttpdnsClient import HttpdnsClient
-from jdcloud_sdk.services.rds.client.RdsClient import RdsClient
-from jdcloud_sdk.services.redis.client.RedisClient import RedisClient
-from jdcloud_sdk.services.monitor.client.MonitorClient import MonitorClient
+from jdcloud_sdk.services.jdfusion.client.JdfusionClient import JdfusionClient
+from jdcloud_sdk.services.clouddnsservice.client.ClouddnsserviceClient import ClouddnsserviceClient
 from jdcloud_sdk.services.cps.client.CpsClient import CpsClient
-from jdcloud_sdk.services.datastar.client.DatastarClient import DatastarClient
 from jdcloud_sdk.services.vpc.client.VpcClient import VpcClient
-from jdcloud_sdk.services.sop.client.SopClient import SopClient
-from jdcloud_sdk.services.iothub.client.IothubClient import IothubClient
+from jdcloud_sdk.services.monitor.client.MonitorClient import MonitorClient
 from jdcloud_sdk.services.xdata.client.XdataClient import XdataClient
+from jdcloud_sdk.services.cdn.client.CdnClient import CdnClient
 from jdcloud_sdk.services.cr.client.CrClient import CrClient
+from jdcloud_sdk.services.streambus.client.StreambusClient import StreambusClient
+from jdcloud_sdk.services.httpdns.client.HttpdnsClient import HttpdnsClient
+from jdcloud_sdk.services.mps.client.MpsClient import MpsClient
+from jdcloud_sdk.services.disk.client.DiskClient import DiskClient
 from jdcloud_sdk.services.nc.client.NcClient import NcClient
-from jdcloud_sdk.services.cdn.client.CdnClient import CdnClient
-from jdcloud_sdk.services.clouddnsservice.client.ClouddnsserviceClient import ClouddnsserviceClient
-from jdcloud_sdk.services.oss.client.OssClient import OssClient
-from jdcloud_sdk.services.streamcomputer.client.StreamcomputerClient import StreamcomputerClient
-from jdcloud_sdk.services.ams.client.AmsClient import AmsClient
+from jdcloud_sdk.services.vm.client.VmClient import VmClient
 from jdcloud_cli.config import ProfileManager
 from jdcloud_cli.logger import get_logger
 
@@ -60,37 +60,37 @@ def __init__(self, service):
 
     def get(self, app):
         client_map = {
-            'vm': VmClient,
+            'rds': RdsClient,
+            'jke': JkeClient,
+            'ams': AmsClient,
+            'streamcomputer': StreamcomputerClient,
+            'ipanti': IpantiClient,
+            'datastar': DatastarClient,
+            'oss': OssClient,
+            'redis': RedisClient,
             'kms': KmsClient,
             'iam': IamClient,
-            'disk': DiskClient,
-            'mongodb': MongodbClient,
-            'ias': IasClient,
-            'jdfusion': JdfusionClient,
+            'sop': SopClient,
             'function': FunctionClient,
-            'mps': MpsClient,
-            'streambus': StreambusClient,
+            'iothub': IothubClient,
             'baseanti': BaseantiClient,
-            'jke': JkeClient,
+            'ias': IasClient,
+            'mongodb': MongodbClient,
             'live': LiveClient,
-            'ipanti': IpantiClient,
-            'httpdns': HttpdnsClient,
-            'rds': RdsClient,
-            'redis': RedisClient,
-            'monitor': MonitorClient,
+            'jdfusion': JdfusionClient,
+            'clouddnsservice': ClouddnsserviceClient,
             'cps': CpsClient,
-            'datastar': DatastarClient,
             'vpc': VpcClient,
-            'sop': SopClient,
-            'iothub': IothubClient,
+            'monitor': MonitorClient,
             'xdata': XdataClient,
+            'cdn': CdnClient,
             'cr': CrClient,
+            'streambus': StreambusClient,
+            'httpdns': HttpdnsClient,
+            'mps': MpsClient,
+            'disk': DiskClient,
             'nc': NcClient,
-            'cdn': CdnClient,
-            'clouddnsservice': ClouddnsserviceClient,
-            'oss': OssClient,
-            'streamcomputer': StreamcomputerClient,
-            'ams': AmsClient,
+            'vm': VmClient,
         }
 
         profile_manager = ProfileManager()

jdcloud_cli/config.py

@@ -53,7 +53,7 @@ def __init__(self):
 
     def load_current_profile(self):
         if self.__current_profile_name not in self.__parser.sections():
-            print 'Please use `jdc configure add` command to add cli configure first.'
+            print('Please use `jdc configure add` command to add cli configure first.')
             return None
 
         # notice that the type of config info which read from file is unicode
@@ -114,15 +114,15 @@ def set_current_profile(self, name):
                 f.write(name)
             self.__current_profile_name = name
         except Exception as e:
-            return False, e.message
+            return False, e
         return True, ''
 
     def __write_config_file(self):
         try:
             with open(self.__config_file, 'w+') as f:
                 self.__parser.write(f)
         except Exception as e:
-            return False, e.message
+            return False, e
         return True, ''
 
     def __make_config_dir(self):

jdcloud_cli/controllers/configure_controller.py

@@ -19,6 +19,7 @@
 from cement.ext.ext_argparse import expose
 from jdcloud_cli.controllers.base_controller import BaseController
 from jdcloud_cli.config import Config, ProfileManager
+from jdcloud_cli.utils import cmd_input
 
 
 class ConfigureController(BaseController):
@@ -62,27 +63,27 @@ def add(self):
         profile = self.app.pargs.profile
 
         if access_key is None:
-            access_key = raw_input("Please input your access-key:")
+            access_key = cmd_input("Please input your access-key:")
 
         if access_key == '':
-            print 'access-key is required.'
+            print('access-key is required.')
             exit(1)
 
         if secret_key is None:
             secret_key = getpass("Please input your secret-key:")
 
         if secret_key == '':
-            print 'secret-key is required.'
+            print('secret-key is required.')
             exit(1)
 
         profile_manager = ProfileManager()
         result, msg = profile_manager.add_profile(profile,
                                                   Config(access_key, secret_key, region_id, endpoint, scheme, timeout))
         if result:
             profile_manager.set_current_profile(profile)
-            print 'Configure successfully!'
+            print('Configure successfully!')
         else:
-            print msg
+            print(msg)
 
     @expose(
         arguments=[
@@ -99,9 +100,9 @@ def delete(self):
         profile_manager = ProfileManager()
         result, msg = profile_manager.delete_profile(self.app.pargs.profile)
         if result:
-            print 'Configure successfully!'
+            print('Configure successfully!')
         else:
-            print msg
+            print(msg)
 
     @expose(
         arguments=[
@@ -118,9 +119,9 @@ def use(self):
         profile_manager = ProfileManager()
         result, msg = profile_manager.set_current_profile(self.app.pargs.profile)
         if result:
-            print 'Configure successfully!'
+            print('Configure successfully!')
         else:
-            print msg
+            print(msg)
 
     @expose(
         formatter_class=RawTextHelpFormatter,
@@ -151,6 +152,6 @@ def show_all(self):
     def _print_profiles(self, profiles):
         for profile in profiles.keys():
             items = profiles[profile]
-            print '================= %s ================' % profile
+            print('================= %s ================' % profile)
             for item in items:
-                print '%s:  \t%s' % (item[0], item[1])
+                print('%s:  \t%s' % (item[0], item[1]))

jdcloud_cli/controllers/services/clouddnsservice.py

@@ -495,77 +495,6 @@ def batch_set_dns_resolve(self):
         except Exception as e:
             print(e.message)
 
-    @expose(
-        arguments=[
-            (['--region-id'], dict(help="""(string) 实例所属的地域ID """, dest='regionId',  required=False)),
-            (['--domain-id'], dict(help="""(string) 域名ID，请使用getDomains接口获取。 """, dest='domainId',  required=True)),
-            (['--id-weights'], dict(help="""(array: setlb) 要设置解析记录的权重参数列表 """, dest='idWeights',  required=True)),
-            (['--type'], dict(help="""(string) 这几条解析记录的类型。可以设置权重的类型有：A、AAAA、CNAME、JNAME """, dest='type',  required=True)),
-            (['--input-json'], dict(help='(json) 以json字符串或文件绝对路径形式作为输入参数。\n字符串方式举例：--input-json \'{"field":"value"}\';\n文件格式举例：--input-json file:///xxxx.json', dest='input_json', required=False)),
-            (['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
-        ],
-        formatter_class=RawTextHelpFormatter,
-        help=''' 设置域名解析记录的负载均衡 ''',
-        description='''
-            设置域名解析记录的负载均衡。
-
-            示例: jdc clouddnsservice set-lb  --domain-id xxx --id-weights [{"":""}] --type xxx
-        ''',
-    )
-    def set_lb(self):
-        client_factory = ClientFactory('clouddnsservice')
-        client = client_factory.get(self.app)
-        if client is None:
-            return
-
-        try:
-            from jdcloud_sdk.services.clouddnsservice.apis.SetLBRequest import SetLBRequest
-            params_dict = collect_user_args(self.app)
-            headers = collect_user_headers(self.app)
-            req = SetLBRequest(params_dict, headers)
-            resp = client.send(req)
-            Printer.print_result(resp)
-        except ImportError:
-            print('{"error":"This api is not supported, please use the newer version"}')
-        except Exception as e:
-            print(e.message)
-
-    @expose(
-        arguments=[
-            (['--region-id'], dict(help="""(string) 实例所属的地域ID """, dest='regionId',  required=False)),
-            (['--domain-id'], dict(help="""(string) 域名ID，请使用getDomains接口获取。 """, dest='domainId',  required=True)),
-            (['--type'], dict(help="""(string) 解析记录的类型。有权重的类型有：A、AAAA、CNAME、JNAME """, dest='type',  required=True)),
-            (['--page-number'], dict(help="""(int) 负载均衡记录分页展示的页数，默认为1 """, dest='pageNumber', type=int, required=True)),
-            (['--page-size'], dict(help="""(int) 负载均衡记录分页展示时每页的记录数，默认为10 """, dest='pageSize', type=int, required=True)),
-            (['--input-json'], dict(help='(json) 以json字符串或文件绝对路径形式作为输入参数。\n字符串方式举例：--input-json \'{"field":"value"}\';\n文件格式举例：--input-json file:///xxxx.json', dest='input_json', required=False)),
-            (['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
-        ],
-        formatter_class=RawTextHelpFormatter,
-        help=''' 查看当前域名所有的有负载均衡的解析记录<br>; 这些解析记录分页展示的列表;  ''',
-        description='''
-            查看当前域名所有的有负载均衡的解析记录<br>; 这些解析记录分页展示的列表; 。
-
-            示例: jdc clouddnsservice get-lb  --domain-id xxx --type xxx --page-number 0 --page-size 0
-        ''',
-    )
-    def get_lb(self):
-        client_factory = ClientFactory('clouddnsservice')
-        client = client_factory.get(self.app)
-        if client is None:
-            return
-
-        try:
-            from jdcloud_sdk.services.clouddnsservice.apis.GetLBRequest import GetLBRequest
-            params_dict = collect_user_args(self.app)
-            headers = collect_user_headers(self.app)
-            req = GetLBRequest(params_dict, headers)
-            resp = client.send(req)
-            Printer.print_result(resp)
-        except ImportError:
-            print('{"error":"This api is not supported, please use the newer version"}')
-        except Exception as e:
-            print(e.message)
-
     @expose(
         arguments=[
             (['--region-id'], dict(help="""(string) 地域ID """, dest='regionId',  required=False)),
@@ -1019,7 +948,7 @@ def get_monitor_alarm_info(self):
 
     @expose(
         arguments=[
-            (['--api'], dict(help="""(string) api name """, choices=['get-action-log','get-domains','add-domain','del-domain','update-domain','get-domain-query-count','get-domain-query-traffic','search-rr','get-view-tree','add-rr','update-rr','operate-rr','batch-set-dns-resolve','set-lb','get-lb','add-user-view','del-user-view','get-user-view','add-user-view-ip','del-user-view-ip','get-user-view-ip','get-monitor','add-monitor','get-targets','add-monitor-target','operate-monitor','update-monitor','get-monitor-alarm-info',], required=True)),
+            (['--api'], dict(help="""(string) api name """, choices=['get-action-log','get-domains','add-domain','del-domain','update-domain','get-domain-query-count','get-domain-query-traffic','search-rr','get-view-tree','add-rr','update-rr','operate-rr','batch-set-dns-resolve','add-user-view','del-user-view','get-user-view','add-user-view-ip','del-user-view-ip','get-user-view-ip','get-monitor','add-monitor','get-targets','add-monitor-target','operate-monitor','update-monitor','get-monitor-alarm-info',], required=True)),
         ],
         formatter_class=RawTextHelpFormatter,
         help=''' 生成单个API接口的json骨架空字符串 ''',