From 4073e4d1181851862ee91029a20756f8590326b2 Mon Sep 17 00:00:00 2001
From: Josh Dolitsky <josh@dolit.ski>
Date: Fri, 18 Jun 2021 09:23:16 -0400
Subject: [PATCH] inline data fetching for pull result

Signed-off-by: Josh Dolitsky <josh@dolit.ski>
---
 .../experimental/registry/registry_op_pull.go | 75 ++++++++-----------
 1 file changed, 32 insertions(+), 43 deletions(-)

diff --git a/internal/experimental/registry/registry_op_pull.go b/internal/experimental/registry/registry_op_pull.go
index 34654f688..33beb1ff9 100644
--- a/internal/experimental/registry/registry_op_pull.go
+++ b/internal/experimental/registry/registry_op_pull.go
@@ -100,61 +100,50 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
 					ProvLayerMediaType))
 		}
 	}
-	_, manifestData, ok := store.Get(manifest)
-	if !ok {
-		return nil, errors.Errorf("Unable to retrieve blob with digest %s", manifest.Digest)
-	}
-	_, configData, ok := store.Get(*configDescriptor)
-	if !ok {
-		return nil, errors.Errorf("Unable to retrieve blob with digest %s", configDescriptor.Digest)
-	}
-	var meta *chart.Metadata
-	if err := json.Unmarshal(configData, &meta); err != nil {
-		return nil, err
-	}
-	var chartData []byte
-	if operation.withChart {
-		var ok bool
-		_, chartData, ok = store.Get(*chartDescriptor)
-		if !ok {
-			return nil, errors.Errorf("Unable to retrieve blob with digest %s", chartDescriptor.Digest)
-		}
-	}
-	var provData []byte
-	if operation.withProv && !provMissing {
-		var ok bool
-		_, provData, ok = store.Get(*provDescriptor)
-		if !ok {
-			return nil, errors.Errorf("Unable to retrieve blob with digest %s", provDescriptor.Digest)
-		}
-	}
 	result := &PullResult{
 		Manifest: &descriptorPullSummary{
-			Data:   manifestData,
 			Digest: manifest.Digest.String(),
 			Size:   manifest.Size,
 		},
 		Config: &descriptorPullSummary{
-			Data:   configData,
 			Digest: configDescriptor.Digest.String(),
 			Size:   configDescriptor.Size,
 		},
-		Chart: &descriptorPullSummaryWithMeta{
-			Meta: meta,
-		},
-		Prov: &descriptorPullSummary{}, // prevent nil references
+		Chart: &descriptorPullSummaryWithMeta{},
+		Prov: &descriptorPullSummary{},
 		Ref:  ref,
 	}
-	if chartData != nil {
-		result.Chart.Data = chartData
-		result.Chart.Digest = chartDescriptor.Digest.String()
-		result.Chart.Size = chartDescriptor.Size
+	if _, manifestData, ok := store.Get(manifest); !ok {
+		return nil, errors.Errorf("Unable to retrieve blob with digest %s", manifest.Digest)
+	} else {
+		result.Manifest.Data = manifestData
 	}
-	if provData != nil {
-		result.Prov = &descriptorPullSummary{
-			Data:   provData,
-			Digest: provDescriptor.Digest.String(),
-			Size:   provDescriptor.Size,
+	if _, configData, ok := store.Get(*configDescriptor); !ok {
+		return nil, errors.Errorf("Unable to retrieve blob with digest %s", configDescriptor.Digest)
+	} else {
+		result.Config.Data = configData
+		var meta *chart.Metadata
+		if err := json.Unmarshal(configData, &meta); err != nil {
+			return nil, err
+		}
+		result.Chart.Meta = meta
+	}
+	if operation.withChart {
+		if _, chartData, ok := store.Get(*chartDescriptor); !ok {
+			return nil, errors.Errorf("Unable to retrieve blob with digest %s", chartDescriptor.Digest)
+		} else {
+			result.Chart.Data = chartData
+			result.Chart.Digest = chartDescriptor.Digest.String()
+			result.Chart.Size = chartDescriptor.Size
+		}
+	}
+	if operation.withProv && !provMissing {
+		if _, provData, ok := store.Get(*provDescriptor); !ok {
+			return nil, errors.Errorf("Unable to retrieve blob with digest %s", provDescriptor.Digest)
+		} else {
+			result.Prov.Data = provData
+			result.Prov.Digest = provDescriptor.Digest.String()
+			result.Prov.Size = provDescriptor.Size
 		}
 	}
 	fmt.Fprintf(c.out, "Pulled: %s\n", result.Ref)