Refactor unlocking kube credentials lockfile.

gravitational · May 31, 2023 · 56bbd44 · 56bbd44
1 parent d16b9b6
commit 56bbd44
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/tool/tsh/kube.go b/tool/tsh/kube.go
@@ -679,7 +679,6 @@ func (c *kubeCredentialsCommand) run(cf *CLIConf) error {
 }
 
 func (c *kubeCredentialsCommand) issueCert(cf *CLIConf) error {
-
 	tc, err := makeClient(cf)
 	if err != nil {
 		return trace.Wrap(err)
@@ -720,7 +719,10 @@ func (c *kubeCredentialsCommand) issueCert(cf *CLIConf) error {
 	if err != nil {
 		return trace.Wrap(err)
 	}
-	defer unlockKubeCred(false) // by default (in case of an error) we don't delete lockfile; safe to call twice
+	deleteKubeCredsLock := false
+	defer func() {
+		unlockKubeCred(deleteKubeCredsLock) // by default (in case of an error) we don't delete lockfile.
+	}()
 
 	ctx, span := tc.Tracer.Start(cf.Context, "tsh.kubeCredentials/RetryWithRelogin")
 	err = client.RetryWithRelogin(ctx, tc, func() error {
@@ -741,9 +743,9 @@ func (c *kubeCredentialsCommand) issueCert(cf *CLIConf) error {
 	if err != nil {
 		var urlErr *url.Error
 		// If we've got network error we remove the lockfile, so we could restore from temporary connection
-		// problems without user intervention, if possible.
+		// problems without requiring user intervention.
 		if errors.As(err, &urlErr) {
-			unlockKubeCred(true)
+			deleteKubeCredsLock = true
 		}
 		return trace.Wrap(err)
 	}
@@ -760,8 +762,8 @@ func (c *kubeCredentialsCommand) issueCert(cf *CLIConf) error {
 		return trace.Wrap(err)
 	}
 
-	// Unlock and remove the lockfile so subsequent tsh kube credentials calls don't exit early
-	unlockKubeCred(true)
+	// Remove the lockfile so subsequent tsh kube credentials calls don't exit early
+	deleteKubeCredsLock = true
 
 	return c.writeKeyResponse(cf.Stdout(), k, c.kubeCluster)
 }

diff --git a/tool/tsh/tsh_test.go b/tool/tsh/tsh_test.go
@@ -36,8 +36,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gravitational/teleport/api/utils/keypaths"
-
 	"github.com/ghodss/yaml"
 	"github.com/gravitational/trace"
 	"github.com/stretchr/testify/require"
@@ -55,6 +53,7 @@ import (
 	"github.com/gravitational/teleport/api/types/events"
 	"github.com/gravitational/teleport/api/types/wrappers"
 	apiutils "github.com/gravitational/teleport/api/utils"
+	"github.com/gravitational/teleport/api/utils/keypaths"
 	"github.com/gravitational/teleport/api/utils/keys"
 	"github.com/gravitational/teleport/integration/kube"
 	"github.com/gravitational/teleport/lib"