Skip to content

Commit 7a0bb65

Browse files
authored
provider: Add terraform-provider-aws/VERSION to User-Agent header (#17486)
* provider: Add terraform-provider-aws/VERSION to User-Agent header Reference: #17483 Filled in during the TeamCity release process and future-proofed with `.goreleaser.yml` update. * Update CHANGELOG for #17486
1 parent 509d38b commit 7a0bb65

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

.changelog/17486.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
provider: Add terraform-provider-aws version to HTTP User-Agent header
3+
```

.goreleaser.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ builds:
2424
- goarch: '386'
2525
goos: darwin
2626
ldflags:
27-
- -s -w -X aws/version.ProviderVersion={{.Version}}
27+
- -s -w -X version.ProviderVersion={{.Version}}
2828
mod_timestamp: '{{ .CommitTimestamp }}'
2929
changelog:
3030
skip: true

aws/config.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ import (
168168
"github.com/hashicorp/aws-sdk-go-base/tfawserr"
169169
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
170170
"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
171+
"github.com/terraform-providers/terraform-provider-aws/version"
171172
)
172173

173174
type Config struct {
@@ -425,8 +426,8 @@ func (c *Config) Client() (interface{}, error) {
425426
UserAgentProducts: []*awsbase.UserAgentProduct{
426427
{Name: "APN", Version: "1.0"},
427428
{Name: "HashiCorp", Version: "1.0"},
428-
{Name: "Terraform", Version: c.terraformVersion,
429-
Extra: []string{"+https://www.terraform.io"}},
429+
{Name: "Terraform", Version: c.terraformVersion, Extra: []string{"+https://www.terraform.io"}},
430+
{Name: "terraform-provider-aws", Version: version.ProviderVersion, Extra: []string{"+https://registry.terraform.io/providers/hashicorp/aws"}},
430431
},
431432
}
432433

version/version.go

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package version
2+
3+
// ProviderVersion is set during the release process to the release version of the binary
4+
var ProviderVersion = "dev"

0 commit comments

Comments
 (0)