Do not lock again on linux

mathspace · Aug 31, 2022 · 069ee9f · 069ee9f
1 parent 48dc781
commit 069ee9f
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 16 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
         env:
           GOARCH: ${{ matrix.arch }}
           CGO_ENABLED: "1"
-        run: go build -ldflags="-X 'github.com/plumber-cd/kubectl-credentials-helper/cmd.Version==${{ env.RELEASE_VERSION }}'" -o build/kubectl-credentials-helper-${{ matrix.os }}-${{ matrix.arch }}
+        run: go build -ldflags="-X 'github.com/mathspace/kubectl-credentials-helper/cmd.Version==${{ env.RELEASE_VERSION }}'" -o build/kubectl-credentials-helper-${{ matrix.os }}-${{ matrix.arch }}
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
@@ -52,7 +52,7 @@ jobs:
         env:
           GOARCH: ${{ matrix.arch }}
           CGO_ENABLED: "1"
-        run: go build -ldflags="-X 'github.com/plumber-cd/kubectl-credentials-helper/cmd.Version==${{ env.RELEASE_VERSION }}'" -o build/kubectl-credentials-helper-${{ matrix.os }}-${{ matrix.arch }}
+        run: go build -ldflags="-X 'github.com/mathspace/kubectl-credentials-helper/cmd.Version==${{ env.RELEASE_VERSION }}'" -o build/kubectl-credentials-helper-${{ matrix.os }}-${{ matrix.arch }}
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
@@ -78,7 +78,7 @@ jobs:
         env:
           GOARCH: ${{ matrix.arch }}
           CGO_ENABLED: "1"
-        run: go build -ldflags="-X 'github.com/plumber-cd/kubectl-credentials-helper/cmd.Version==${{ env.RELEASE_VERSION }}'" -o build/kubectl-credentials-helper-${{ matrix.os }}-${{ matrix.arch }}.exe
+        run: go build -ldflags="-X 'github.com/mathspace/kubectl-credentials-helper/cmd.Version==${{ env.RELEASE_VERSION }}'" -o build/kubectl-credentials-helper-${{ matrix.os }}-${{ matrix.arch }}.exe
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ This is a `kubectl` credentials helper. It is using your local OS keychain to st
 To install:
 
 ```bash
-go install github.com/plumber-cd/kubectl-credentials-helper
+go install github.com/mathspace/kubectl-credentials-helper
 ```
 
 You can also download this from releases.

diff --git a/cmd/root.go b/cmd/root.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/plumber-cd/kubectl-credentials-helper/keychain"
+	"github.com/mathspace/kubectl-credentials-helper/keychain"
 	"github.com/spf13/cobra"
 	clientauthentication "k8s.io/client-go/pkg/apis/clientauthentication/v1"
 	"k8s.io/client-go/tools/auth/exec"

diff --git a/cmd/secure.go b/cmd/secure.go
@@ -14,7 +14,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	cmdApi "k8s.io/client-go/tools/clientcmd/api"
 
-	"github.com/plumber-cd/kubectl-credentials-helper/keychain"
+	"github.com/mathspace/kubectl-credentials-helper/keychain"
 )
 
 // OsFs is an instance of afero.NewOsFs

diff --git a/cmd/undo.go b/cmd/undo.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/tools/clientcmd"
 
-	"github.com/plumber-cd/kubectl-credentials-helper/keychain"
+	"github.com/mathspace/kubectl-credentials-helper/keychain"
 )
 
 func init() {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/plumber-cd/kubectl-credentials-helper
+module github.com/mathspace/kubectl-credentials-helper
 
 go 1.18
 

diff --git a/keychain/keychain.go b/keychain/keychain.go
@@ -2,5 +2,5 @@ package keychain
 
 const (
 	Service     = "Kubernetes"
-	AccessGroup = "github.com/plumber-cd/kubectl-credentials-helper"
+	AccessGroup = "github.com/mathspace/kubectl-credentials-helper"
 )
diff --git a/keychain/keychain_linux.go b/keychain/keychain_linux.go
@@ -51,9 +51,6 @@ func CreateSecret(clusterName, clusterEndpoint, credentials string) error {
 		return err
 	}
 
-	defer func() {
-		_ = srv.LockItems([]dbus.ObjectPath{secretservice.DefaultCollection})
-	}()
 	if err := srv.Unlock([]dbus.ObjectPath{secretservice.DefaultCollection}); err != nil {
 		return err
 	}
@@ -125,9 +122,6 @@ func openItem(
 		return err
 	}
 
-	defer func() {
-		_ = srv.LockItems([]dbus.ObjectPath{secretservice.DefaultCollection})
-	}()
 	if err := srv.Unlock([]dbus.ObjectPath{secretservice.DefaultCollection}); err != nil {
 		return err
 	}

diff --git a/main.go b/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/plumber-cd/kubectl-credentials-helper/cmd"
+	"github.com/mathspace/kubectl-credentials-helper/cmd"
 )
 
 func main() {