Merge pull request #8186 from wcy00000000000000/v3.13.x-sync

删除临时的带ID新增数据的API

Author: ZQHcode

docs/apidoc/apigw/backend/bk_apigw_resources_bk-cmdb.yaml

@@ -5878,33 +5878,3 @@ paths:
           userVerifiedRequired: false
         disabledStages: []
         descriptionEn:
-  /api/v3/synchronize/create/data:
-    post:
-      operationId: create_synchronize_data
-      description: 新增同步数据
-      responses:
-        default:
-          description: ''
-      x-bk-apigateway-resource:
-        isPublic: false
-        allowApplyPermission: false
-        matchSubpath: false
-        backend:
-          type: HTTP
-          method: post
-          path: /api/v3/synchronize/create/data
-          matchSubpath: false
-          timeout: 0
-          upstreams: {}
-          transformHeaders: {}
-        pluginConfigs:
-          - type: bk-rate-limit
-            yaml: |
-              rates:
-                __default:
-                - period: 1
-                  tokens: 100
-        authConfig:
-          userVerifiedRequired: false
-        disabledStages: []
-        descriptionEn:

pkg/synchronize/types/protocol.go

@@ -19,42 +19,10 @@
 package types
 
 import (
-	"encoding/json"
-
 	"configcenter/src/common"
 	"configcenter/src/common/errors"
 )
 
-// CreateSyncDataOption defines create sync data option
-type CreateSyncDataOption struct {
-	ResourceType ResType           `json:"resource_type"`
-	SubResource  string            `json:"sub_resource"`
-	Data         []json.RawMessage `json:"data"`
-}
-
-// Validate create sync data option
-func (o *CreateSyncDataOption) Validate() errors.RawErrorInfo {
-	if rawErr := o.ResourceType.Validate(o.SubResource); rawErr.ErrCode != 0 {
-		return rawErr
-	}
-
-	if len(o.Data) == 0 {
-		return errors.RawErrorInfo{
-			ErrCode: common.CCErrCommParamsNeedSet,
-			Args:    []interface{}{"data"},
-		}
-	}
-
-	if len(o.Data) > common.BKMaxLimitSize {
-		return errors.RawErrorInfo{
-			ErrCode: common.CCErrCommXXExceedLimit,
-			Args:    []interface{}{"data", common.BKMaxLimitSize},
-		}
-	}
-
-	return errors.RawErrorInfo{}
-}
-
 // SyncCmdbDataOption defines sync cmdb data option
 type SyncCmdbDataOption struct {
 	ResType ResType          `json:"resource_type"`

src/ac/iam/adaptor.go

@@ -105,7 +105,6 @@ var ccIamResTypeMap = map[meta.ResourceType]TypeID{
 	meta.KubeContainer:            TypeID(""),
 	meta.FieldTemplate:            FieldGroupingTemplate,
 	meta.FulltextSearch:           TypeID(""),
-	meta.SynchronizeData:          TypeID(""),
 }
 
 // ConvertResourceType convert resource type from CMDB to IAM
@@ -594,9 +593,6 @@ var resourceActionMap = map[meta.ResourceType]map[meta.Action]ActionID{
 		meta.Update: EditFieldGroupingTemplate,
 		meta.Delete: DeleteFieldGroupingTemplate,
 	},
-	meta.SynchronizeData: {
-		meta.Create: SynchronizeData,
-	},
 }
 
 // ParseIamPathToAncestors TODO

src/ac/iam/gen_id.go

@@ -57,7 +57,6 @@ var genIamResFuncMap = map[meta.ResourceType]func(ActionID, TypeID, *meta.Resour
 	meta.HostInstance:             genHostInstanceResource,
 	meta.ProcessServiceCategory:   genProcessServiceCategoryResource,
 	meta.FieldTemplate:            genFieldTemplateResource,
-	meta.SynchronizeData:          genSkipResource,
 }
 
 // GenIamResource TODO

src/ac/iam/initial_action_groups.go

@@ -429,15 +429,6 @@ func genResourceManageActionGroups() []ActionGroup {
 						},
 					},
 				},
-				{
-					Name:   "CMDB数据同步",
-					NameEn: "Synchronize Data",
-					Actions: []ActionWithID{
-						{
-							ID: SynchronizeData,
-						},
-					},
-				},
 			},
 		},
 	}

