Browse Source

integration: format code with gofumpt

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 1 year ago
parent
commit
07e6b0ac70

+ 1 - 1
integration/build/build_test.go

@@ -700,7 +700,7 @@ func TestBuildPlatformInvalid(t *testing.T) {
 func writeTarRecord(t *testing.T, w *tar.Writer, fn, contents string) {
 func writeTarRecord(t *testing.T, w *tar.Writer, fn, contents string) {
 	err := w.WriteHeader(&tar.Header{
 	err := w.WriteHeader(&tar.Header{
 		Name:     fn,
 		Name:     fn,
-		Mode:     0600,
+		Mode:     0o600,
 		Size:     int64(len(contents)),
 		Size:     int64(len(contents)),
 		Typeflag: '0',
 		Typeflag: '0',
 	})
 	})

+ 0 - 2
integration/capabilities/capabilities_linux_test.go

@@ -100,9 +100,7 @@ func TestNoNewPrivileges(t *testing.T) {
 			}
 			}
 			if stdErr != tc.stdErr {
 			if stdErr != tc.stdErr {
 				t.Fatalf("test produced invalid error: %q, expected %q. Stdout:%q", stdErr, tc.stdErr, stdOut)
 				t.Fatalf("test produced invalid error: %q, expected %q. Stdout:%q", stdErr, tc.stdErr, stdOut)
-
 			}
 			}
 		})
 		})
 	}
 	}
-
 }
 }

+ 3 - 3
integration/config/config_test.go

@@ -268,7 +268,7 @@ func TestTemplatedConfig(t *testing.T) {
 					Name: "templated_config",
 					Name: "templated_config",
 					UID:  "0",
 					UID:  "0",
 					GID:  "0",
 					GID:  "0",
-					Mode: 0600,
+					Mode: 0o600,
 				},
 				},
 				ConfigID:   templatedConfig.ID,
 				ConfigID:   templatedConfig.ID,
 				ConfigName: templatedConfigName,
 				ConfigName: templatedConfigName,
@@ -280,7 +280,7 @@ func TestTemplatedConfig(t *testing.T) {
 					Name: "referencedconfigtarget",
 					Name: "referencedconfigtarget",
 					UID:  "0",
 					UID:  "0",
 					GID:  "0",
 					GID:  "0",
-					Mode: 0600,
+					Mode: 0o600,
 				},
 				},
 				ConfigID:   referencedConfig.ID,
 				ConfigID:   referencedConfig.ID,
 				ConfigName: referencedConfigName,
 				ConfigName: referencedConfigName,
@@ -292,7 +292,7 @@ func TestTemplatedConfig(t *testing.T) {
 					Name: "referencedsecrettarget",
 					Name: "referencedsecrettarget",
 					UID:  "0",
 					UID:  "0",
 					GID:  "0",
 					GID:  "0",
-					Mode: 0600,
+					Mode: 0o600,
 				},
 				},
 				SecretID:   referencedSecret.ID,
 				SecretID:   referencedSecret.ID,
 				SecretName: referencedSecretName,
 				SecretName: referencedSecretName,

+ 3 - 3
integration/daemon/daemon_test.go

