Format import statement, remove extra lines

carvel-dev · Oct 25, 2021 · 28bab18 · 28bab18
1 parent 8f3fcb8
commit 28bab18
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/test/e2e/config_test.go b/test/e2e/config_test.go
@@ -122,7 +122,6 @@ data:
 
 		secondData := NewPresentClusterResource("configmap", "second", env.Namespace, kubectl).RawPath(ctlres.NewPathFromStrings([]string{"data"}))
 		require.Exactlyf(t, map[string]interface{}{"keep": "", "keep2": "", "delete": ""}, secondData, "Expected value to be correct")
-
 	})
 }
 
@@ -191,15 +190,13 @@ secrets:
 			RunOpts{IntoNs: true, StdinReader: strings.NewReader(yaml1)})
 
 		secrets := NewPresentClusterResource("serviceaccount", "test-sa-with-secrets", env.Namespace, kubectl).RawPath(ctlres.NewPathFromStrings([]string{"secrets"})).([]interface{})
-
 		require.Len(t, secrets, 2, "Expected one set and one generated secret")
 		require.Exactlyf(t, map[string]interface{}{"name": "some-secret"}, secrets[0], "Expected provided secret at idx0: %#v", secrets[0])
 
 		generatedSecretName = secrets[1].(map[string]interface{})["name"].(string)
 		require.True(t, strings.HasPrefix(generatedSecretName, "test-sa-with-secrets-token-"), "Expected generated secret at idx1: %#v", secrets[1])
 
 		secrets = NewPresentClusterResource("serviceaccount", "test-sa-without-secrets", env.Namespace, kubectl).RawPath(ctlres.NewPathFromStrings([]string{"secrets"})).([]interface{})
-
 		require.Len(t, secrets, 1, "Expected one set and one generated secret")
 		require.True(t, strings.HasPrefix(secrets[0].(map[string]interface{})["name"].(string), "test-sa-without-secrets-token-"), "Expected generated secret at idx0: %#v", secrets[0])
 	})
@@ -226,12 +223,10 @@ secrets:
 			RunOpts{IntoNs: true, StdinReader: strings.NewReader(yaml2)})
 
 		secrets := NewPresentClusterResource("serviceaccount", "test-sa-with-secrets", env.Namespace, kubectl).RawPath(ctlres.NewPathFromStrings([]string{"secrets"})).([]interface{})
-
 		require.Len(t, secrets, 3, "Expected one set and one generated secret")
 		require.Exactlyf(t, map[string]interface{}{"name": "some-secret"}, secrets[0], "Expected provided secret at idx0")
 		require.Exactlyf(t, map[string]interface{}{"name": "new-some-secret"}, secrets[1], "Expected provided secret at idx1")
 		require.Exactlyf(t, map[string]interface{}{"name": generatedSecretName}, secrets[2], "Expected previous generated secret at idx2")
-
 	})
 
 	ensureDeploysWithNoChanges(yaml2)
@@ -241,16 +236,13 @@ secrets:
 			RunOpts{IntoNs: true, StdinReader: strings.NewReader(yaml3)})
 
 		secrets := NewPresentClusterResource("serviceaccount", "test-sa-with-secrets", env.Namespace, kubectl).RawPath(ctlres.NewPathFromStrings([]string{"secrets"})).([]interface{})
-
 		require.Len(t, secrets, 1, "Expected one set and one generated secret")
 		require.Exactlyf(t, map[string]interface{}{"name": generatedSecretName}, secrets[0], "Expected previous generated secret at idx0")
 
 		secrets = NewPresentClusterResource("serviceaccount", "test-sa-without-secrets", env.Namespace, kubectl).RawPath(ctlres.NewPathFromStrings([]string{"secrets"})).([]interface{})
-
 		require.Len(t, secrets, 2, "Expected one set and one generated secret")
 		require.Exactlyf(t, map[string]interface{}{"name": "some-secret"}, secrets[0], "Expected provided secret at idx0")
 		require.True(t, strings.HasPrefix(secrets[1].(map[string]interface{})["name"].(string), "test-sa-without-secrets-token-"), "Expected generated secret at idx1: %#v", secrets[1])
-
 	})
 
 	ensureDeploysWithNoChanges(yaml3)

diff --git a/test/e2e/env.go b/test/e2e/env.go
@@ -37,5 +37,5 @@ func (e Env) Validate(t *testing.T) {
 		errStrs = append(errStrs, "Expected Namespace to be non-empty")
 	}
 
-	require.Len(t, errStrs, 0, "%s", strings.Join(errStrs, "\n"))
+	require.Lenf(t, errStrs, 0, "%s", strings.Join(errStrs, "\n"))
 }
diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go
@@ -4,8 +4,9 @@
 package e2e
 
 import (
-	"github.com/stretchr/testify/require"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestVersion(t *testing.T) {

diff --git a/test/e2e/warnings_test.go b/test/e2e/warnings_test.go
@@ -109,14 +109,15 @@ Succeeded`
 		expectedOutput = strings.TrimSpace(replaceSpaces(expectedOutput))
 
 		require.Equal(t, expectedOutput, out)
+	})
 
-		logger.Section("deploying with --warnings flag", func() {
-			yaml := strings.Replace(crYaml, "<cr-name>", "cr-2", 1)
+	logger.Section("deploying with --warnings flag", func() {
+		yaml := strings.Replace(crYaml, "<cr-name>", "cr-2", 1)
 
-			out, _ := kapp.RunWithOpts([]string{"deploy", "-f", "-", "-a", crName2, "--warnings=false"},
-				RunOpts{StdinReader: strings.NewReader(yaml)})
+		out, _ := kapp.RunWithOpts([]string{"deploy", "-f", "-", "-a", crName2, "--warnings=false"},
+			RunOpts{StdinReader: strings.NewReader(yaml)})
 
-			expectedOutput := `
+		expectedOutput := `
 Changes
 
 Namespace  Name  Kind     Conds.  Age  Op      Op st.  Wait to    Rs  Ri  
@@ -134,11 +135,10 @@ Wait to: 1 reconcile, 0 delete, 0 noop
 
 Succeeded`
 
-			out = strings.TrimSpace(replaceTarget(replaceSpaces(replaceTs(out))))
-			expectedOutput = strings.TrimSpace(replaceSpaces(expectedOutput))
+		out = strings.TrimSpace(replaceTarget(replaceSpaces(replaceTs(out))))
+		expectedOutput = strings.TrimSpace(replaceSpaces(expectedOutput))
 
-			require.Equal(t, expectedOutput, out)
-		})
+		require.Equal(t, expectedOutput, out)
 	})
 }