actions/mark
1
0
Fork 0
mirror of https://github.com/kovetskiy/mark.git synced 2026-05-04 06:22:35 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

do not require full ancestry, improve dry-run mode

Browse Source
This commit is contained in:
Egor Kovetskiy
2020-01-03 23:05:14 +03:00
parent bc647bf5f1
commit 95f50c1a34
5 changed files with 92 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/mark/mark.go
View File

@@ -9,12 +9,13 @@ import (
)
func ResolvePage(
dryRun bool,
api *confluence.API,
meta *Meta,
) (*confluence.PageInfo, error) {
) (*confluence.PageInfo, *confluence.PageInfo, error) {
page, err := api.FindPage(meta.Space, meta.Title)
if err != nil {
return nil, karma.Format(
return nil, nil, karma.Format(
err,
"error while finding page %q",
meta.Title,
@@ -33,7 +34,7 @@ func ResolvePage(
ancestry,
)
if err != nil {
return nil, err
return nil, nil, err
}
if page == nil {
@@ -55,12 +56,13 @@ func ResolvePage(
}
parent, err := EnsureAncestry(
dryRun,
api,
meta.Space,
meta.Parents,
)
if err != nil {
return nil, karma.Format(
return nil, nil, karma.Format(
err,
"can't create ancestry tree: %s",
strings.Join(meta.Parents, ` > `),
@@ -81,5 +83,5 @@ func ResolvePage(
meta.Title,
)
return page, nil
return parent, page, nil
}