eksconfig: fix sonobuoy e2e.log paths

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
aws · Jul 10, 2020 · 718c7dd · 718c7dd
1 parent ee88116
commit 718c7dd
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/eksconfig/add-on-conformance.go b/eksconfig/add-on-conformance.go
@@ -164,23 +164,6 @@ func (cfg *Config) validateAddOnConformance() error {
 		cfg.AddOnConformance.SonobuoyRunKubeConformanceImage = fmt.Sprintf("gcr.io/google-containers/conformance:v%s.0", cfg.Parameters.Version)
 	}
 
-	if cfg.AddOnConformance.SonobuoyResultTarGzPath == "" {
-		cfg.AddOnConformance.SonobuoyResultTarGzPath = filepath.Join(
-			filepath.Dir(cfg.ConfigPath),
-			fmt.Sprintf("%s-sonobuoy-result.tar.gz", cfg.Name),
-		)
-		os.RemoveAll(cfg.AddOnConformance.SonobuoyResultTarGzPath)
-	}
-	if !strings.HasSuffix(cfg.AddOnConformance.SonobuoyResultTarGzPath, ".tar.gz") {
-		return fmt.Errorf("AddOnConformance.SonobuoyResultTarGzPath[%q] must have '.tar.gz' extension", cfg.AddOnConformance.SonobuoyResultTarGzPath)
-	}
-	if cfg.AddOnConformance.SonobuoyResultE2eLogS3Key == "" {
-		cfg.AddOnConformance.SonobuoyResultE2eLogS3Key = path.Join(
-			cfg.AddOnConformance.S3Dir,
-			filepath.Base(cfg.AddOnConformance.SonobuoyResultE2eLogPath),
-		)
-	}
-
 	cfg.AddOnConformance.SonobuoyResultDir = filepath.Join(
 		filepath.Dir(cfg.ConfigPath),
 		fmt.Sprintf("%s-sonobuoy-results", cfg.Name),
@@ -196,6 +179,23 @@ func (cfg *Config) validateAddOnConformance() error {
 	if !strings.HasSuffix(cfg.AddOnConformance.SonobuoyResultE2eLogPath, ".log") {
 		return fmt.Errorf("AddOnConformance.SonobuoyResultE2eLogPath[%q] must have '.log' extension", cfg.AddOnConformance.SonobuoyResultTarGzPath)
 	}
+	if cfg.AddOnConformance.SonobuoyResultE2eLogS3Key == "" {
+		cfg.AddOnConformance.SonobuoyResultE2eLogS3Key = path.Join(
+			cfg.AddOnConformance.S3Dir,
+			filepath.Base(cfg.AddOnConformance.SonobuoyResultE2eLogPath),
+		)
+	}
+
+	if cfg.AddOnConformance.SonobuoyResultTarGzPath == "" {
+		cfg.AddOnConformance.SonobuoyResultTarGzPath = filepath.Join(
+			filepath.Dir(cfg.ConfigPath),
+			fmt.Sprintf("%s-sonobuoy-result.tar.gz", cfg.Name),
+		)
+		os.RemoveAll(cfg.AddOnConformance.SonobuoyResultTarGzPath)
+	}
+	if !strings.HasSuffix(cfg.AddOnConformance.SonobuoyResultTarGzPath, ".tar.gz") {
+		return fmt.Errorf("AddOnConformance.SonobuoyResultTarGzPath[%q] must have '.tar.gz' extension", cfg.AddOnConformance.SonobuoyResultTarGzPath)
+	}
 	if cfg.AddOnConformance.SonobuoyResultTarGzS3Key == "" {
 		cfg.AddOnConformance.SonobuoyResultTarGzS3Key = path.Join(
 			cfg.AddOnConformance.S3Dir,