Skip to content
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

Upload summery - log 'Exceeded maximum number of files in tree' only once #1279

Merged
merged 43 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
bd80ddd
metadata
sverdlov93 Aug 25, 2024
596a766
metadata
sverdlov93 Aug 25, 2024
83cdb96
Merge branch 'dev' into fix-template
sverdlov93 Aug 26, 2024
130c814
Merge branch 'dev' into fix-template
sverdlov93 Aug 26, 2024
3565983
metadata
sverdlov93 Aug 28, 2024
511132a
Merge remote-tracking branch 'sverdlov93/fix-template' into fix-template
sverdlov93 Aug 28, 2024
e13f31e
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli-core into fi…
sverdlov93 Aug 28, 2024
e92075b
metadata
sverdlov93 Aug 28, 2024
feac980
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli-core into fi…
sverdlov93 Aug 29, 2024
0646e8e
metadata
sverdlov93 Aug 29, 2024
42686b8
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli-core into fi…
sverdlov93 Sep 5, 2024
12bee92
metadata
sverdlov93 Sep 5, 2024
ea701bf
metadata
sverdlov93 Sep 5, 2024
2a13aa6
Remove redundant log
sverdlov93 Sep 8, 2024
cac58da
Remove redundant log
sverdlov93 Sep 8, 2024
3a3fe87
Remove redundant log
sverdlov93 Sep 8, 2024
ed6b3d2
Remove redundant log
sverdlov93 Sep 8, 2024
45b1e18
Remove redundant log
sverdlov93 Sep 8, 2024
c5eaad2
Remove redundant log
sverdlov93 Sep 8, 2024
0d0241a
Remove redundant log
sverdlov93 Sep 8, 2024
9f04ee3
Remove redundant log
sverdlov93 Sep 9, 2024
9906505
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli-core into fi…
sverdlov93 Sep 9, 2024
2e464c7
Remove redundant log
sverdlov93 Sep 9, 2024
dcd034a
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli-core into fi…
sverdlov93 Sep 9, 2024
099ae81
Remove redundant log
sverdlov93 Sep 9, 2024
5856ad9
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli-core into fi…
sverdlov93 Sep 12, 2024
4edd481
Remove redundant log
sverdlov93 Sep 12, 2024
b612100
Remove redundant log
sverdlov93 Sep 12, 2024
5c3a7f7
Remove redundant log
sverdlov93 Sep 12, 2024
d6dbc56
Remove redundant log
sverdlov93 Sep 12, 2024
d3bfe11
Remove redundant log
sverdlov93 Sep 12, 2024
6e90b66
Remove redundant log
sverdlov93 Sep 15, 2024
f1c2bbd
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli-core into fi…
sverdlov93 Sep 17, 2024
41aa3e8
Remove redundant log
sverdlov93 Sep 17, 2024
64b7b91
Remove redundant log
sverdlov93 Sep 17, 2024
b205894
Remove redundant log
sverdlov93 Sep 17, 2024
3c71af3
Remove redundant log
sverdlov93 Sep 18, 2024
24ef29a
Remove redundant log
sverdlov93 Oct 7, 2024
ba8bebc
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli-core into fi…
sverdlov93 Oct 7, 2024
3691e30
Remove redundant log
sverdlov93 Oct 7, 2024
b72be6c
Remove redundant log
sverdlov93 Oct 7, 2024
e99595c
Remove redundant log
sverdlov93 Oct 7, 2024
8444dbb
Remove redundant log
sverdlov93 Oct 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions artifactory/utils/commandsummary/buildinfosummary.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ func (bis *BuildInfoSummary) createArtifactsTree(module *buildInfo.Module) strin
}
artifactTreePath := path.Join(artifact.OriginalDeploymentRepo, artifact.Path)
artifactsTree.AddFile(artifactTreePath, artifactUrlInArtifactory)
if artifactsTree.IsTreeExceedsMax() {
return ""
}
}
return artifactsTree.String()
}
Expand Down
3 changes: 3 additions & 0 deletions artifactory/utils/commandsummary/uploadsummary.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ func (us *UploadSummary) generateFileTreeMarkdown() string {
us.uploadTree = utils.NewFileTree()
for _, uploadResult := range us.uploadedArtifacts.Results {
us.uploadTree.AddFile(uploadResult.TargetPath, us.buildUiUrl(uploadResult.TargetPath))
if us.uploadTree.IsTreeExceedsMax() {
return ""
}
}
return us.uploadTree.String()
}
Expand Down
21 changes: 10 additions & 11 deletions artifactory/utils/filetree.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ var maxFilesInTree = 200

// FileTree is a UI components that displays a file-system tree view in the terminal.
type FileTree struct {
repos map[string]*dirNode
size int
exceedsMax bool
repos map[string]*dirNode
size int
}

func NewFileTree() *FileTree {
Expand All @@ -25,11 +24,6 @@ func NewFileTree() *FileTree {
// UploadedFileUrl - URL to the uploaded file in Artifactory,
// if UploadedFileUrl not provided, the file name will be displayed without a link.
func (ft *FileTree) AddFile(path, uploadedFileUrl string) {
if ft.size >= maxFilesInTree {
log.Info("Exceeded maximum number of files in tree")
ft.exceedsMax = true
return
}
splitPath := strings.Split(path, "/")
if _, exist := ft.repos[splitPath[0]]; !exist {
ft.repos[splitPath[0]] = &dirNode{name: splitPath[0], prefix: "📦 ", subDirNodes: map[string]*dirNode{}, fileNames: map[string]string{}}
Expand All @@ -39,11 +33,16 @@ func (ft *FileTree) AddFile(path, uploadedFileUrl string) {
}
}

func (ft *FileTree) IsTreeExceedsMax() bool {
if ft.size >= maxFilesInTree {
log.Info(fmt.Sprintf("Exceeded maximum number (%d) of files in files tree.", maxFilesInTree))
return true
}
return false
}

// Returns a string representation of the tree. If the number of files exceeded the maximum, an empty string will be returned.
func (ft *FileTree) String() string {
if ft.exceedsMax {
return ""
}
treeStr := ""
for _, repo := range ft.repos {
treeStr += strings.Join(repo.strings(), "\n") + "\n\n"
Expand Down
Loading