Merge pull request KscSDK#22 from liuyichen/master

金山云SDK · web-flow · commit e8e7c3a45859 · 2017-01-11T20:03:10.000+08:00
1.0.8版本更新
diff --git a/README.rst b/README.rst
@@ -9,7 +9,7 @@ Install 安装
 ----------------
 
 + pip 安装
-    + pip install kscore
+    + pip install ksc-sdk-python
 
 + github 安装
     + 通过 `GitHub <https://github.com/liuyichen/kscore>`__ 下载
@@ -62,27 +62,33 @@ Service 服务
     | cn-shanghai-2     | 上海2区    |
     +-------------------+------------+
 
-+ 服务列表 service_name， `详情参考API手册 <http://docs.ksyun.com>`__
 
-    +-------------------+------------+
-    | service_name      | 服务名     |
-    +===================+============+
-    | iam               |            |
-    +-------------------+------------+
-    | eip               |            |
-    +-------------------+------------+
-    | kec               |            |
-    +-------------------+------------+
-    | slb               |            |
-    +-------------------+------------+
-    | vpc               |            |
-    +-------------------+------------+
-    | monitor           |            |
-    +-------------------+------------+
-    | offline           |            |
-    +-------------------+------------+
-    | cdn               |            |
-    +-------------------+------------+    
++ 已支持服务列表 service_name，具体方法与API的Action对应,如kec服务RunInstances对应为run_instances方法。 `详情参考API手册 <http://docs.ksyun.com>`__
+
+    +-------------------+----------------+
+    | service           | 服务名         |
+    +===================+================+
+    | iam               | 身份与访问控制 |
+    +-------------------+----------------+
+    | eip               | 弹性IP         |
+    +-------------------+----------------+
+    | kec               | 云服务器       |
+    +-------------------+----------------+
+    | tag               | 标签服务       |
+    +-------------------+----------------+
+    | slb               | 负载均衡       |
+    +-------------------+----------------+
+    | kcs               | REDIS          |
+    +-------------------+----------------+
+    | vpc               | 虚拟私有网络   |
+    +-------------------+----------------+
+    | cdn               | 内容分发网络   |
+    +-------------------+----------------+
+    | monitor           | 云监控         |
+    +-------------------+----------------+
+    | offline           | 视频转码       |
+    +-------------------+----------------+
+
 
 ----------------
 Method 方法
diff --git a/examples/tag.py b/examples/tag.py
@@ -0,0 +1,11 @@
+# -*- encoding:utf-8 -*-
+
+from kscore.session import get_session
+
+if __name__ == "__main__":
+
+    s = get_session()
+
+    client = s.create_client("tag", region_name="cn-beijing-6", use_ssl=True)
+
+    print client.describe_tags()
diff --git a/kscore/__init__.py b/kscore/__init__.py
@@ -16,7 +16,7 @@
 import re
 import logging
 
-__version__ = '1.0.7'
+__version__ = '1.0.8'
 
 
 class NullHandler(logging.Handler):
diff --git a/kscore/data/endpoints.yaml b/kscore/data/endpoints.yaml
@@ -72,7 +72,6 @@ partitions:
       defaults:
         credentialScope:
           service: kec
-      EndpointRegion: cn-beijing-6
       endpoints:
         cn-beijing-6:
           protocols:
@@ -134,6 +133,20 @@ partitions:
           protocols:
           - http
 
+    tag:
+      defaults:
+        credentialScope:
+          service: tag
+      endpoints:
+        cn-beijing-6:
+          protocols:
+          - http
+          - https
+        cn-shanghai-2:
+          protocols:
+          - http
+          - https
+
     cdn:
       defaults:
         protocols:
@@ -144,4 +157,5 @@ partitions:
       partitionEndpoint: cn-shanghai-1
       endpoints:
         cn-shanghai-1:
-          hostname: cdn.api.ksyun.com
+          hostname: cdn.api.ksyun.com
+
diff --git a/kscore/data/tag/2016-03-04/service-2.yaml b/kscore/data/tag/2016-03-04/service-2.yaml
@@ -0,0 +1,27 @@
+---
+version: '2.0'
+metadata:
+  apiVersion: '2016-03-04'
+  endpointPrefix: tag
+  jsonVersion: '1.1'
+  serviceFullName: Tag Service
+  signatureVersion: v4
+  targetPrefix: tag
+  protocol: query-json
+
+operations:
+  CreateTags:
+    http:
+      method: GET
+  DeleteTags:
+    http:
+      method: GET
+  DescribeTags:
+    http:
+      method: GET    
+  DescribeTagValues:
+    http:
+      method: GET
+  DescribeTagKeys:
+    http:
+      method: GET
