Skip to content

Commit d82dcd8

Browse files
authored
Merge pull request #3153 from guettli/fix-empty-auth-nil-pointer-exception-in-stop
🌱 envtest: fix nil pointer exception in Stop().
2 parents 1561e8c + fb7df70 commit d82dcd8

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

pkg/internal/testing/controlplane/apiserver.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,10 +384,10 @@ func (s *APIServer) populateAPIServerCerts() error {
384384
return err
385385
}
386386

387-
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.crt"), certData, 0640); err != nil {
387+
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.crt"), certData, 0o640); err != nil {
388388
return err
389389
}
390-
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.key"), keyData, 0640); err != nil {
390+
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.key"), keyData, 0o640); err != nil {
391391
return err
392392
}
393393

@@ -404,10 +404,10 @@ func (s *APIServer) populateAPIServerCerts() error {
404404
return err
405405
}
406406

407-
if err := os.WriteFile(filepath.Join(s.CertDir, saCertFile), saCert, 0640); err != nil {
407+
if err := os.WriteFile(filepath.Join(s.CertDir, saCertFile), saCert, 0o640); err != nil {
408408
return err
409409
}
410-
return os.WriteFile(filepath.Join(s.CertDir, saKeyFile), saKey, 0640)
410+
return os.WriteFile(filepath.Join(s.CertDir, saKeyFile), saKey, 0o640)
411411
}
412412

413413
// Stop stops this process gracefully, waits for its termination, and cleans up
@@ -421,6 +421,9 @@ func (s *APIServer) Stop() error {
421421
return err
422422
}
423423
}
424+
if s.Authn == nil {
425+
return nil
426+
}
424427
return s.Authn.Stop()
425428
}
426429

0 commit comments

Comments
 (0)