terraform provider changes to use KCC Version

199201shubhamsahu · Jan 16, 2025 · 83b36bf · 83b36bf
1 parent 3584adc
commit 83b36bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...b.com/hashicorp/terraform-provider-google-beta/google-beta/fwtransport/framework_utils.go b/...b.com/hashicorp/terraform-provider-google-beta/google-beta/fwtransport/framework_utils.go
@@ -23,7 +23,7 @@ const uaEnvVar = "TF_APPEND_USER_AGENT"
 var KCCVersion = "dev"
 
 func CompileUserAgentString(ctx context.Context, name, tfVersion, provVersion string) string {
-	ua := fmt.Sprintf("kcc/%s (+https://github.com/GoogleCloudPlatform/k8s-config-connector) kcc/controller-manager/%s", KCCVersion, provVersion)
+	ua := fmt.Sprintf("kcc/%s (+https://github.com/GoogleCloudPlatform/k8s-config-connector) kcc/controller-manager/%s", KCCVersion, KCCVersion)
 
 	if add := os.Getenv(uaEnvVar); add != "" {
 		add = strings.TrimSpace(add)

diff --git a/...arty/github.com/hashicorp/terraform-provider-google-beta/google-beta/provider/provider.go b/...arty/github.com/hashicorp/terraform-provider-google-beta/google-beta/provider/provider.go
@@ -14,6 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-google-beta/version"
 
+	"github.com/hashicorp/terraform-provider-google-beta/google-beta/fwtransport"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/accessapproval"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/accesscontextmanager"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/activedirectory"
@@ -1961,6 +1962,8 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 		config.UserAgent = fmt.Sprintf("%s %s", ua, ext)
 	}
 
+	config.UserAgent = fwtransport.CompileUserAgentString(ctx, "", "", version.ProviderVersion)
+
 	if v, ok := d.GetOk("request_timeout"); ok {
 		var err error
 		config.RequestTimeout, err = time.ParseDuration(v.(string))