src/ac/iam/initial_actions.go

@@ -154,7 +154,6 @@ var ActionIDNameMap = map[ActionID]string{
 	ViewFieldGroupingTemplate:           "字段组合模板查看",
 	EditFieldGroupingTemplate:           "字段组合模板编辑",
 	DeleteFieldGroupingTemplate:         "字段组合模板删除",
-	SynchronizeData:                     "CMDB数据同步",
 }
 
 // GenerateActions generate all the actions registered to IAM.
@@ -200,7 +199,6 @@ func GenerateStaticActions() []ResourceAction {
 	resourceActionList = append(resourceActionList, genContainerManagementActions()...)
 	resourceActionList = append(resourceActionList, genFulltextSearchActions()...)
 	resourceActionList = append(resourceActionList, genFieldGroupingTemplateActions()...)
-	resourceActionList = append(resourceActionList, genSynchronizeDataActions()...)
 
 	return resourceActionList
 }
@@ -1746,13 +1744,3 @@ func genFieldGroupingTemplateActions() []ResourceAction {
 		},
 	}
 }
-
-func genSynchronizeDataActions() []ResourceAction {
-	return []ResourceAction{{
-		ID:      SynchronizeData,
-		Name:    ActionIDNameMap[SynchronizeData],
-		NameEn:  "Synchronize Data",
-		Type:    Edit,
-		Version: 1,
-	}}
-}

src/ac/iam/types.go

@@ -540,9 +540,6 @@ const (
 	// UseFulltextSearch use fulltext search
 	UseFulltextSearch ActionID = "use_fulltext_search"
 
-	// SynchronizeData is cmdb synchronize data action id
-	SynchronizeData ActionID = "synchronize_data"
-
 	// Unsupported TODO
 	// Unknown is an action that can not be recognized
 	Unsupported ActionID = "unsupported"

src/ac/meta/resource.go

@@ -67,9 +67,6 @@ const (
 	Project                  ResourceType = "project"
 	FulltextSearch           ResourceType = "fulltextSearch"
 	FieldTemplate            ResourceType = "fieldTemplate"
-
-	// SynchronizeData is cmdb synchronize data auth resource type in CMDB
-	SynchronizeData ResourceType = "synchronize_data"
 )
 
 // kube related auth resource in CMDB

src/apimachinery/coreservice/synchronize/api.go

@@ -16,8 +16,6 @@ import (
 	"context"
 	"net/http"
 
-	"configcenter/pkg/synchronize/types"
-	"configcenter/src/common/errors"
 	"configcenter/src/common/metadata"
 )
 
@@ -116,28 +114,3 @@ func (sync *synchronize) SetIdentifierFlag(ctx context.Context, h http.Header,
 		Into(resp)
 	return
 }
-
-// CreateSyncData create sync data
-func (sync *synchronize) CreateSyncData(ctx context.Context, h http.Header,
-	opt *types.CreateSyncDataOption) errors.CCErrorCoder {
-
-	ret := new(metadata.BaseResp)
-	subPath := "/synchronize/create/data"
-
-	err := sync.client.Post().
-		WithContext(ctx).
-		Body(opt).
-		SubResourcef(subPath).
-		WithHeaders(h).
-		Do().
-		Into(ret)
-
-	if err != nil {
-		return errors.CCHttpError
-	}
-	if ret.CCError() != nil {
-		return ret.CCError()
-	}
-
-	return nil
-}

src/apimachinery/coreservice/synchronize/synchronize.go

@@ -17,9 +17,7 @@ import (
 	"context"
 	"net/http"
 
-	"configcenter/pkg/synchronize/types"
 	"configcenter/src/apimachinery/rest"
-	"configcenter/src/common/errors"
 	"configcenter/src/common/metadata"
 )
 
@@ -37,8 +35,6 @@ type SynchronizeClientInterface interface {
 		input *metadata.SynchronizeClearDataParameter) (resp *metadata.Response, err error)
 	SetIdentifierFlag(ctx context.Context, h http.Header,
 		input *metadata.SetIdenifierFlag) (resp *metadata.SynchronizeResult, err error)
-
-	CreateSyncData(ctx context.Context, h http.Header, opt *types.CreateSyncDataOption) errors.CCErrorCoder
 }
 
 // NewSynchronizeClientInterface new public api