Enhance download functionality to support RBV2 #2805
Merged
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
oshratZairi
force-pushed
the
downloadRbv2
branch
from
004bebb to
935dc22
Compare
oshratZairi
force-pushed
the
downloadRbv2
branch
from
935dc22 to
5eddf64
Compare
EyalDelarea
requested changes
Dec 31, 2024
artifactory/cli.go
Outdated
| if c.IsSet("bundle") { | ||
| isRbv2, err = checkRbExistenceInV2(c) | ||
| } | ||
| //if the command contains --bundle and the bundle found in rbv2, we will download from rbv2 |
There was a problem hiding this comment.
What happens when the bundle is not in V2? the download commands continues as it as?
And also this is a generic download code with too much RBV2 references, maybe we should extract some logic to a one liner function to avoid it.
I would move this logic inside the prepareDownloadCommand.
There was a problem hiding this comment.
the logic is:
if we have the same rb-name in both rbv1 and rbv2 - we will take rbv2.
if the cmd dose not contain --bundle , it will remain as it is.
moved the logic.
go.mod
Outdated
| @@ -168,6 +168,10 @@ require ( | |||
| gopkg.in/yaml.v3 v3.0.1 // indirect | |||
| ) | |||
|
|
|||
| replace github.com/jfrog/jfrog-cli-core/v2 => ../jfrog-cli-core | |||
There was a problem hiding this comment.
Notice to change replaces before pushing :)
oshratZairi
force-pushed
the
downloadRbv2
branch
from
5eddf64 to
eafc54a
Compare
oshratZairi
force-pushed
the
downloadRbv2
branch
from
eafc54a to
7d9b52b
Compare
oshratZairi
force-pushed
the
downloadRbv2
branch
from
7d9b52b to
c28b293
Compare
oshratZairi
force-pushed
the
downloadRbv2
branch
from
a94debd to
4212def
Compare
oshratZairi
force-pushed
the
downloadRbv2
branch
from
4212def to
1f1b004
Compare
oshratZairi
force-pushed
the
downloadRbv2
branch
from
1f1b004 to
8b5d83f
Compare
oshratZairi
force-pushed
the
downloadRbv2
branch
from
8b5d83f to
c3a69e0
Compare
oshratZairi
force-pushed
the
downloadRbv2
branch
from
c3a69e0 to
8af902a
Compare
oshratZairi
force-pushed
the
downloadRbv2
branch
from
8af902a to
5e2bcdd
Compare
EyalDelarea
requested changes
Jan 9, 2025
artifactory/cli.go
Outdated
| if c.IsSet("spec") { | ||
| downloadSpec, err = cliutils.GetSpec(c, true, true) | ||
| } else { | ||
| downloadSpec, err = createDefaultDownloadSpec(c) | ||
| if c.IsSet("bundle") { |
There was a problem hiding this comment.
Let's remove this check from here and insert this logic inside the createDefaultDownloadSpec function. Since the context is already passed to the function, it can be checked inside.
artifactory_test.go
Outdated
| func TestReleaseBundleImportOnPrem(t *testing.T) { | ||
| // Cleanup | ||
| defer func() { | ||
| deleteReceivedReleaseBundle(t, "cli-tests", "2") | ||
| deleteReceivedReleaseBundle(t, "artifactory/api/release/bundles/", "cli-tests", "2") |
There was a problem hiding this comment.
Can we make the URLs constants with meaningful names so we understand their purposes? The same applies to the URL on line 247.
artifactory_test.go
Outdated
| assert.NoError(t, err) | ||
|
|
||
| // Download RBV2 | ||
| err = artifactoryCli.Exec([]string{"download", "--bundle=" + tests.LcRbName1 + "/" + buildNumber}...) |
There was a problem hiding this comment.
Can we also verify the download succeeded and not just failed? maybe check the existence of the file ?
oshratZairi
force-pushed
the
downloadRbv2
branch
from
5e2bcdd to
6a8be59
Compare
oshratZairi
force-pushed
the
downloadRbv2
branch
from
6a8be59 to
085055a
Compare
EyalDelarea
added
safe to test
github-actions
bot
removed
the
safe to test
EyalDelarea
reviewed
Jan 12, 2025
oshratZairi
force-pushed
the
downloadRbv2
branch
from
d9f618f to
02b64fd
Compare
oshratZairi
force-pushed
the
downloadRbv2
branch
from
02b64fd to
0069352
Compare
EyalDelarea
added
the
safe to test
github-actions
bot
removed
the
safe to test
EyalDelarea
added
the
safe to test
github-actions
bot
removed
the
safe to test
oshratZairi
force-pushed
the
downloadRbv2
branch
from
01541d9 to
6eeefd0
Compare
EyalDelarea
added
the
safe to test
github-actions
bot
removed
the
safe to test
oshratZairi
force-pushed
the
downloadRbv2
branch
from
6eeefd0 to
8c07dbb
Compare
EyalDelarea
added
the
safe to test
github-actions
bot
removed
the
safe to test
EyalDelarea
added
the
safe to test
github-actions
bot
removed
the
safe to test
EyalDelarea
approved these changes
Jan 14, 2025
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.
devbranch.go vet ./....go fmt ./....Enhance download functionality to support RBV2