fix: built in variables

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/fatih/structtag v1.2.0
 	github.com/gzuidhof/tygo v0.2.14
 	github.com/mitchellh/mapstructure v1.5.0
+	github.com/pkg/errors v0.9.1
 	github.com/pterm/pterm v0.12.79
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/viper v1.18.2

go.sum

@@ -118,6 +118,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

pkg/tagmanager/client.go

@@ -2,10 +2,10 @@ package tagmanager
 
 import (
 	"context"
-	"errors"
 	"log/slog"
 	"time"
 
+	"github.com/pkg/errors"
 	"google.golang.org/api/option"
 	"google.golang.org/api/tagmanager/v2"
 )
@@ -212,7 +212,7 @@ func (c *Client) Variable(name string) (*tagmanager.Variable, error) {
 	return c.variables[name], nil
 }
 
-func (c *Client) BuiltInVariable(name string) (*tagmanager.Variable, error) {
+func (c *Client) BuiltInVariable(name string) (*tagmanager.BuiltInVariable, error) {
 	if c.builtInVariables == nil {
 		c.builtInVariables = map[string]*tagmanager.BuiltInVariable{}
 
@@ -227,11 +227,11 @@ func (c *Client) BuiltInVariable(name string) (*tagmanager.Variable, error) {
 		}
 	}
 
-	if _, ok := c.variables[name]; !ok {
+	if _, ok := c.builtInVariables[name]; !ok {
 		return nil, ErrNotFound
 	}
 
-	return c.variables[name], nil
+	return c.builtInVariables[name], nil
 }
 
 func (c *Client) Trigger(name string) (*tagmanager.Trigger, error) {
@@ -373,7 +373,7 @@ func (c *Client) UpsertVariable(variable *tagmanager.Variable) (*tagmanager.Vari
 	return c.Variable(variable.Name)
 }
 
-func (c *Client) EnableBuiltInVariable(name string) (*tagmanager.Variable, error) {
+func (c *Client) EnableBuiltInVariable(name string) (*tagmanager.BuiltInVariable, error) {
 	l := c.l.With("type", "Built-In Variable", "name", name)
 
 	cache, err := c.BuiltInVariable(name)
@@ -388,10 +388,11 @@ func (c *Client) EnableBuiltInVariable(name string) (*tagmanager.Variable, error
 	l.Info("creating")
 	resp, err := c.Service().Accounts.Containers.Workspaces.BuiltInVariables.Create(c.WorkspacePath()).Type(name).Do()
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "failed to create built-in variable")
 	}
 	for _, builtInVariable := range resp.BuiltInVariable {
-		c.builtInVariables[builtInVariable.Name] = builtInVariable
+		l.Debug(builtInVariable.Type)
+		c.builtInVariables[builtInVariable.Type] = builtInVariable
 	}
 
 	return c.BuiltInVariable(name)