Fix eventarc test template

converters/google/resources/getconfig.go

@@ -2,19 +2,23 @@ package google
 
 import (
 	"context"
+	"fmt"
+	"os"
 
 	"github.com/pkg/errors"
+
+	"github.com/GoogleCloudPlatform/terraform-validator/version"
 )
 
 // Return the value of the private userAgent field
 func (c *Config) UserAgent() string {
 	return c.userAgent
 }
 
-func GetConfig(ctx context.Context, project string, offline bool, userAgent string) (*Config, error) {
+func GetConfig(ctx context.Context, project string, offline bool) (*Config, error) {
 	cfg := &Config{
 		Project:   project,
-		userAgent: userAgent,
+		userAgent: fmt.Sprintf("config-validator-tf/%s", version.BuildVersion()),
 	}
 
 	// Search for default credentials
@@ -44,6 +48,12 @@ func GetConfig(ctx context.Context, project string, offline bool, userAgent stri
 		"CLOUDSDK_COMPUTE_REGION",
 	})
 
+	// opt in extension for adding to the User-Agent header
+	if ext := os.Getenv("GOOGLE_TERRAFORM_VALIDATOR_USERAGENT_EXTENSION"); ext != "" {
+		ua := cfg.userAgent
+		cfg.userAgent = fmt.Sprintf("%s %s", ua, ext)
+	}
+
 	if !offline {
 		ConfigureBasePaths(cfg)
 		if err := cfg.LoadAndValidate(ctx); err != nil {

converters/google/resources/getconfig_test.go

@@ -116,6 +116,13 @@ func TestGetConfigExtractsEnvVars(t *testing.T) {
 			expected:       "whatever",
 			getConfigValue: getRegionValue,
 		},
+		{
+			name:           "GOOGLE_TERRAFORM_VALIDATOR_USERAGENT_EXTENSION",
+			envKey:         "GOOGLE_TERRAFORM_VALIDATOR_USERAGENT_EXTENSION",
+			envValue:       "whatever",
+			expected:       "config-validator-tf/dev whatever",
+			getConfigValue: getUserAgent,
+		},
 	}
 
 	for _, c := range cases {
@@ -126,7 +133,7 @@ func TestGetConfigExtractsEnvVars(t *testing.T) {
 				t.Fatalf("error setting env var %s=%s: %s", c.envKey, c.envValue, err)
 			}
 
-			cfg, err := GetConfig(ctx, "project", offline, "")
+			cfg, err := GetConfig(ctx, "project", offline)
 			if err != nil {
 				t.Fatalf("error building converter: %s", err)
 			}
@@ -147,32 +154,3 @@ func TestGetConfigExtractsEnvVars(t *testing.T) {
 		})
 	}
 }
-
-func TestGetConfigUserAgent(t *testing.T) {
-	ctx := context.Background()
-	offline := true
-	cases := []struct {
-		userAgent string
-		expected  string
-	}{
-		{
-			userAgent: "",
-			expected:  "",
-		},
-		{
-			userAgent: "whatever",
-			expected:  "whatever",
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.userAgent, func(t *testing.T) {
-			cfg, err := GetConfig(ctx, "project", offline, c.userAgent)
-			if err != nil {
-				t.Fatalf("error building converter: %s", err)
-			}
-
-			assert.Equal(t, c.expected, getUserAgent(cfg))
-		})
-	}
-}

test/read_test.go

@@ -143,7 +143,7 @@ func TestReadPlannedAssetsCoverage(t *testing.T) {
 			ancestryCache := map[string]string{
 				data.Provider["project"]: data.Ancestry,
 			}
-			got, err := tfgcv.ReadPlannedAssets(ctx, planfile, data.Provider["project"], ancestryCache, true, false, zaptest.NewLogger(t), "")
+			got, err := tfgcv.ReadPlannedAssets(ctx, planfile, data.Provider["project"], ancestryCache, true, false, zaptest.NewLogger(t))
 			if err != nil {
 				t.Fatalf("ReadPlannedAssets(%s, %s, %s, %t): %v", planfile, data.Provider["project"], ancestryCache, true, err)
 			}