From 8ab796fc358969346805ed7e2eb2dd2aacfc7e6e Mon Sep 17 00:00:00 2001 From: dmitri Date: Tue, 1 Sep 2020 13:29:15 +0200 Subject: [PATCH] Use the dependency iteration APIs to query packages/applications --- e | 2 +- lib/app/service/app.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/e b/e index a429ebece1..6ec0466259 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit a429ebece145f399ce3c088c8c074d98ac55af54 +Subproject commit 6ec0466259af8436d015f88bcca43728f1b2aa43 diff --git a/lib/app/service/app.go b/lib/app/service/app.go index 6dd19d7500..69758013cb 100644 --- a/lib/app/service/app.go +++ b/lib/app/service/app.go @@ -905,9 +905,9 @@ func (r *applications) checkImportRequirements(manifest *schema.Manifest, req *a req.PackageVersion = manifest.Metadata.ResourceVersion } - // check dependencies-packages - for _, dep := range manifest.Dependencies.Packages { - locator, err := r.processMetadata(dep.Locator) + // check package dependencies + for _, dep := range manifest.Dependencies.GetPackages() { + locator, err := r.processMetadata(dep) if err != nil { return trace.Wrap(err) } @@ -920,9 +920,9 @@ func (r *applications) checkImportRequirements(manifest *schema.Manifest, req *a } } - // check dependencies-apps - for _, dep := range manifest.Dependencies.Apps { - locator, err := r.processMetadata(dep.Locator) + // check application dependencies + for _, dep := range manifest.Dependencies.GetApps() { + locator, err := r.processMetadata(dep) if err != nil { return trace.Wrap(err) }