Cleanup enhancement #1009
Open
Cleanup enhancement #1009
Conversation
This file contains 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
wenyingd
force-pushed
the
cleanup_enhancement
branch
2 times, most recently
from
d776fe1 to
2b12a1d
Compare
wenyingd
force-pushed
the
cleanup_enhancement
branch
4 times, most recently
from
89d24fe to
ae03ceb
Compare
wenyingd
force-pushed
the
cleanup_enhancement
branch
from
ae03ceb to
86367da
Compare
TaoZou1
reviewed
Jan 26, 2025
|
|
||
| func (p *PolicyResourcePath[T]) Length() int { | ||
| resourceTypes := ([]PolicyResourceType)(*p) | ||
| return len(resourceTypes) |
pkg/nsx/services/common/store.go
Outdated
| } | ||
|
|
||
| func getVPCPathFromResourcePath(path string) ([]string, error) { | ||
| resInfo, err := ParseVPCResourcePath(path) |
There was a problem hiding this comment.
may parse the vpcPath directly:
func ParseVPCPathFromResourcePath(nsxResourcePath string) (VPCPath string, err error) {
reExp := regexp.MustCompile((/orgs/([^/]+)/projects/([^/]+)/vpcs/([^/]+))([/\S+]*))
matches := reExp.FindStringSubmatch(nsxResourcePath)
if len(matches) != 6 {
err := fmt.Errorf("invalid path '%s'", nsxResourcePath)
return "", err
}
return matches[1], nil
| if len(objects) == 0 { | ||
| return nil | ||
| } | ||
| fmt.Println(b.rootType, b.leafType, "count", len(objects)) |
| func PagingNSXResources[T any](resources []T, pageSize int) [][]T { | ||
| totalCount := len(resources) | ||
| pages := (totalCount + pageSize - 1) / pageSize | ||
| pagedResources := make([][]T, 0) |
| leafWrapper LeafDataWrapper[T] | ||
| pathGetter GetPath[T] | ||
| idGetter GetId[T] | ||
|
|
There was a problem hiding this comment.
why the three function defined as a property?
| } | ||
|
|
||
| func wrapInfra(children []*data.StructValue) *model.Infra { | ||
| // This is the outermost layer of the hierarchy infra client. |
There was a problem hiding this comment.
wrapInfra data.StructValue-> model.Infra
WrapVPC model.Vpc-> data.StructValue.
but they have the same WrapXXX name?
| } | ||
|
|
||
| func PagingDeleteResources[T any](ctx context.Context, builder *PolicyTreeBuilder[T], objs []T, pageSize int, nsxClient *nsx.Client, delFn func(deletedObjs []T)) error { | ||
| if len(objs) == 0 { |
There was a problem hiding this comment.
name delFun to deleteObjectsFromStore?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This change is trying to use HAPI in cleanup logic, and remove unnecessary NSX API calls if a VPC is already deleted recursively. It also introduces the VPC deletion in parallel.
Test Done: