Fixes 4943: support upload repos in templates

content-services · Nov 4, 2024 · 032b585 · 032b585
1 parent da478a2
commit 032b585
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/tasks/candlepin_helpers.go b/pkg/tasks/candlepin_helpers.go
@@ -23,14 +23,19 @@ func GenContentDto(repo api.RepositoryResponse) caliri.ContentDTO {
 	if repo.OrgID != config.RedHatOrg && repo.GpgKey != "" {
 		gpgKeyUrl = models.CandlepinContentGpgKeyUrl(repo.OrgID, repo.UUID)
 	}
+	url := repo.URL
+	if repo.Origin == config.OriginUpload {
+		url = repo.LatestSnapshotURL
+	}
+
 	return caliri.ContentDTO{
 		Id:         &id,
 		Type:       &repoType,
 		Label:      &repoLabel,
 		Name:       &repoName,
 		Vendor:     &repoVendor,
 		GpgUrl:     gpgKeyUrl,
-		ContentUrl: &repo.URL, // Set to upstream URL, but it is not used. Will use content overrides instead.
+		ContentUrl: &url, // Set to upstream URL, but it is not used. Will use content overrides instead.
 	}
 }
 

diff --git a/pkg/tasks/update_template_content.go b/pkg/tasks/update_template_content.go
@@ -487,7 +487,7 @@ func (t *UpdateTemplateContent) demoteContent(repoConfigUUIDs []string) error {
 // Returns list of custom content to be created, a list of custom content IDs, a list of red hat content IDs, and an error.
 func (t *UpdateTemplateContent) getContentList() ([]caliri.ContentDTO, []string, []string, error) {
 	uuids := strings.Join(t.payload.RepoConfigUUIDs, ",")
-	repoConfigs, _, err := t.daoReg.RepositoryConfig.List(t.ctx, t.orgId, api.PaginationData{Limit: -1}, api.FilterData{UUID: uuids, Origin: config.OriginExternal})
+	repoConfigs, _, err := t.daoReg.RepositoryConfig.List(t.ctx, t.orgId, api.PaginationData{Limit: -1}, api.FilterData{UUID: uuids, Origin: strings.Join([]string{config.OriginExternal, config.OriginUpload}, ",")})
 	if err != nil {
 		return nil, nil, nil, err
 	}