@@ -155,7 +155,7 @@ func TestConfigDaemonSeccompProfiles(t *testing.T) {
 			d.Stop(t)
 			d.Stop(t)
 
 
 			cfg := filepath.Join(d.RootDir(), "daemon.json")
 			cfg := filepath.Join(d.RootDir(), "daemon.json")
-			err := os.WriteFile(cfg, []byte(`{"seccomp-profile": "`+tc.profile+`"}`), 0644)
+			err := os.WriteFile(cfg, []byte(`{"seccomp-profile": "`+tc.profile+`"}`), 0o644)
 			assert.NilError(t, err)
 			assert.NilError(t, err)
 
 
 			d.Start(t, "--config-file", cfg)
 			d.Start(t, "--config-file", cfg)
@@ -285,7 +285,7 @@ func TestDaemonProxy(t *testing.T) {
 
 
 		configFile := filepath.Join(d.RootDir(), "daemon.json")
 		configFile := filepath.Join(d.RootDir(), "daemon.json")
 		configJSON := fmt.Sprintf(`{"proxies":{"http-proxy":%[1]q, "https-proxy": %[1]q, "no-proxy": "example.com"}}`, proxyServer.URL)
 		configJSON := fmt.Sprintf(`{"proxies":{"http-proxy":%[1]q, "https-proxy": %[1]q, "no-proxy": "example.com"}}`, proxyServer.URL)
-		assert.NilError(t, os.WriteFile(configFile, []byte(configJSON), 0644))
+		assert.NilError(t, os.WriteFile(configFile, []byte(configJSON), 0o644))
 
 
 		d.Start(t, "--iptables=false", "--config-file", configFile)
 		d.Start(t, "--iptables=false", "--config-file", configFile)
 		defer d.Stop(t)
 		defer d.Stop(t)
@@ -327,7 +327,7 @@ func TestDaemonProxy(t *testing.T) {
 
 
 		configFile := filepath.Join(d.RootDir(), "daemon.json")
 		configFile := filepath.Join(d.RootDir(), "daemon.json")
 		configJSON := fmt.Sprintf(`{"proxies":{"http-proxy":%[1]q, "https-proxy": %[1]q, "no-proxy": "example.com"}}`, proxyRawURL)
 		configJSON := fmt.Sprintf(`{"proxies":{"http-proxy":%[1]q, "https-proxy": %[1]q, "no-proxy": "example.com"}}`, proxyRawURL)
-		assert.NilError(t, os.WriteFile(configFile, []byte(configJSON), 0644))
+		assert.NilError(t, os.WriteFile(configFile, []byte(configJSON), 0o644))
 
 
 		err := d.StartWithError("--http-proxy", proxyRawURL, "--https-proxy", proxyRawURL, "--no-proxy", "example.com", "--config-file", configFile, "--validate")
 		err := d.StartWithError("--http-proxy", proxyRawURL, "--https-proxy", proxyRawURL, "--no-proxy", "example.com", "--config-file", configFile, "--validate")
 		assert.ErrorContains(t, err, "daemon exited during startup")
 		assert.ErrorContains(t, err, "daemon exited during startup")

+ 3 - 3
integration/secret/secret_test.go

@@ -277,7 +277,7 @@ func TestTemplatedSecret(t *testing.T) {
 					Name: "templated_secret",
 					Name: "templated_secret",
 					UID:  "0",
 					UID:  "0",
 					GID:  "0",
 					GID:  "0",
-					Mode: 0600,
+					Mode: 0o600,
 				},
 				},
 				SecretID:   templatedSecret.ID,
 				SecretID:   templatedSecret.ID,
 				SecretName: templatedSecretName,
 				SecretName: templatedSecretName,
@@ -289,7 +289,7 @@ func TestTemplatedSecret(t *testing.T) {
 					Name: "referencedconfigtarget",
 					Name: "referencedconfigtarget",
 					UID:  "0",
 					UID:  "0",
 					GID:  "0",
 					GID:  "0",
-					Mode: 0600,
+					Mode: 0o600,
 				},
 				},
 				ConfigID:   referencedConfig.ID,
 				ConfigID:   referencedConfig.ID,
 				ConfigName: referencedConfigName,
 				ConfigName: referencedConfigName,
@@ -301,7 +301,7 @@ func TestTemplatedSecret(t *testing.T) {
 					Name: "referencedsecrettarget",
 					Name: "referencedsecrettarget",
 					UID:  "0",
 					UID:  "0",
 					GID:  "0",
 					GID:  "0",
-					Mode: 0600,
+					Mode: 0o600,
 				},
 				},
 				SecretID:   referencedSecret.ID,
 				SecretID:   referencedSecret.ID,
 				SecretName: referencedSecretName,
 				SecretName: referencedSecretName,