cli 0.7.1 (#21)

Author: 欧林宝

Dockerfile

@@ -1,8 +1,28 @@
-FROM ubuntu
-
-RUN apt-get update
-RUN apt-get install -y python-pip
-RUN pip install -U jdcloud_cli
-
+FROM alpine:3.6
+RUN apk -v --update add \
+        python \
+        py-pip \
+        groff \
+        less \
+        mailcap \
+	wget \
+        jq  \
+        openssl \
+	ca-certificates \
+	py-setuptools \
+        && \
+    pip install -U jdcloud_cli
+RUN update-ca-certificates
+RUN wget -q -c  -O kubectl https://storage.googleapis.com/kubernetes-release/release/v1.8.12/bin/linux/amd64/kubectl \
+&& chmod +x kubectl \
+&& mv kubectl /usr/local/bin
+RUN apk -v --purge del py-pip && \
+    rm /var/cache/apk/*
+    
 RUN echo 'eval "$(register-python-argcomplete jdc)"' >> /root/.bashrc
 RUN echo 'export COLUMNS=100' >> /root/.bashrc
+
+VOLUME /root/.jdc
+WORKDIR /root
+ENTRYPOINT ["jdc"]
+

jdcloud_cli/client_factory.py

@@ -34,7 +34,6 @@
 from jdcloud_sdk.services.nc.client.NcClient import NcClient
 from jdcloud_sdk.services.clouddnsservice.client.ClouddnsserviceClient import ClouddnsserviceClient
 from jdcloud_sdk.services.mps.client.MpsClient import MpsClient
-from jdcloud_sdk.services.jmr.client.JmrClient import JmrClient
 from jdcloud_sdk.services.streambus.client.StreambusClient import StreambusClient
 from jdcloud_sdk.services.oss.client.OssClient import OssClient
 from jdcloud_sdk.services.baseanti.client.BaseantiClient import BaseantiClient
@@ -68,7 +67,6 @@ def get(self, app):
             'nc': NcClient,
             'clouddnsservice': ClouddnsserviceClient,
             'mps': MpsClient,
-            'jmr': JmrClient,
             'streambus': StreambusClient,
             'oss': OssClient,
             'baseanti': BaseantiClient,

jdcloud_cli/controllers/services/cr.py

@@ -141,7 +141,7 @@ def describe_quotas(self):
     @expose(
         arguments=[
             (['--region-id'], dict(help="""(string) Region ID """, dest='regionId', required=False)),
-            (['--registry-name'], dict(help="""(string) 用户定义的registry名称。<br> DNS兼容registry名称规则如下：;  <br> 不可为空，且不能超过32字符 <br> 以小写字母开始和结尾，支持使用小写字母、数字、中划线(-);  """, dest='registryName', required=False)),
+            (['--registry-name'], dict(help="""(string) 用户定义的registry名称。<br> DNS兼容registry名称规则如下：;  <br> 不可为空，且不能超过32字符 <br> 以小写字母开始和结尾，支持使用小写字母、数字、中划线(-);  """, dest='registryName', required=True)),
             (['--description'], dict(help="""(string) 注册表描述，<a href="https://www.jdcloud.com/help/detail/3870/isCatalog/1">参考公共参数规范</a>。;  """, dest='description', required=False)),
             (['--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)),
@@ -151,7 +151,7 @@ def describe_quotas(self):
         description='''
             通过参数创建注册表。; 。
 
-            示例: jdc cr create-registry 
+            示例: jdc cr create-registry  --registry-name xxx
         ''',
     )
     def create_registry(self):
@@ -172,11 +172,44 @@ def create_registry(self):
         except Exception as e:
             print e.message
 
+    @expose(
+        arguments=[
+            (['--region-id'], dict(help="""(string) Region ID """, dest='regionId', required=False)),
+            (['--registry-name'], dict(help="""(string) 待验证的注册表名。 """, dest='registryName', 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 cr check-registry-name  --registry-name xxx
+        ''',
+    )
+    def check_registry_name(self):
+        client_factory = ClientFactory('cr')
+        client = client_factory.get(self.app)
+        if client is None:
+            return
+
+        try:
+            from jdcloud_sdk.services.cr.apis.CheckRegistryNameRequest import CheckRegistryNameRequest
+            params_dict = collect_user_args(self.app)
+            headers = collect_user_headers(self.app)
+            req = CheckRegistryNameRequest(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) Region ID """, dest='regionId', required=False)),
             (['--registry-name'], dict(help="""(string) 注册表名称 """, dest='registryName', required=True)),
-            (['--repository-name'], dict(help="""(string) 镜像仓库名称。; 可以专有模式如默认命名空间nginx-web-app；或者和命名空间一起将多个仓库聚集在一起如 project-a/nginx-web-app。;  """, dest='repositoryName', required=False)),
+            (['--repository-name'], dict(help="""(string) 镜像仓库名称。; 可以专有模式如默认命名空间nginx-web-app；或者和命名空间一起将多个仓库聚集在一起如 project-a/nginx-web-app。;  """, dest='repositoryName', required=True)),
             (['--description'], dict(help="""(string) 注册表描述，<a href="https://www.jdcloud.com/help/detail/3870/isCatalog/1">参考公共参数规范</a>。;  """, dest='description', required=False)),
             (['--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)),
@@ -186,7 +219,7 @@ def create_registry(self):
         description='''
             通过参数创建镜像仓库。; 仓库名称可以分解为多个路径名，每个名称必须至少包含一个小写字母数字，考虑URL规范。; 支持包含段划线或者下划线进行分割，但不允许点'.'，多个路径名之间通过("/")连接，总长度不超过256个字符，当前只支持二级目录。; 。
 
-            示例: jdc cr create-repository  --registry-name xxx
+            示例: jdc cr create-repository  --registry-name xxx --repository-name xxx
         ''',
     )
     def create_repository(self):
@@ -209,7 +242,7 @@ def create_repository(self):
 
     @expose(
         arguments=[
-            (['--api'], dict(help="""(string) api name """, choices=['get-authorization-token','describe-images','describe-quotas','create-registry','create-repository',], required=True)),
+            (['--api'], dict(help="""(string) api name """, choices=['get-authorization-token','describe-images','describe-quotas','create-registry','check-registry-name','create-repository',], required=True)),
         ],
         formatter_class=RawTextHelpFormatter,
         help=''' 生成单个API接口的json骨架空字符串 ''',

jdcloud_cli/controllers/services/jke.py

@@ -16,8 +16,10 @@
 #
 # NOTE: This class is auto generated by the jdcloud code generator program.
 
+import os
 from argparse import RawTextHelpFormatter
 from cement.ext.ext_argparse import expose
+from jinja2 import Template
 from jdcloud_cli.controllers.base_controller import BaseController
 from jdcloud_cli.client_factory import ClientFactory
 from jdcloud_cli.parameter_builder import collect_user_args, collect_user_headers
@@ -83,3 +85,67 @@ def describe_quotas(self):
     def generate_skeleton(self):
         skeleton = Skeleton('jke', self.app.pargs.api)
         skeleton.show()
+
+    @expose(
+        arguments=[
+            (['--region-id'], dict(help="""(string) 地域 ID """, dest='regionId', required=False)),
+            (['--cluster-id'], dict(help="""(string) 集群 ID """, dest='clusterId', required=True)),
+            (['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
+        ],
+        formatter_class=RawTextHelpFormatter,
+        help=''' 获取密钥凭证 ''',
+        description='''
+            获取密钥凭证。
+
+            示例: jdc jke get-credential --cluster-id xxx
+        ''',
+    )
+    def get_credential(self):
+        client_factory = ClientFactory('jke')
+        client = client_factory.get(self.app)
+        if client is None:
+            return
+
+        try:
+            from jdcloud_sdk.services.jke.apis.DescribeClusterRequest import DescribeClusterRequest
+            params_dict = collect_user_args(self.app)
+            headers = collect_user_headers(self.app)
+            req = DescribeClusterRequest(params_dict, headers)
+            resp = client.send(req)
+            if resp.error is not None:
+                Printer.print_result(resp)
+            else:
+                current_dir = os.path.dirname(os.path.abspath(__file__))
+                with open('%s/../../resources/jke/config.jinja' % current_dir) as f:
+                    content = f.read()
+
+                template = Template(content)
+                result = template.render(self._build_credential_data(resp.result['cluster']))
+                self._write_credential_file(result)
+                Printer.print_text('Generate cluster credential successfully.')
+
+        except ImportError:
+            print '{"error":"This api is not supported, please use the newer version"}'
+        except Exception as e:
+            print e
+
+    def _build_credential_data(self, cluster):
+        masterAuth = cluster['masterAuth']
+        return {
+            'certificate_authority_data': masterAuth['clusterCaCertificate'],
+            'server': 'https://%s:%s' % (cluster['endpoint'], cluster['endpointPort']),
+            'username': masterAuth['user'],
+            'password': masterAuth['password'],
+            'client_certificate_data': masterAuth['clientCertificate'],
+            'client_key_data': masterAuth['clientKey'],
+            'context_name': 'cert-authentication@kubernetes' if cluster['clientCertificate'] else 'basic-authentication@kubernetes'
+        }
+
+    def _write_credential_file(self, content):
+        home = os.getenv('HOME')
+        kube_dir = '%s/.kube' % home
+        if not os.path.exists(kube_dir):
+            os.mkdir(kube_dir)
+
+        with open('%s/config' % kube_dir, 'w') as f:
+            f.write(content)