setup pulp integration

Signed-off-by: Jonathan Holloway <[email protected]>

pkg/services/images.go

@@ -878,14 +878,20 @@ func (s *ImageService) CreateRepoForImage(ctx context.Context, img *models.Image
 	}
 	s.log.Debug("OSTree repo was saved to commit")
 
-	repo, err := s.RepoBuilder.ImportRepo(repo)
+	var repository *models.Repo
+	var err error
+	if feature.PulpIntegration.IsEnabled() {
+		repository, err = s.RepoBuilder.StoreRepo(repo)
+	} else {
+		repository, err = s.RepoBuilder.ImportRepo(repo)
+	}
 	if err != nil {
 		return nil, err
 	}
 
-	s.log.Info("OSTree repo is ready")
+	s.log.WithField("url", repository.URL).Info("OSTree repo is ready")
 
-	return repo, nil
+	return repository, nil
 }
 
 // SetErrorStatusOnImage is a helper function that sets the error status on images

pkg/services/repobuilder.go

@@ -27,6 +27,7 @@ var BuildCommand = exec.Command
 // RepoBuilderInterface defines the interface of a repository builder
 type RepoBuilderInterface interface {
 	BuildUpdateRepo(id uint) (*models.UpdateTransaction, error)
+	StoreRepo(r *models.Repo) (*models.Repo, error)
 	ImportRepo(r *models.Repo) (*models.Repo, error)
 	CommitTarDownload(c *models.Commit, dest string) (string, error)
 	CommitTarExtract(c *models.Commit, tarFileName string, dest string) error
@@ -362,9 +363,17 @@ func (rb *RepoBuilder) BuildUpdateRepo(id uint) (*models.UpdateTransaction, erro
 	return update, nil
 }
 
+// StoreRepo requests Pulp to create/update an ostree repo from an IB commit
+func (rb *RepoBuilder) StoreRepo(repo *models.Repo) (*models.Repo, error) {
+	// FIXME: add the Pulp repo create here
+	// 	this allows both to happen until code that updates the DB is added
+
+	return rb.ImportRepo(repo)
+}
+
 // ImportRepo (unpack and upload) a single repo
 func (rb *RepoBuilder) ImportRepo(r *models.Repo) (*models.Repo, error) {
-
+	// FIXME: delete after Pulp Store Repo is stable
 	var cmt models.Commit
 	cmtDB := db.DB.Where("repo_id = ?", r.ID).First(&cmt)
 	if cmtDB.Error != nil {