Merge pull request #3110 from carapace-sh/update-bridge

updated carapace-bridge

Author: rsteube

completers/common/gcloud_completer/cmd/root.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"os/exec"
+
 	"github.com/carapace-sh/carapace"
 	"github.com/carapace-sh/carapace-bridge/pkg/actions/bridge"
 	"github.com/spf13/cobra"
@@ -23,14 +25,10 @@ func init() {
 
 	carapace.Gen(rootCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			// TODO patch user@instance and --flag=optarg as in gcloud completion script
-
-			if c.Value == "-" {
-				c.Value = "--" // seems shorthand flags aren't completed anyway so expand to longhand first
+			if _, err := exec.LookPath("carapace-gcloud"); err == nil {
+				return bridge.ActionCarapace("carapace-gcloud")
 			}
-			c.Setenv("CLOUDSDK_COMPONENT_MANAGER_DISABLE_UPDATE_CHECK", "1")
-			//lint:ignore SA1019 gcloud uses an old argcomplete version
-			return bridge.ActionArgcompleteV1("gcloud").Invoke(c).ToA()
+			return bridge.ActionGcloud("gcloud")
 		}),
 	)
 }

go.mod

@@ -4,7 +4,7 @@ go 1.23.1
 
 require (
 	github.com/carapace-sh/carapace v1.10.3
-	github.com/carapace-sh/carapace-bridge v1.4.9
+	github.com/carapace-sh/carapace-bridge v1.4.10
 	github.com/carapace-sh/carapace-selfupdate v0.0.10
 	github.com/carapace-sh/carapace-shlex v1.1.1
 	github.com/carapace-sh/carapace-spec v1.4.1

go.sum

@@ -1,7 +1,7 @@
 github.com/carapace-sh/carapace v1.10.3 h1:4L4HpEEZb+I2mtvqKMYed64QR15Tf6+uGDn8BIflObY=
 github.com/carapace-sh/carapace v1.10.3/go.mod h1:gdyqmVIQJFlcHn4D7BkgyjRU5LlluDXBaiRSdV6GY88=
-github.com/carapace-sh/carapace-bridge v1.4.9 h1:f9P1dLcapT7mdBoHMu+SGQrrYiJ7PYkhiz8ZMleote8=
-github.com/carapace-sh/carapace-bridge v1.4.9/go.mod h1:MUOnmTjYoALyl5kDYPrStnA4oDnTcrYc2SL359T4CEY=
+github.com/carapace-sh/carapace-bridge v1.4.10 h1:yxLrjxSw9FeedEUounjj+oh6ya/TbSXMsswrFsp0dTU=
+github.com/carapace-sh/carapace-bridge v1.4.10/go.mod h1:cRTSrcdvoaz68yZGd24YhCljaBSUMxCUjB/wTRPqsVI=
 github.com/carapace-sh/carapace-pflag v1.0.0 h1:uJMhl+vwEM/Eb0UdxZUuv4jo4rUAyPijkRGP5gfCuCE=
 github.com/carapace-sh/carapace-pflag v1.0.0/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/carapace-sh/carapace-selfupdate v0.0.10 h1:ZvutqGwVvSj6TmI/tLcort63JD6PaOG0ia6squwbTuo=