Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump sdk version + fix hvs breaking changes #1122

Merged
merged 7 commits into from
Oct 23, 2024
Merged

Bump sdk version + fix hvs breaking changes #1122

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e9ed3b2
Bump sdk version + fix hvs breaking changes
keeefer Oct 17, 2024
9a81b44
changelog
keeefer Oct 17, 2024
e351652
missed a couple secret_names
keeefer Oct 17, 2024
c5ed03c
revert breaking change
keeefer Oct 21, 2024
ddbb7e8
revert breaking change
keeefer Oct 21, 2024
4d2808b
update changelog
keeefer Oct 22, 2024
2c68d62
Merge branch 'main' into hvs/update-secret-name
keeefer Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/1122.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
Upgrade the HCP SDK and fix breaking change w/ Vault Secrets
```
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we leave out the breaking change part of the changelog notes?

For someone that consumes the provider, they only care that the SDK was bumped and things work exactly like they used to. Seeing "breaking change" might trigger some false alarms.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah good point, ill update

2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637
github.com/hashicorp/go-uuid v1.0.3
github.com/hashicorp/go-version v1.7.0
github.com/hashicorp/hcp-sdk-go v0.116.0
github.com/hashicorp/hcp-sdk-go v0.117.0
github.com/hashicorp/terraform-plugin-docs v0.19.4
github.com/hashicorp/terraform-plugin-framework v1.5.0
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ github.com/hashicorp/hc-install v0.7.0 h1:Uu9edVqjKQxxuD28mR5TikkKDd/p55S8vzPC16
github.com/hashicorp/hc-install v0.7.0/go.mod h1:ELmmzZlGnEcqoUMKUuykHaPCIR1sYLYX+KSggWSKZuA=
github.com/hashicorp/hcl/v2 v2.19.1 h1://i05Jqznmb2EXqa39Nsvyan2o5XyMowW5fnCKW5RPI=
github.com/hashicorp/hcl/v2 v2.19.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE=
github.com/hashicorp/hcp-sdk-go v0.116.0 h1:WhmEzOxoswQsX0s8Hk84RE1avu+rwV2e51R8uOb9ZhY=
github.com/hashicorp/hcp-sdk-go v0.116.0/go.mod h1:vQ4fzdL1AmhIAbCw+4zmFe5Hbpajj3NvRWkJoVuxmAk=
github.com/hashicorp/hcp-sdk-go v0.117.0 h1:7lJpkinpWdsXtejC+X7MdaE/3zhFMweB9Ym3uJ7qFJw=
github.com/hashicorp/hcp-sdk-go v0.117.0/go.mod h1:vQ4fzdL1AmhIAbCw+4zmFe5Hbpajj3NvRWkJoVuxmAk=
github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
github.com/hashicorp/terraform-exec v0.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVWkd/RG0D2XQ=
Expand Down
2 changes: 1 addition & 1 deletion internal/clients/vault_secrets_preview.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func GetRotatingSecretState(ctx context.Context, client *Client, loc *sharedmode
WithOrganizationID(loc.OrganizationID).
WithProjectID(loc.ProjectID).
WithAppName(appName).
WithSecretName(secretName)
WithName(secretName)

resp, err := client.VaultSecretsPreview.GetRotatingSecretState(params, nil)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/vaultsecrets/rotating_secret_mongodb_atlas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func (s *mongoDBAtlasRotatingSecret) read(ctx context.Context, client secret_ser
WithOrganizationID(secret.OrganizationID.ValueString()).
WithProjectID(secret.ProjectID.ValueString()).
WithAppName(secret.AppName.ValueString()).
WithSecretName(secret.Name.ValueString()), nil)
WithName(secret.Name.ValueString()), nil)
if err != nil && !clients.IsResponseCodeNotFound(err) {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/vaultsecrets/rotating_secret_twilio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func (s *twilioRotatingSecret) read(ctx context.Context, client secret_service.C
WithOrganizationID(secret.OrganizationID.ValueString()).
WithProjectID(secret.ProjectID.ValueString()).
WithAppName(secret.AppName.ValueString()).
WithSecretName(secret.Name.ValueString()), nil)
WithName(secret.Name.ValueString()), nil)
if err != nil && !clients.IsResponseCodeNotFound(err) {
return nil, err
}
Expand Down