Use public methods for depot access.

Author: mitchell-as

pkg/runtime/depot.go

@@ -154,9 +154,15 @@ func (d *depot) SetCacheSize(mb int) {
 	d.cacheSize = int64(mb) * MB
 }
 
-func (d *depot) Exists(id strfmt.UUID) bool {
-	_, ok := d.artifacts[id]
-	return ok
+// Note: the returned artifactInfo may be nil for depot artifacts that predate this functionality.
+func (d *depot) Exists(id strfmt.UUID) (bool, *artifactInfo) {
+	if _, ok := d.artifacts[id]; ok {
+		if artifact, exists := d.config.Cache[id]; exists {
+			return true, artifact
+		}
+		return true, nil
+	}
+	return false, nil
 }
 
 func (d *depot) Path(id strfmt.UUID) string {
@@ -184,7 +190,7 @@ func (d *depot) DeployViaLink(id strfmt.UUID, relativeSrc, absoluteDest string)
 	d.fsMutex.Lock()
 	defer d.fsMutex.Unlock()
 
-	if !d.Exists(id) {
+	if exists, _ := d.Exists(id); !exists {
 		return errs.New("artifact not found in depot")
 	}
 
@@ -237,7 +243,7 @@ func (d *depot) DeployViaCopy(id strfmt.UUID, relativeSrc, absoluteDest string)
 	d.fsMutex.Lock()
 	defer d.fsMutex.Unlock()
 
-	if !d.Exists(id) {
+	if exists, _ := d.Exists(id); !exists {
 		return errs.New("artifact not found in depot")
 	}
 
@@ -327,6 +333,13 @@ func (d *depot) Track(id strfmt.UUID, deploy *deployment, artifact *buildplan.Ar
 	return nil
 }
 
+func (d *depot) Deployments(id strfmt.UUID) []deployment {
+	if deployments, ok := d.config.Deployments[id]; ok {
+		return deployments
+	}
+	return nil
+}
+
 // Untrack will remove an artifact deployment.
 // It does not actually delete files; it just tells the depot a previously tracked artifact should
 // no longer be tracked.
@@ -342,7 +355,7 @@ func (d *depot) Undeploy(id strfmt.UUID, relativeSrc, path string) error {
 	d.fsMutex.Lock()
 	defer d.fsMutex.Unlock()
 
-	if !d.Exists(id) {
+	if exists, _ := d.Exists(id); !exists {
 		return errs.New("artifact not found in depot")
 	}
 

pkg/runtime/setup.go

@@ -139,7 +139,8 @@ func newSetup(path string, bp *buildplan.BuildPlan, env *envdef.Collection, depo
 	// by definition we'll need to download it (unless we're setting up the runtime from an archive).
 	// We also calculate which artifacts are immediately ready to be installed, as its the inverse condition of the above.
 	artifactsToDownload := artifactsToInstall.Filter(func(a *buildplan.Artifact) bool {
-		return !depot.Exists(a.ArtifactID)
+		exists, _ := depot.Exists(a.ArtifactID)
+		return !exists
 	})
 	artifactsToUnpack := artifactsToDownload
 	if opts.FromArchive != nil {
@@ -545,15 +546,13 @@ func (s *setup) uninstall(id strfmt.UUID) (rerr error) {
 	}
 
 	// If this is a dynamically imported artifact, tell the ecosystem to remove/undeploy it.
-	if artifact, exists := s.depot.config.Cache[id]; exists && artifact.Namespace != "" {
+	if exists, artifact := s.depot.Exists(id); exists && artifact != nil && artifact.Namespace != "" {
 		if ecosys := filterEcosystemMatchingNamespace(s.ecosystems, artifact.Namespace); ecosys != nil {
 			installedFiles := []string{}
 			// Find record of our deployment
-			if deployments, ok := s.depot.config.Deployments[id]; ok {
-				deployments = sliceutils.Filter(deployments, func(d deployment) bool { return d.Path == s.path })
-				if len(deployments) > 0 {
-					installedFiles = deployments[0].Files
-				}
+			deployments := sliceutils.Filter(s.depot.Deployments(id), func(d deployment) bool { return d.Path == s.path })
+			if len(deployments) > 0 {
+				installedFiles = deployments[0].Files
 			}
 
 			// Convert relative install locations to absolute paths.