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.

Sign up for GitHub

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

Add missing priorityResolution and cdnRedirect to repository template creation #1243

Merged
merged 8 commits into from
Aug 28, 2024
Merged

Add missing priorityResolution and cdnRedirect to repository template creation #1243

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 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
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
2 changes: 2 additions & 0 deletions artifactory/commands/repository/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ var writersMap = map[string]ioutils.AnswerWriter{
SuppressPomConsistencyChecks: ioutils.WriteBoolAnswer,
BlackedOut: ioutils.WriteBoolAnswer,
DownloadRedirect: ioutils.WriteBoolAnswer,
PriorityResolution: ioutils.WriteBoolAnswer,
CdnRedirect: ioutils.WriteBoolAnswer,
BlockPushingSchema1: ioutils.WriteBoolAnswer,
DebianTrivialLayout: ioutils.WriteBoolAnswer,
ExternalDependenciesEnabled: ioutils.WriteBoolAnswer,
Expand Down
10 changes: 8 additions & 2 deletions artifactory/commands/repository/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ const (
XrayIndex = "xrayIndex"
PropertySets = "propertySets"
DownloadRedirect = "downloadRedirect"
PriorityResolution = "priorityResolution"
CdnRedirect = "cdnRedirect"
BlockPushingSchema1 = "blockPushingSchema1"

// Mutual local and virtual repository configuration JSON keys
Expand Down Expand Up @@ -235,6 +237,8 @@ var optionalSuggestsMap = map[string]prompt.Suggest{
SuppressPomConsistencyChecks: {Text: SuppressPomConsistencyChecks},
BlackedOut: {Text: BlackedOut},
DownloadRedirect: {Text: DownloadRedirect},
PriorityResolution: {Text: PriorityResolution},
CdnRedirect: {Text: CdnRedirect},
BlockPushingSchema1: {Text: BlockPushingSchema1},
DebianTrivialLayout: {Text: DebianTrivialLayout},
ExternalDependenciesEnabled: {Text: ExternalDependenciesEnabled},
Expand Down Expand Up @@ -302,7 +306,7 @@ var optionalSuggestsMap = map[string]prompt.Suggest{

var baseLocalRepoConfKeys = []string{
Description, Notes, IncludePatterns, ExcludePatterns, RepoLayoutRef, ProjectKey, Environment, BlackedOut, XrayIndex,
PropertySets, ArchiveBrowsingEnabled, OptionalIndexCompressionFormats, DownloadRedirect, BlockPushingSchema1,
PropertySets, ArchiveBrowsingEnabled, OptionalIndexCompressionFormats, DownloadRedirect, PriorityResolution, CdnRedirect, BlockPushingSchema1,
}

var mavenGradleLocalRepoConfKeys = []string{
Expand Down Expand Up @@ -330,7 +334,7 @@ var baseRemoteRepoConfKeys = []string{
BlackedOut, XrayIndex, StoreArtifactsLocally, SocketTimeoutMillis, LocalAddress, RetrievalCachePeriodSecs, FailedRetrievalCachePeriodSecs,
MissedRetrievalCachePeriodSecs, UnusedArtifactsCleanupEnabled, UnusedArtifactsCleanupPeriodHours, AssumedOfflinePeriodSecs,
ShareConfiguration, SynchronizeProperties, BlockMismatchingMimeTypes, PropertySets, AllowAnyHostAuth, EnableCookieManagement,
BypassHeadRequests, ClientTlsCertificate, DownloadRedirect, BlockPushingSchema1, ContentSynchronisation,
BypassHeadRequests, ClientTlsCertificate, DownloadRedirect, PriorityResolution, CdnRedirect, BlockPushingSchema1, ContentSynchronisation,
}

var mavenGradleRemoteRepoConfKeys = []string{
Expand Down Expand Up @@ -815,6 +819,8 @@ var questionMap = map[string]ioutils.QuestionInfo{
SuppressPomConsistencyChecks: BoolToStringQuestionInfo,
BlackedOut: BoolToStringQuestionInfo,
DownloadRedirect: BoolToStringQuestionInfo,
PriorityResolution: BoolToStringQuestionInfo,
CdnRedirect: BoolToStringQuestionInfo,
BlockPushingSchema1: BoolToStringQuestionInfo,
DebianTrivialLayout: BoolToStringQuestionInfo,
ExternalDependenciesEnabled: BoolToStringQuestionInfo,
Expand Down
2 changes: 1 addition & 1 deletion artifactory/commands/transferfiles/localgeneratedfilter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions artifactory/commands/transferfiles/srcpluginservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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()
sverdlov93 marked this conversation as resolved.
Show resolved Hide resolved
content, err := json.Marshal(targetAuth)
if err != nil {
return errorutils.CheckError(err)
Expand Down
Loading