-
Notifications
You must be signed in to change notification settings - Fork 1.6k
feat:添加模型标签功能 --story=132638579 CMDB模型labels功能分组 #8646
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
elizabevil
wants to merge
1
commit into
TencentBlueKing:v3.14.x
Choose a base branch
from
elizabevil:v3.14.x-feat-labels
base: v3.14.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
src/scene_server/admin_server/upgrader/y3.14.202607151020/add_obj_label_field.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
|
elizabevil marked this conversation as resolved.
|
||
| * Tencent is pleased to support the open source community by making | ||
| * 蓝鲸智云 - 配置平台 (BlueKing - Configuration System) available. | ||
| * Copyright (C) 2017 Tencent. All rights reserved. | ||
| * Licensed under the MIT License (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at http://opensource.org/licenses/MIT | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
| * either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * We undertake not to change the open source license (MIT license) applicable | ||
| * to the current version of the project delivered to anyone in the future. | ||
| */ | ||
|
|
||
| package y3_14_202607151020 | ||
|
|
||
| import ( | ||
|
elizabevil marked this conversation as resolved.
|
||
| "context" | ||
|
|
||
| "configcenter/src/common" | ||
| "configcenter/src/common/blog" | ||
| "configcenter/src/common/metadata" | ||
| "configcenter/src/scene_server/admin_server/upgrader" | ||
| "configcenter/src/storage/dal" | ||
| dbtypes "configcenter/src/storage/dal/types" | ||
|
|
||
| "go.mongodb.org/mongo-driver/bson" | ||
| ) | ||
|
|
||
| // addObjLabelField add bk_labels field and index for object description table | ||
| func addObjLabelField(ctx context.Context, db dal.RDB, _ *upgrader.Config) error { | ||
|
elizabevil marked this conversation as resolved.
|
||
| if err := db.Table(common.BKTableNameObjDes).AddColumn(ctx, metadata.ModelFieldLabels, | ||
| make([]string, 0)); err != nil { | ||
| blog.Errorf("add bk_labels column failed, err: %v", err) | ||
| return err | ||
| } | ||
|
|
||
| bkLabelsIndex := dbtypes.Index{ | ||
| Name: common.CCLogicIndexNamePrefix + "bkLabels", | ||
| Keys: bson.D{ | ||
| {metadata.ModelFieldLabels, 1}, | ||
| }, | ||
| Background: true, | ||
| PartialFilterExpression: map[string]interface{}{ | ||
| metadata.ModelFieldLabels: map[string]string{common.BKDBType: "array"}, | ||
| }, | ||
| } | ||
|
|
||
| existIndexes, err := db.Table(common.BKTableNameObjDes).Indexes(ctx) | ||
| if err != nil { | ||
| blog.Errorf("get obj des indexes failed, err: %v", err) | ||
| return err | ||
| } | ||
|
|
||
| for _, index := range existIndexes { | ||
| if index.Name == bkLabelsIndex.Name { | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| if err := db.Table(common.BKTableNameObjDes).CreateIndex(ctx, bkLabelsIndex); err != nil && | ||
| !db.IsDuplicatedError(err) { | ||
| blog.Errorf("create bk_labels index %+v failed, err: %v", bkLabelsIndex, err) | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.