Don't set size on non-file-like entries

Don't set size on console output and metadata files. The plugin system knows how to get the size just as efficiently, and explicitly setting the size implies they'll behave like files (which may not be true). Signed-off-by: Michael Smith <[email protected]>
MikaelSmith · Jan 3, 2020 · 5f0ad9a · 5f0ad9a
1 parent 756b4e7
commit 5f0ad9a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/plugin/aws/ec2InstanceConsoleOutput.go b/plugin/aws/ec2InstanceConsoleOutput.go
@@ -35,8 +35,7 @@ func newEC2InstanceConsoleOutput(ctx context.Context, inst *ec2Instance, latest
 		SetCrtime(output.mtime).
 		SetMtime(output.mtime).
 		SetCtime(output.mtime).
-		SetAtime(output.mtime).
-		SetSize(uint64(len(output.content)))
+		SetAtime(output.mtime)
 
 	return cl, nil
 }

diff --git a/plugin/metadataJSON.go b/plugin/metadataJSON.go
@@ -14,22 +14,10 @@ type MetadataJSONFile struct {
 // NewMetadataJSONFile creates a new MetadataJSONFile. If caching Metadata on the `other` entry is
 // disabled, it will use that to compute the file size upfront.
 func NewMetadataJSONFile(ctx context.Context, other Entry) (*MetadataJSONFile, error) {
-	meta := &MetadataJSONFile{
+	return &MetadataJSONFile{
 		EntryBase: NewEntry("metadata.json"),
 		other:     other,
-	}
-
-	if other.getTTLOf(MetadataOp) < 0 {
-		// Content is presumably easy to get, so use it to determine size.
-		content, err := meta.Read(ctx)
-		if err != nil {
-			return nil, err
-		}
-
-		meta.Attributes().SetSize(uint64(len(content)))
-	}
-
-	return meta, nil
+	}, nil
 }
 
 // Schema defines the schema of a metadata.json file.