From 360c4d5849b8b4056cbbbe9768e4472d22e36b16 Mon Sep 17 00:00:00 2001 From: Mustafa Gezen Date: Sun, 5 Sep 2021 02:12:43 +0200 Subject: [PATCH] enhancement: make cdn url configurable during import --- pkg/data/process.go | 1 + pkg/modes/git.go | 2 +- pkg/srpmproc/process.go | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/data/process.go b/pkg/data/process.go index 36471c3..6a2d797 100644 --- a/pkg/data/process.go +++ b/pkg/data/process.go @@ -53,4 +53,5 @@ type ProcessData struct { ModuleFallbackStream string AllowStreamBranches bool FsCreator FsCreatorFunc + CdnUrl string } diff --git a/pkg/modes/git.go b/pkg/modes/git.go index 5e12ddd..780ffa3 100644 --- a/pkg/modes/git.go +++ b/pkg/modes/git.go @@ -240,7 +240,7 @@ func (g *GitMode) WriteSource(pd *data.ProcessData, md *data.ModeData) error { body = fromBlobStorage log.Printf("downloading %s from blob storage", hash) } else { - url := fmt.Sprintf("https://git.centos.org/sources/%s/%s/%s", md.Name, branchName, hash) + url := fmt.Sprintf("%s/%s/%s/%s", pd.CdnUrl, md.Name, branchName, hash) log.Printf("downloading %s", url) req, err := http.NewRequest("GET", url, nil) diff --git a/pkg/srpmproc/process.go b/pkg/srpmproc/process.go index ec64741..61a2592 100644 --- a/pkg/srpmproc/process.go +++ b/pkg/srpmproc/process.go @@ -83,6 +83,7 @@ type ProcessDataRequest struct { NoStorageUpload bool NoStorageDownload bool SingleTag string + CdnUrl string } func gitlabify(str string) string { @@ -126,6 +127,9 @@ func NewProcessData(req *ProcessDataRequest) (*data.ProcessData, error) { if req.BranchPrefix == "" { req.BranchPrefix = "r" } + if req.CdnUrl == "" { + req.CdnUrl = "https://git.centos.org/sources" + } // Validate required if req.Package == "" {