From 7d219d79084cb44542ff8328d45ee242c1803ac9 Mon Sep 17 00:00:00 2001
From: frenchben <me+git@frenchben.com>
Date: Wed, 22 Sep 2021 18:14:08 -0700
Subject: [PATCH] Reorder structs

Signed-off-by: frenchben <me+git@frenchben.com>
---
 pkg/chart/loader/load.go      |  2 +-
 pkg/chart/loader/load_test.go | 22 +++++++++++-----------
 pkg/chartutil/save_test.go    |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkg/chart/loader/load.go b/pkg/chart/loader/load.go
index d490ca774..b18f41f2b 100644
--- a/pkg/chart/loader/load.go
+++ b/pkg/chart/loader/load.go
@@ -66,8 +66,8 @@ func Load(name string) (*chart.Chart, error) {
 // BufferedFile represents an archive file buffered for later processing.
 type BufferedFile struct {
 	Name    string
-	Data    []byte
 	ModTime time.Time
+	Data    []byte
 }
 
 // LoadFiles loads from in-memory files.
diff --git a/pkg/chart/loader/load_test.go b/pkg/chart/loader/load_test.go
index 0d9f18704..63c092f09 100644
--- a/pkg/chart/loader/load_test.go
+++ b/pkg/chart/loader/load_test.go
@@ -218,8 +218,8 @@ func TestLoadFiles_BadCases(t *testing.T) {
 			bufferedFiles: []*BufferedFile{
 				{
 					Name:    "requirements.lock",
-					Data:    []byte(""),
 					ModTime: time.Now(),
+					Data:    []byte(""),
 				},
 			},
 			expectError: "validation: chart.metadata.apiVersion is required"},
@@ -260,23 +260,23 @@ icon: https://example.com/64x64.png
 		},
 		{
 			Name:    "values.yaml",
-			Data:    []byte("var: some values"),
 			ModTime: time.Now(),
+			Data:    []byte("var: some values"),
 		},
 		{
 			Name:    "values.schema.json",
-			Data:    []byte("type: Values"),
 			ModTime: time.Now(),
+			Data:    []byte("type: Values"),
 		},
 		{
 			Name:    "templates/deployment.yaml",
-			Data:    []byte("some deployment"),
 			ModTime: time.Now(),
+			Data:    []byte("some deployment"),
 		},
 		{
 			Name:    "templates/service.yaml",
-			Data:    []byte("some service"),
 			ModTime: time.Now(),
+			Data:    []byte("some service"),
 		},
 	}
 
@@ -319,27 +319,28 @@ func TestLoadFilesOrder(t *testing.T) {
 	goodFiles := []*BufferedFile{
 		{
 			Name:    "requirements.yaml",
-			Data:    []byte("dependencies:"),
 			ModTime: time.Now(),
+			Data:    []byte("dependencies:"),
 		},
 		{
 			Name:    "values.yaml",
-			Data:    []byte("var: some values"),
 			ModTime: time.Now(),
+			Data:    []byte("var: some values"),
 		},
 
 		{
 			Name:    "templates/deployment.yaml",
-			Data:    []byte("some deployment"),
 			ModTime: time.Now(),
+			Data:    []byte("some deployment"),
 		},
 		{
 			Name:    "templates/service.yaml",
-			Data:    []byte("some service"),
 			ModTime: time.Now(),
+			Data:    []byte("some service"),
 		},
 		{
-			Name: "Chart.yaml",
+			Name:    "Chart.yaml",
+			ModTime: time.Now(),
 			Data: []byte(`apiVersion: v1
 name: frobnitz
 description: This is a frobnitz.
@@ -358,7 +359,6 @@ sources:
 home: http://example.com
 icon: https://example.com/64x64.png
 `),
-			ModTime: time.Now(),
 		},
 	}
 
diff --git a/pkg/chartutil/save_test.go b/pkg/chartutil/save_test.go
index 582f2d0f8..8107bc38b 100644
--- a/pkg/chartutil/save_test.go
+++ b/pkg/chartutil/save_test.go
@@ -233,8 +233,8 @@ func TestSavePreservesTimestamps(t *testing.T) {
 		Files: []*chart.File{
 			{
 				Name:    "scheherazade/shahryar.txt",
-				Data:    []byte("1,001 Nights"),
 				ModTime: initialCreateTime,
+				Data:    []byte("1,001 Nights"),
 			},
 		},
 		Schema: []byte("{\n  \"title\": \"Values\"\n}"),