Merge pull request #286 from jemygraw/master

reset the kirk api to the previous version

Author: jemygraw

.travis.yml

@@ -12,8 +12,6 @@ install:
 - pip install requests
 - pip install scrutinizer-ocular
 before_script:
-- export QINIU_ACCESS_KEY="QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm"
-- export QINIU_SECRET_KEY="Bxckh6FA-Fbs9Yt3i3cbKVK22UPBmAOHJcL95pGz"
 - export QINIU_TEST_BUCKET="pythonsdk"
 - export QINIU_TEST_DOMAIN="pythonsdk.qiniudn.com"
 - export QINIU_TEST_ENV="travis"

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+# 7.1.8 （2017-10-18）
+* 恢复kirk的API为原来的状态
+
 ## 7.1.7 (2017-09-27)
 
 * 修复从时间戳获取rfc http格式的时间字符串问题

examples/kirk/README.md

@@ -0,0 +1,5 @@
+# Examples
+
+```
+$ python list_apps.py <YOUR_AK> <YOUR_SK>
+```

examples/kirk/list_apps.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+
+import sys
+from qiniu import QiniuMacAuth
+from qiniu import AccountClient
+
+access_key = sys.argv[1]
+secret_key = sys.argv[2]
+
+acc_client = AccountClient(QiniuMacAuth(access_key, secret_key))
+
+ret, info = acc_client.list_apps()
+
+print(ret)
+print(info)
+
+assert len(ret) is not None

examples/kirk/list_services.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+
+import sys
+from qiniu import QiniuMacAuth
+from qiniu import AccountClient
+
+access_key = sys.argv[1]
+secret_key = sys.argv[2]
+
+acc_client = AccountClient(QiniuMacAuth(access_key, secret_key))
+apps, info = acc_client.list_apps()
+
+for app in apps:
+    if app.get('runMode') == 'Private':
+        uri = app.get('uri')
+        qcos = acc_client.get_qcos_client(uri)
+        if qcos != None:
+            stacks, info = qcos.list_stacks()
+            for stack in stacks:
+                stack_name = stack.get('name')
+                services, info = qcos.list_services(stack_name)
+                print("list_services of '%s : %s':"%(uri, stack_name))
+                print(services)
+                print(info)
+                assert len(services) is not None

examples/kirk/list_stacks.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+
+import sys
+from qiniu import QiniuMacAuth
+from qiniu import AccountClient
+
+access_key = sys.argv[1]
+secret_key = sys.argv[2]
+
+acc_client = AccountClient(QiniuMacAuth(access_key, secret_key))
+apps, info = acc_client.list_apps()
+
+for app in apps:
+    if app.get('runMode') == 'Private':
+        uri = app.get('uri')
+        qcos = acc_client.get_qcos_client(uri)
+        if qcos != None:
+            stacks, info = qcos.list_stacks()
+            print("list_stacks of '%s':"%uri)
+            print(stacks)
+            print(info)
+            assert len(stacks) is not None