Fixes 4943: support upload repos in templates (#872)

Author: jlsherrill

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.
 	}
 }
 

pkg/tasks/candlepin_helpers_test.go

@@ -43,6 +43,26 @@ func (s *CandlepinHelpersTest) TestGenContentDto() {
 	assert.True(s.T(), strings.HasSuffix(*dto.GpgUrl, "/api/content-sources/v1.0/repository_gpg_key/abce"))
 }
 
+func (s *CandlepinHelpersTest) TestGenContentDtoUpload() {
+	repo := api.RepositoryResponse{
+		UUID:              "abce",
+		Name:              "MyTestRepo",
+		Label:             "my_test_repo",
+		URL:               "",
+		Origin:            config.OriginUpload,
+		AccountID:         "1234",
+		OrgID:             "1234",
+		GpgKey:            "",
+		LatestSnapshotURL: "http://example.com/snapshot",
+	}
+
+	dto := GenContentDto(repo)
+	assert.Equal(s.T(), repo.Name, *dto.Name)
+	assert.Equal(s.T(), repo.Label, *dto.Label)
+	assert.Equal(s.T(), "", *dto.GpgUrl)
+	assert.Equal(s.T(), *dto.ContentUrl, repo.LatestSnapshotURL)
+}
+
 func (s *CandlepinHelpersTest) TestUnneededOverrides() {
 	existing := []caliri.ContentOverrideDTO{{
 		Name:         utils.Ptr("foo"),

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
 	}