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

Start Progress Bar with 1 Filler (🟦) to avoid initial empty display #1263

Merged
merged 32 commits into from
Sep 15, 2024
Merged
Changes from 1 commit
Commits
Show all changes
32 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
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
Prev Previous commit
Next Next commit
metadata
Signed-off-by: Michael Sverdlov <michaelsv@jfrog.com>
sverdlov93 committed Aug 25, 2024
commit 596a766f5d17452488b19bc7db9c67c844a7b492
2 changes: 1 addition & 1 deletion artifactory/commands/transferfiles/localgeneratedfilter.go
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ type locallyGeneratedFilter struct {
func NewLocallyGenerated(context context.Context, serviceManager artifactory.ArtifactoryServicesManager, artifactoryVersion string) *locallyGeneratedFilter {
serviceDetails := serviceManager.GetConfig().GetServiceDetails()
httpDetails := serviceDetails.CreateHttpClientDetails()
utils.SetContentType("application/json", &httpDetails.Headers)
httpDetails.SetContentTypeApplicationJson()

enabled := version.NewVersion(artifactoryVersion).AtLeast(minArtifactoryVersionForLocallyGenerated)
log.Debug("Locally generated filter enabled:", enabled)
10 changes: 5 additions & 5 deletions artifactory/commands/transferfiles/srcpluginservice.go
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ import (
"encoding/json"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/transferfiles/api"
commandsUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
"github.com/jfrog/jfrog-client-go/artifactory/services/utils"
"github.com/jfrog/jfrog-client-go/auth"
"github.com/jfrog/jfrog-client-go/http/jfroghttpclient"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
@@ -49,7 +48,7 @@ func (sup *srcUserPluginService) syncChunks(ucStatus api.UploadChunksStatusBody)
}

httpDetails := sup.GetArtifactoryDetails().CreateHttpClientDetails()
utils.SetContentType("application/json", &httpDetails.Headers)
httpDetails.SetContentTypeApplicationJson()
resp, body, err := sup.client.SendPost(sup.GetArtifactoryDetails().GetUrl()+commandsUtils.PluginsExecuteRestApi+syncChunks, content, &httpDetails)
if err != nil {
return api.UploadChunksStatusResponse{}, err
@@ -76,7 +75,7 @@ func (sup *srcUserPluginService) uploadChunk(chunk api.UploadChunk) (uploadChunk
}

httpDetails := sup.GetArtifactoryDetails().CreateHttpClientDetails()
utils.SetContentType("application/json", &httpDetails.Headers)
httpDetails.SetContentTypeApplicationJson()
resp, body, err := sup.client.SendPost(sup.GetArtifactoryDetails().GetUrl()+commandsUtils.PluginsExecuteRestApi+uploadChunk, content, &httpDetails)
if err != nil {
return api.UploadChunkResponse{}, err
@@ -108,7 +107,7 @@ func (sup *srcUserPluginService) version() (string, error) {

func (sup *srcUserPluginService) verifyCompatibilityRequest() (*VerifyCompatibilityResponse, error) {
httpDetails := sup.GetArtifactoryDetails().CreateHttpClientDetails()
utils.SetContentType("application/json", &httpDetails.Headers)
httpDetails.SetContentTypeApplicationJson()
resp, body, err := sup.client.SendPost(sup.GetArtifactoryDetails().GetUrl()+commandsUtils.PluginsExecuteRestApi+"verifyCompatibility", []byte("{}"), &httpDetails)
if err != nil {
return nil, err
@@ -130,7 +129,8 @@ func (sup *srcUserPluginService) verifyCompatibilityRequest() (*VerifyCompatibil

func (sup *srcUserPluginService) verifyConnectivityRequest(targetAuth api.TargetAuth) error {
httpDetails := sup.GetArtifactoryDetails().CreateHttpClientDetails()
utils.SetContentType("application/json", &httpDetails.Headers)
httpDetails.SetContentTypeApplicationJson()
httpDetails.SetContentTypeApplicationJson()
content, err := json.Marshal(targetAuth)
if err != nil {
return errorutils.CheckError(err)