Skip to content

Commit f9639fb

Browse files
committed
test: fix 'talosctl gen' tests
There were weird hacks put into the tests, while each test already runs in a temporary directory as 'working directory', so no hacks are needed. Moreover, using fixed `/tmp/...` paths leads to test failures, as CI runs docker & QEMU tests in parallel conflicting with each other. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent 6142d87 commit f9639fb

File tree

2 files changed

+24
-39
lines changed

2 files changed

+24
-39
lines changed

internal/integration/cli/gen.go

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -225,40 +225,27 @@ func (suite *GenSuite) TestSecrets() {
225225

226226
suite.RunCLI([]string{"gen", "secrets", "--force"}, base.StdoutEmpty())
227227

228-
defer os.Remove("secrets.yaml") //nolint:errcheck
229-
230-
suite.RunCLI([]string{"gen", "secrets", "--output-file", "/tmp/secrets2.yaml"}, base.StdoutEmpty())
231-
suite.Assert().FileExists("/tmp/secrets2.yaml")
232-
233-
defer os.Remove("/tmp/secrets2.yaml") //nolint:errcheck
228+
suite.RunCLI([]string{"gen", "secrets", "--output-file", "secrets2.yaml"}, base.StdoutEmpty())
229+
suite.Assert().FileExists("secrets2.yaml")
234230

235231
suite.RunCLI([]string{"gen", "secrets", "-o", "secrets3.yaml", "--talos-version", "v0.8"}, base.StdoutEmpty())
236232
suite.Assert().FileExists("secrets3.yaml")
237-
238-
defer os.Remove("secrets3.yaml") //nolint:errcheck
239233
}
240234

241235
// TestSecretsWithPKIDirAndToken ...
242236
func (suite *GenSuite) TestSecretsWithPKIDirAndToken() {
243-
path := "/tmp/secrets-with-pki-dir-and-token.yaml"
244-
245-
tempDir := suite.T().TempDir()
246-
247-
dir, err := writeKubernetesPKIFiles(tempDir)
248-
suite.Assert().NoError(err)
237+
path := "secrets-with-pki-dir-and-token.yaml"
249238

250-
defer os.RemoveAll(dir) //nolint:errcheck
239+
suite.Require().NoError(writeKubernetesPKIFiles("k8s-pki/"))
251240

252241
suite.RunCLI([]string{
253-
"gen", "secrets", "--from-kubernetes-pki", dir,
242+
"gen", "secrets", "--from-kubernetes-pki", "k8s-pki/",
254243
"--kubernetes-bootstrap-token", "test-token",
255244
"--output-file", path,
256245
}, base.StdoutEmpty())
257246

258247
suite.Assert().FileExists(path)
259248

260-
defer os.Remove(path) //nolint:errcheck
261-
262249
secretsYaml, err := os.ReadFile(path)
263250
suite.Assert().NoError(err)
264251

internal/integration/cli/pki.go

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,39 @@ var (
2727
pkiEtcdCAKey []byte
2828
)
2929

30-
func writeKubernetesPKIFiles(dir string) (string, error) {
31-
var err error
32-
33-
if err = os.WriteFile(filepath.Join(dir, "ca.crt"), pkiCACrt, 0o777); err != nil {
34-
return "", err
30+
func writeKubernetesPKIFiles(dir string) error {
31+
if err := os.Mkdir(dir, 0o777); err != nil {
32+
return err
3533
}
3634

37-
if err = os.WriteFile(filepath.Join(dir, "ca.key"), pkiCAKey, 0o777); err != nil {
38-
return "", err
35+
if err := os.WriteFile(filepath.Join(dir, "ca.crt"), pkiCACrt, 0o777); err != nil {
36+
return err
3937
}
4038

41-
if err = os.WriteFile(filepath.Join(dir, "front-proxy-ca.crt"), pkiFrontProxyCACrt, 0o777); err != nil {
42-
return "", err
39+
if err := os.WriteFile(filepath.Join(dir, "ca.key"), pkiCAKey, 0o777); err != nil {
40+
return err
4341
}
4442

45-
if err = os.WriteFile(filepath.Join(dir, "front-proxy-ca.key"), pkiFrontProxyCAKey, 0o777); err != nil {
46-
return "", err
43+
if err := os.WriteFile(filepath.Join(dir, "front-proxy-ca.crt"), pkiFrontProxyCACrt, 0o777); err != nil {
44+
return err
4745
}
4846

49-
if err = os.WriteFile(filepath.Join(dir, "sa.key"), pkiSAKey, 0o777); err != nil {
50-
return "", err
47+
if err := os.WriteFile(filepath.Join(dir, "front-proxy-ca.key"), pkiFrontProxyCAKey, 0o777); err != nil {
48+
return err
5149
}
5250

53-
etcdDir := filepath.Join(dir, "etcd")
54-
if err = os.Mkdir(etcdDir, 0o777); err != nil {
55-
return "", err
51+
if err := os.WriteFile(filepath.Join(dir, "sa.key"), pkiSAKey, 0o777); err != nil {
52+
return err
5653
}
5754

58-
if err = os.WriteFile(filepath.Join(etcdDir, "ca.crt"), pkiEtcdCACrt, 0o777); err != nil {
59-
return "", err
55+
etcdDir := filepath.Join(dir, "etcd")
56+
if err := os.Mkdir(etcdDir, 0o777); err != nil {
57+
return err
6058
}
6159

62-
if err = os.WriteFile(filepath.Join(etcdDir, "ca.key"), pkiEtcdCAKey, 0o777); err != nil {
63-
return "", err
60+
if err := os.WriteFile(filepath.Join(etcdDir, "ca.crt"), pkiEtcdCACrt, 0o777); err != nil {
61+
return err
6462
}
6563

66-
return dir, nil
64+
return os.WriteFile(filepath.Join(etcdDir, "ca.key"), pkiEtcdCAKey, 0o777)
6765
}

0 commit comments

Comments
 (0)