Merge pull request #132 from TencentBlueKing/develop

Develop V1.5.1

frontend/package.json

@@ -22,7 +22,7 @@
     "lint:fix": "eslint --fix ./src ./build --ext .js,.ts,.tsx,.vue",
     "postinstall1": "cd ../ && husky install && npx husky add .husky/commit-msg 'npx --no-install commitlint --edit \"$1\"'",
     "prepare1": "cd .. && husky install frontend/.husky",
-    "postinstall": "cd .. && husky install frontend/.husky && cd frontend && npx husky add .husky/commit-msg 'npx --no-install commitlint --edit \"$1\"'"
+    "add-husky": "cd .. && husky install frontend/.husky && cd frontend && npx husky add .husky/commit-msg 'npx --no-install commitlint --edit \"$1\"'"
   },
   "keywords": [],
   "license": "ISC",

readme.md

@@ -31,8 +31,7 @@
 
 ## Roadmap
 
-- [SaaS版本日志](./saas/release.md)
-- [frontend版本日志](./frontend/release.md)
+- [版本日志](./release.md)
 
 ## Backend & SDK
 

readme_en.md

@@ -31,8 +31,7 @@ BK-IAM is a universal permission control product developed based on ABAC(a power
 
 ## Roadmap
 
-- [SaaS release log](./saas/release.md)
-- [frontend release log](./frontend/release.md)
+- [release log](./release.md)
 
 ## Backend & SDK
 

saas/release.md → release.md

@@ -1,3 +1,8 @@
+# V1.5.1
+
+### 缺陷修复
+* 修复新建关联授权API由于注册的配置里存在资源类型层级导致失败问题
+
 # V1.5.0
 
 ### 功能优化
@@ -212,4 +217,4 @@
 * 一些已知问题优化
 
 ### 缺陷修复
-* 一些已知问题修复
+* 一些已知问题修复

saas/VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

saas/backend/biz/resource_creator_action.py

@@ -60,9 +60,8 @@ def _tiled_resource_creator_action(
             )
             if config_item.sub_resource_types is None:
                 continue
-            # 遍历子资源类型
-            for sub_rca_config in config_item.sub_resource_types:
-                sub_rac_beans = self._tiled_resource_creator_action(sub_rca_config)
-                rac_beans.extend(sub_rac_beans)
+            # 处理子资源类型的
+            sub_rac_beans = self._tiled_resource_creator_action(config_item.sub_resource_types)
+            rac_beans.extend(sub_rac_beans)
 
         return rac_beans

saas/config/default.py

@@ -339,3 +339,6 @@
 ENABLE_FRONT_END_FEATURES = {
     "enable_model_build": os.environ.get("BKAPP_ENABLE_FRONT_END_MODEL_BUILD", "False").lower() == "true"
 }
+
+# 是否是smart部署方式
+IS_SMART_DEPLOY = os.environ.get("BKAPP_IS_SMART_DEPLOY", "True").lower() == "true"

saas/pyproject.toml

@@ -90,7 +90,7 @@ drf-yasg = "1.17.1"
 dataclasses = "0.7"
 pydantic = "1.6.2"
 PyJWT = "1.7.1"
-cryptography = "3.2"
+cryptography = "3.3.2"
 django-prometheus = "2.0.0"
 pytz = "2020.1"
 aenum = "2.2.6"

saas/requirements.txt

@@ -4,11 +4,11 @@ anyjson==0.3.3
 billiard==3.3.0.23
 celery==3.1.25
 certifi==2021.5.30; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
-cffi==1.14.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+cffi==1.14.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
 charset-normalizer==2.0.4; python_full_version >= "3.6.0" and python_version >= "3"
 coreapi==2.3.3; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
 coreschema==0.0.4; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
-cryptography==3.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
+cryptography==3.3.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0")
 dataclasses==0.7; python_version >= "3.6" and python_version < "3.7"
 decorator==5.0.9; python_version >= "3.5"
 django-celery==3.2.1
@@ -33,7 +33,7 @@ markupsafe==1.1.1; (python_version >= "2.7" and python_full_version < "3.0.0") o
 mysqlclient==2.0.1; python_version >= "3.5"
 packaging==21.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
 prometheus-client==0.11.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
-pycparser==2.20; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+pycparser==2.20; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
 pydantic==1.6.2; python_version >= "3.6"
 pyinstrument-cext==0.2.4
 pyinstrument==3.1.3
@@ -48,6 +48,6 @@ ruamel.yaml==0.17.10; python_version >= "3" and python_full_version < "3.0.0" or
 six==1.15.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")
 sqlparse==0.4.1; python_version >= "3.5"
 uritemplate==3.0.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
-urllib3==1.25.11; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4"
+urllib3==1.26.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4"
 werkzeug==1.0.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 whitenoise==5.1.0; python_version >= "3.5" and python_version < "4"

saas/requirements_dev.txt

@@ -8,14 +8,14 @@ billiard==3.3.0.23
 black==21.7b0; python_full_version >= "3.6.2"
 celery==3.1.25
 certifi==2021.5.30; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
-cffi==1.14.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+cffi==1.14.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
 charset-normalizer==2.0.4; python_full_version >= "3.6.0" and python_version >= "3"
 click==8.0.1; python_version >= "3.6" and python_full_version >= "3.6.2"
 colorama==0.4.4; sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.6.2" and platform_system == "Windows"
 converge==0.9.8
 coreapi==2.3.3; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
 coreschema==0.0.4; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
-cryptography==3.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
+cryptography==3.3.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0")
 dataclasses==0.7; python_version >= "3.6" and python_version < "3.7"
 decorator==5.0.9; python_version >= "3.5"
 django-celery==3.2.1
@@ -54,7 +54,7 @@ pluggy==0.13.1; python_version >= "3.6" and python_full_version < "3.0.0" or pyt
 prometheus-client==0.11.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
 py==1.10.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 pycodestyle==2.7.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
-pycparser==2.20; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+pycparser==2.20; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0"
 pydantic==1.6.2; python_version >= "3.6"
 pyflakes==2.3.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
 pyinstrument-cext==0.2.4
@@ -83,7 +83,7 @@ types-requests==2.25.6
 types-six==0.1.9
 typing-extensions==3.10.0.0; python_version < "3.8" and python_full_version >= "3.6.2" and python_version >= "3.6"
 uritemplate==3.0.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
-urllib3==1.25.11; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4"
+urllib3==1.26.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4"
 werkzeug==1.0.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0")
 whitenoise==5.1.0; python_version >= "3.5" and python_version < "4"
 zipp==3.5.0; python_version < "3.8" and python_version >= "3.6"

saas/resources/version_log/V1.5.1_2021-09-09.md

@@ -0,0 +1,4 @@
+# V1.5.1 版本更新日志
+
+### 缺陷修复
+* 修复新建关联授权API由于注册的配置里存在资源类型层级导致失败问题

saas/resources/version_log/V1.5.1_2021-09-09_en.md

@@ -0,0 +1,4 @@
+# V1.5.1 ChangeLog
+
+### Bug Fixes
+* Fixed the issue that the newly created association authorization API failed due to the resource type hierarchy in the registered configuration

saas/urls.py

@@ -72,8 +72,10 @@
         url(r"^swagger/$", schema_view.with_ui("swagger", cache_timeout=0), name="schema-swagger-ui"),
     ]
 
-# static file
-urlpatterns += [
-    url(r"^login_success/", never_cache(LoginSuccessView.as_view())),
-    url(r"^.*$", never_cache(VueTemplateView.as_view())),
-]
+# if deploy use smart, need staticfiles
+if settings.IS_SMART_DEPLOY:
+    # static file
+    urlpatterns += [
+        url(r"^login_success/", never_cache(LoginSuccessView.as_view())),
+        url(r"^.*$", never_cache(VueTemplateView.as_view())),
+    ]