Merge pull request #2790 from TencentBlueKing/develop

Develop
TencentBlueKing · Aug 22, 2024 · ed664a8 · ed664a8
2 parents 12cc4e3 + f08f2db
commit ed664a8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 62 deletions.
diff --git a/saas/VERSION b/saas/VERSION
@@ -1 +1 @@
-1.10.31
+1.10.32
diff --git a/saas/resources/apigateway/bk_apigw_resources_bk-iam.yaml b/saas/resources/apigateway/bk_apigw_resources_bk-iam.yaml
@@ -3264,7 +3264,6 @@ paths:
       description: 超管用户组添加成员
       tags:
       - open
-      - v2
       responses:
         default:
           description: ''
@@ -3285,9 +3284,10 @@ paths:
           resourcePermissionRequired: false
         disabledStages: []
         descriptionEn:
-    post:
-      operationId: admin_groups_policies_grant
-      description: 超管授权用户组
+  /api/v1/open/admin/systems/{system_id}/provider_config/:
+    get:
+      operationId: admin_list_provider_config
+      description: 系统回调信息查询
       tags:
         - open
       responses:
@@ -3299,8 +3299,8 @@ paths:
         matchSubpath: false
         backend:
           type: HTTP
-          method: post
-          path: /api/v1/open/admin/groups/{id}/policies/
+          method: get
+          path: /api/v1/open/admin/systems/{system_id}/provider_config/
           matchSubpath: false
           timeout: 0
           upstreams: { }
@@ -3310,10 +3310,10 @@ paths:
           resourcePermissionRequired: false
         disabledStages: [ ]
         descriptionEn:
-  /api/v1/open/admin/systems/{system_id}/provider_config/:
+  /api/v1/open/admin/templates/:
     get:
-      operationId: admin_list_provider_config
-      description: 系统回调信息查询
+      operationId: admin_list_templates
+      description: 超管获取模板列表
       tags:
         - open
       responses:
@@ -3326,7 +3326,7 @@ paths:
         backend:
           type: HTTP
           method: get
-          path: /api/v1/open/admin/systems/{system_id}/provider_config/
+          path: /api/v1/open/admin/templates/
           matchSubpath: false
           timeout: 0
           upstreams: { }
@@ -3336,7 +3336,6 @@ paths:
           resourcePermissionRequired: false
         disabledStages: [ ]
         descriptionEn:
-  /api/v1/open/admin/templates/:
     post:
       operationId: admin_create_templates
       description: 超管创建模板
@@ -3446,53 +3445,3 @@ paths:
           resourcePermissionRequired: false
         disabledStages: [ ]
         descriptionEn:
-      get:
-          operationId: admin_list_templates
-          description: 超管获取模板列表
-          tags:
-              - open
-          responses:
-              default:
-                  description: ''
-          x-bk-apigateway-resource:
-              isPublic: true
-              allowApplyPermission: true
-              matchSubpath: false
-              backend:
-                  type: HTTP
-                  method: get
-                  path: /api/v1/open/admin/templates/
-                  matchSubpath: false
-                  timeout: 0
-                  upstreams: { }
-                  transformHeaders: { }
-              authConfig:
-                  userVerifiedRequired: false
-                  resourcePermissionRequired: false
-              disabledStages: [ ]
-              descriptionEn:
-      post:
-          operationId: admin_create_templates
-          description: 超管创建模板
-          tags:
-              - open
-          responses:
-              default:
-                  description: ''
-          x-bk-apigateway-resource:
-              isPublic: true
-              allowApplyPermission: true
-              matchSubpath: false
-              backend:
-                  type: HTTP
-                  method: post
-                  path: /api/v1/open/admin/templates/
-                  matchSubpath: false
-                  timeout: 0
-                  upstreams: { }
-                  transformHeaders: { }
-              authConfig:
-                  userVerifiedRequired: false
-                  resourcePermissionRequired: false
-              disabledStages: [ ]
-              descriptionEn:
diff --git a/saas/resources/version_log/change_log.md b/saas/resources/version_log/change_log.md
@@ -1,3 +1,12 @@
+<!-- 2024-08-22 -->
+# V1.10.32 版本更新日志
+
+### 缺陷修复
+
+* 修复 apigw 资源定义 yaml 错误
+
+---
+
 <!-- 2024-08-22 -->
 # V1.10.31 版本更新日志
 

diff --git a/saas/resources/version_log/change_log_en.md b/saas/resources/version_log/change_log_en.md
@@ -1,3 +1,12 @@
+<!-- 2024-08-22 -->
+# V1.10.32 Version Update Log
+
+### Bug Fixes
+
+* Fixed apigw resource definition yaml error
+
+---
+
 <!-- 2024-08-22 -->
 # V1.10.31 Version Update Log