-
Notifications
You must be signed in to change notification settings - Fork 50
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.
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
Waypoint: Require TF Project ID to be set, instead of a terraform_cloud_workspace_details
resource
#1052
Waypoint: Require TF Project ID to be set, instead of a terraform_cloud_workspace_details
resource
#1052
Conversation
4947ab5
to
de42370
Compare
internal/provider/waypoint/resource_waypoint_add_on_definition.go
Outdated
Show resolved
Hide resolved
internal/provider/waypoint/resource_waypoint_add_on_definition.go
Outdated
Show resolved
Hide resolved
internal/provider/waypoint/resource_waypoint_add_on_definition.go
Outdated
Show resolved
Hide resolved
9fc16ec
to
43ae8e3
Compare
f1a6ce9
to
5400bc3
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me! Please make sure to run the acceptance tests and include the results in the PR description.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should either remove/deprecate the existing terraform_cloud_workspace_details
block completely, or just mark the name
part of it as Optional
and provide a default (like how this PR does)
internal/provider/waypoint/resource_waypoint_add_on_definition.go
Outdated
Show resolved
Hide resolved
internal/provider/waypoint/resource_waypoint_add_on_definition.go
Outdated
Show resolved
Hide resolved
f21e5ca
to
0d61988
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for simplifying the template's project config setting on this client's side of things.
Could someone from @hashicorp/cloud-core-platform-surfaces review this PR? Thanks |
f6c032c
to
8ac2c1e
Compare
There are some acceptance test failures but I think those failures are also on |
Could one of @meirish @pierluc-codes or @jasonpilz review this? Thanks |
This shouldn't be required, and it's no longer used. This was accidentally left over from a rebase that was from a different PR. Additionally, this puts back some code that was not meant to be deleted.
ce39700
to
5d3fd1d
Compare
🛠️ Description
Prior to this commit, the template and add-on definition resource required a user to set a full resource for specifying
terraform_cloud_workspace_details
. However, this resource required users to set aname
which is a value that Waypoint does nothing with. Rather than requiring users to set this field that isn't used in the first place, this pull request instead introduces aterraform_project_id
field that is required, and will use the add-on or template name for the erroneous field.Fixes WAYP-2768 WAYP-2769
🏗️ Acceptance tests
Output from acceptance testing:
$ make testacc TESTARGS='-run=TestAccXXX' ...