diff --git a/api/publish.go b/api/publish.go index 872d08712..452a8007f 100644 --- a/api/publish.go +++ b/api/publish.go @@ -235,11 +235,6 @@ func apiPublishRepoOrSnapshot(c *gin.Context) { } resources = append(resources, string(snapshot.ResourceKey())) - err = snapshotCollection.LoadComplete(snapshot) - if err != nil { - AbortWithJSONError(c, http.StatusInternalServerError, fmt.Errorf("unable to publish: %s", err)) - return - } sources = append(sources, snapshot) } @@ -259,11 +254,6 @@ func apiPublishRepoOrSnapshot(c *gin.Context) { } resources = append(resources, string(localRepo.Key())) - err = localCollection.LoadComplete(localRepo) - if err != nil { - AbortWithJSONError(c, http.StatusInternalServerError, fmt.Errorf("unable to publish: %s", err)) - } - sources = append(sources, localRepo) } } else { @@ -275,17 +265,9 @@ func apiPublishRepoOrSnapshot(c *gin.Context) { if b.MultiDist != nil { multiDist = *b.MultiDist } - published, err := deb.NewPublishedRepo(storage, prefix, b.Distribution, b.Architectures, components, sources, collectionFactory, multiDist) - if err != nil { - AbortWithJSONError(c, http.StatusInternalServerError, fmt.Errorf("unable to publish: %s", err)) - return - } - - collection := collectionFactory.PublishedRepoCollection() - resources = append(resources, string(published.Key())) taskName := fmt.Sprintf("Publish %s repository %s/%s with components \"%s\" and sources \"%s\"", - b.SourceKind, published.StoragePrefix(), published.Distribution, strings.Join(components, `", "`), strings.Join(names, `", "`)) + b.SourceKind, prefix, b.Distribution, strings.Join(components, `", "`), strings.Join(names, `", "`)) maybeRunTaskInBackground(c, taskName, resources, func(out aptly.Progress, detail *task.Detail) (*task.ProcessReturnValue, error) { taskDetail := task.PublishDetail{ Detail: detail, @@ -295,6 +277,29 @@ func apiPublishRepoOrSnapshot(c *gin.Context) { PublishDetail: taskDetail, } + for _, source := range sources { + switch s := source.(type) { + case *deb.Snapshot: + snapshotCollection := collectionFactory.SnapshotCollection() + err = snapshotCollection.LoadComplete(s) + case *deb.LocalRepo: + localCollection := collectionFactory.LocalRepoCollection() + err = localCollection.LoadComplete(s) + default: + err = fmt.Errorf("unexpected type for source: %T", source) + } + if err != nil { + return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, fmt.Errorf("unable to publish: %s", err) + } + } + + published, err := deb.NewPublishedRepo(storage, prefix, b.Distribution, b.Architectures, components, sources, collectionFactory, multiDist) + if err != nil { + return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, fmt.Errorf("unable to publish: %s", err) + } + + resources = append(resources, string(published.Key())) + if b.Origin != "" { published.Origin = b.Origin } @@ -320,13 +325,14 @@ func apiPublishRepoOrSnapshot(c *gin.Context) { published.AcquireByHash = *b.AcquireByHash } + collection := collectionFactory.PublishedRepoCollection() duplicate := collection.CheckDuplicate(published) if duplicate != nil { collectionFactory.PublishedRepoCollection().LoadComplete(duplicate, collectionFactory) return &task.ProcessReturnValue{Code: http.StatusBadRequest, Value: nil}, fmt.Errorf("prefix/distribution already used by another published repo: %s", duplicate) } - err := published.Publish(context.PackagePool(), context, collectionFactory, signer, publishOutput, b.ForceOverwrite) + err = published.Publish(context.PackagePool(), context, collectionFactory, signer, publishOutput, b.ForceOverwrite) if err != nil { return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, fmt.Errorf("unable to publish: %s", err) } @@ -402,11 +408,6 @@ func apiPublishUpdateSwitch(c *gin.Context) { AbortWithJSONError(c, http.StatusNotFound, fmt.Errorf("unable to update: %s", err)) return } - err = collection.LoadComplete(published, collectionFactory) - if err != nil { - AbortWithJSONError(c, http.StatusInternalServerError, fmt.Errorf("unable to update: %s", err)) - return - } if published.SourceKind == deb.SourceLocalRepo { if len(b.Snapshots) > 0 { @@ -445,6 +446,10 @@ func apiPublishUpdateSwitch(c *gin.Context) { resources := []string{string(published.Key())} taskName := fmt.Sprintf("Update published %s repository %s/%s", published.SourceKind, published.StoragePrefix(), published.Distribution) maybeRunTaskInBackground(c, taskName, resources, func(out aptly.Progress, _ *task.Detail) (*task.ProcessReturnValue, error) { + err = collection.LoadComplete(published, collectionFactory) + if err != nil { + return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, fmt.Errorf("Unable to update: %s", err) + } result, err := published.Update(collectionFactory, out) if err != nil { return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, fmt.Errorf("Unable to update: %s", err) @@ -551,6 +556,7 @@ func apiPublishAddSource(c *gin.Context) { return } + // FIXME err = collection.LoadComplete(published, collectionFactory) if err != nil { AbortWithJSONError(c, http.StatusInternalServerError, fmt.Errorf("unable to create: %s", err)) @@ -663,6 +669,7 @@ func apiPublishSetSources(c *gin.Context) { return } + // FIXME err = collection.LoadComplete(published, collectionFactory) if err != nil { AbortWithJSONError(c, http.StatusInternalServerError, fmt.Errorf("unable to update: %s", err)) @@ -722,6 +729,7 @@ func apiPublishDropChanges(c *gin.Context) { return } + // FIXME err = collection.LoadComplete(published, collectionFactory) if err != nil { AbortWithJSONError(c, http.StatusInternalServerError, fmt.Errorf("unable to delete: %s", err)) @@ -772,6 +780,7 @@ func apiPublishUpdateSource(c *gin.Context) { AbortWithJSONError(c, http.StatusNotFound, fmt.Errorf("unable to update: %s", err)) return } + // FIXME err = collection.LoadComplete(published, collectionFactory) if err != nil { @@ -842,6 +851,7 @@ func apiPublishRemoveSource(c *gin.Context) { return } + // FIXME err = collection.LoadComplete(published, collectionFactory) if err != nil { AbortWithJSONError(c, http.StatusInternalServerError, fmt.Errorf("unable to delete: %s", err)) @@ -929,6 +939,7 @@ func apiPublishUpdate(c *gin.Context) { return } + // FIXME err = collection.LoadComplete(published, collectionFactory) if err != nil { AbortWithJSONError(c, http.StatusInternalServerError, fmt.Errorf("unable to update: %s", err)) diff --git a/api/repos.go b/api/repos.go index bc55dd9f0..a04745c01 100644 --- a/api/repos.go +++ b/api/repos.go @@ -254,14 +254,14 @@ func apiReposPackagesAddDelete(c *gin.Context, taskNamePrefix string, cb func(li return } - err = collection.LoadComplete(repo) - if err != nil { - AbortWithJSONError(c, 500, err) - return - } - resources := []string{string(repo.Key())} + maybeRunTaskInBackground(c, taskNamePrefix+repo.Name, resources, func(out aptly.Progress, _ *task.Detail) (*task.ProcessReturnValue, error) { + err = collection.LoadComplete(repo) + if err != nil { + return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, err + } + out.Printf("Loading packages...\n") list, err := deb.NewPackageListFromRefList(repo.RefList(), collectionFactory.PackageCollection(), nil) if err != nil { @@ -360,12 +360,6 @@ func apiReposPackageFromDir(c *gin.Context) { return } - err = collection.LoadComplete(repo) - if err != nil { - AbortWithJSONError(c, 500, err) - return - } - var taskName string var sources []string if fileParam == "" { @@ -379,6 +373,11 @@ func apiReposPackageFromDir(c *gin.Context) { resources := []string{string(repo.Key())} resources = append(resources, sources...) maybeRunTaskInBackground(c, taskName, resources, func(out aptly.Progress, _ *task.Detail) (*task.ProcessReturnValue, error) { + err = collection.LoadComplete(repo) + if err != nil { + return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, err + } + verifier := context.GetVerifier() var ( @@ -480,17 +479,7 @@ func apiReposCopyPackage(c *gin.Context) { return } - err = collectionFactory.LocalRepoCollection().LoadComplete(dstRepo) - if err != nil { - AbortWithJSONError(c, http.StatusBadRequest, fmt.Errorf("dest repo error: %s", err)) - return - } - - var ( - srcRefList *deb.PackageRefList - srcRepo *deb.LocalRepo - ) - + var srcRepo *deb.LocalRepo srcRepo, err = collectionFactory.LocalRepoCollection().ByName(srcRepoName) if err != nil { AbortWithJSONError(c, http.StatusBadRequest, fmt.Errorf("src repo error: %s", err)) @@ -502,17 +491,22 @@ func apiReposCopyPackage(c *gin.Context) { return } - err = collectionFactory.LocalRepoCollection().LoadComplete(srcRepo) - if err != nil { - AbortWithJSONError(c, http.StatusBadRequest, fmt.Errorf("src repo error: %s", err)) - return - } - - srcRefList = srcRepo.RefList() taskName := fmt.Sprintf("Copy packages from repo %s to repo %s", srcRepoName, dstRepoName) resources := []string{string(dstRepo.Key()), string(srcRepo.Key())} maybeRunTaskInBackground(c, taskName, resources, func(_ aptly.Progress, _ *task.Detail) (*task.ProcessReturnValue, error) { + err = collectionFactory.LocalRepoCollection().LoadComplete(dstRepo) + if err != nil { + return &task.ProcessReturnValue{Code: http.StatusBadRequest, Value: nil}, fmt.Errorf("dest repo error: %s", err) + } + + err = collectionFactory.LocalRepoCollection().LoadComplete(srcRepo) + if err != nil { + return &task.ProcessReturnValue{Code: http.StatusBadRequest, Value: nil}, fmt.Errorf("src repo error: %s", err) + } + + srcRefList := srcRepo.RefList() + reporter := &aptly.RecordingResultReporter{ Warnings: []string{}, AddedLines: []string{}, diff --git a/api/snapshot.go b/api/snapshot.go index 3e84b1f20..18aa64404 100644 --- a/api/snapshot.go +++ b/api/snapshot.go @@ -135,16 +135,17 @@ func apiSnapshotsCreate(c *gin.Context) { return } - err = snapshotCollection.LoadComplete(sources[i]) - if err != nil { - AbortWithJSONError(c, 500, err) - return - } - resources = append(resources, string(sources[i].ResourceKey())) } maybeRunTaskInBackground(c, "Create snapshot "+b.Name, resources, func(_ aptly.Progress, _ *task.Detail) (*task.ProcessReturnValue, error) { + for i := range sources { + err = snapshotCollection.LoadComplete(sources[i]) + if err != nil { + return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, err + } + } + list := deb.NewPackageList() // verify package refs and build package list @@ -468,17 +469,20 @@ func apiSnapshotsMerge(c *gin.Context) { return } - err = snapshotCollection.LoadComplete(sources[i]) - if err != nil { - AbortWithJSONError(c, http.StatusInternalServerError, err) - return - } resources[i] = string(sources[i].ResourceKey()) } maybeRunTaskInBackground(c, "Merge snapshot "+name, resources, func(_ aptly.Progress, _ *task.Detail) (*task.ProcessReturnValue, error) { + err = snapshotCollection.LoadComplete(sources[0]) + if err != nil { + return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, err + } result := sources[0].RefList() for i := 1; i < len(sources); i++ { + err = snapshotCollection.LoadComplete(sources[i]) + if err != nil { + return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, err + } result = result.Merge(sources[i].RefList(), overrideMatching, false) } @@ -566,11 +570,6 @@ func apiSnapshotsPull(c *gin.Context) { AbortWithJSONError(c, http.StatusNotFound, err) return } - err = collectionFactory.SnapshotCollection().LoadComplete(toSnapshot) - if err != nil { - AbortWithJSONError(c, http.StatusInternalServerError, err) - return - } // Load snapshot sourceSnapshot, err := collectionFactory.SnapshotCollection().ByName(body.Source) @@ -578,15 +577,19 @@ func apiSnapshotsPull(c *gin.Context) { AbortWithJSONError(c, http.StatusNotFound, err) return } - err = collectionFactory.SnapshotCollection().LoadComplete(sourceSnapshot) - if err != nil { - AbortWithJSONError(c, http.StatusInternalServerError, err) - return - } resources := []string{string(sourceSnapshot.ResourceKey()), string(toSnapshot.ResourceKey())} taskName := fmt.Sprintf("Pull snapshot %s into %s and save as %s", body.Source, name, body.Destination) maybeRunTaskInBackground(c, taskName, resources, func(_ aptly.Progress, _ *task.Detail) (*task.ProcessReturnValue, error) { + err = collectionFactory.SnapshotCollection().LoadComplete(toSnapshot) + if err != nil { + return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, err + } + err = collectionFactory.SnapshotCollection().LoadComplete(sourceSnapshot) + if err != nil { + return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, err + } + // convert snapshots to package list toPackageList, err := deb.NewPackageListFromRefList(toSnapshot.RefList(), collectionFactory.PackageCollection(), context.Progress()) if err != nil {