Add HCP Consul Plus Tier #148

hanshasselberg · 2021-06-16T08:43:30Z

🛠️ Description

Pulling in hashicorp/hcp-sdk-go#24 to enable using private beta plus tier. Use go generate to regenerate docs.

🏗️ Acceptance tests

Are there any feature flags that are required to use this functionality? https://github.com/hashicorp/cloud-consul-service/pull/1164 contains the two flags that were added to control plus tier.
Have you added an acceptance test for the functionality being added?
Have you run the acceptance tests on this branch?

Output from acceptance testing:

I had to change the tier and scale in the test before this was passing.

$ make testacc TESTARGS='-run=TestAccConsulCluster'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/... -v -run=TestAccConsulCluster -timeout 120m
?   	github.com/hashicorp/terraform-provider-hcp/internal/clients	[no test files]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/consul	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/input	(cached) [no tests to run]
=== RUN   TestAccConsulCluster
--- PASS: TestAccConsulCluster (1178.55s)
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider	1179.231s
...

riddhi89 · 2021-06-16T21:44:39Z

internal/provider/validators_test.go

+		"development": {
+			input:    "development",
+			expected: nil,
+		},


looks like the valid tier lowercase testcase below can be removed now, with this test case doing the same thing.

I like having the additional test case. I know it is duplicated, but makes sure all tiers are covered and the different ways to spell them.

bcmdarroch

Looks good! 🎉 Just had some documentation nits and the new go SDK version that can go in go.mod.

bcmdarroch · 2021-06-16T22:48:26Z

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/google/uuid v1.2.0
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/hcl/v2 v2.8.2 // indirect
-	github.com/hashicorp/hcp-sdk-go v0.8.0
+	github.com/hashicorp/hcp-sdk-go v0.8.1-0.20210615232900-f12e2d231a28


I just cut the release so you can bump this to v0.9.0

bcmdarroch · 2021-06-16T23:13:09Z

GNUmakefile

@@ -55,6 +55,7 @@ depscheck:
 gencheck:
 	@echo "==> Checking generated source code..."
 	go generate
+	@git diff


is this just to show the diff?

bcmdarroch · 2021-06-16T23:27:41Z

templates/resources/consul_cluster.md.tmpl

@@ -14,6 +14,7 @@ description: |-
 {{ tffile "examples/resources/hcp_consul_cluster/resource.tf" }}

 -> **Note:** The `primary_link` attribute is related to federation, a feature that is currently in private beta.
+-> **Note:** The `plus` tier is currently in private beta.


Just double-checked this with the doc preview tool and looks like there needs to be a blank line between the notes for them to render separately.

Also, could you move the banners below # {{.Type}} ({{.Name}})? I just realized we don't have a consistent pattern across our pages. 😔

bcmdarroch · 2021-06-16T23:31:18Z

internal/provider/resource_consul_cluster.go

@@ -69,7 +69,7 @@ func resourceConsulCluster() *schema.Resource {
 			},
 			"tier": {
 				// TODO: link to HCP Consul feature tier page when it is available
-				Description:      "The tier that the HCP Consul cluster will be provisioned as.  Only `development` and `standard` are available at this time.",
+				Description:      "The tier that the HCP Consul cluster will be provisioned as.  Only `development`, `standard` and `plus` are available at this time.",


Lookin at that TODO, looks like the pricing page exists now if you want to add the link here.

Suggested change

Description: "The tier that the HCP Consul cluster will be provisioned as. Only `development`, `standard` and `plus` are available at this time.",

Description: "The tier that the HCP Consul cluster will be provisioned as. Only `development`, `standard` and `plus` are available at this time. See [pricing information](https://cloud.hashicorp.com/pricing/consul).",

riddhi89 · 2021-06-17T16:01:08Z

docs/resources/consul_cluster.md

 <!-- schema generated by tfplugindocs -->
 ## Schema

 ### Required

 - **cluster_id** (String) The ID of the HCP Consul cluster.
 - **hvn_id** (String) The ID of the HVN this HCP Consul cluster is associated to.
- **tier** (String) The tier that the HCP Consul cluster will be provisioned as.  Only `development` and `standard` are available at this time.
+- **tier** (String) The tier that the HCP Consul cluster will be provisioned as.  Only `development`, `standard` and `plus` are available at this time.


I think you might need to regen the docs to include the added link to the pricing page.

hanshasselberg · 2021-06-17T20:06:30Z

@bcmdarroch I addressed your feedback. I was just wondering if I need to add any tests? And I guess I have to test this locally!

bcmdarroch · 2021-06-17T21:06:32Z

I think the validator test update is sufficient as far as unit tests go. I would do a local run of the Consul cluster acceptance test swapping development for plus and add the results to your PR description - but probably best to leave the acceptance tests on development since that doesn't require billing set up on the test environment.

hanshasselberg · 2021-06-18T11:45:20Z

Put the output in the PR description.

hanshasselberg requested a review from a team June 16, 2021 08:43

riddhi89 reviewed Jun 16, 2021

View reviewed changes

bcmdarroch approved these changes Jun 16, 2021

View reviewed changes

hanshasselberg requested a review from a team as a code owner June 17, 2021 11:52

riddhi89 approved these changes Jun 17, 2021

View reviewed changes

riddhi89 reviewed Jun 17, 2021

View reviewed changes

bcmdarroch mentioned this pull request Jun 17, 2021

Bump github.com/hashicorp/hcp-sdk-go from 0.8.0 to 0.9.0 #149

Closed

add plus tier

6f34a17

hanshasselberg force-pushed the add_plus branch from e0837dc to 6f34a17 Compare June 17, 2021 19:26

bcmdarroch merged commit 70febf9 into main Jun 18, 2021

bcmdarroch deleted the add_plus branch June 18, 2021 19:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add HCP Consul Plus Tier #148

Add HCP Consul Plus Tier #148

hanshasselberg commented Jun 16, 2021 •

edited

Loading

riddhi89 Jun 16, 2021 •

edited

Loading

hanshasselberg Jun 17, 2021

bcmdarroch left a comment

bcmdarroch Jun 16, 2021

bcmdarroch Jun 16, 2021

bcmdarroch Jun 16, 2021

bcmdarroch Jun 16, 2021 •

edited

Loading

riddhi89 Jun 17, 2021

hanshasselberg commented Jun 17, 2021 •

edited

Loading

bcmdarroch commented Jun 17, 2021

hanshasselberg commented Jun 18, 2021

	Description: "The tier that the HCP Consul cluster will be provisioned as. Only `development`, `standard` and `plus` are available at this time.",
	Description: "The tier that the HCP Consul cluster will be provisioned as. Only `development`, `standard` and `plus` are available at this time. See [pricing information](https://cloud.hashicorp.com/pricing/consul).",

Add HCP Consul Plus Tier #148

Add HCP Consul Plus Tier #148

Conversation

hanshasselberg commented Jun 16, 2021 • edited Loading

🛠️ Description

🏗️ Acceptance tests

riddhi89 Jun 16, 2021 • edited Loading

Choose a reason for hiding this comment

hanshasselberg Jun 17, 2021

Choose a reason for hiding this comment

bcmdarroch left a comment

Choose a reason for hiding this comment

bcmdarroch Jun 16, 2021

Choose a reason for hiding this comment

bcmdarroch Jun 16, 2021

Choose a reason for hiding this comment

bcmdarroch Jun 16, 2021

Choose a reason for hiding this comment

bcmdarroch Jun 16, 2021 • edited Loading

Choose a reason for hiding this comment

riddhi89 Jun 17, 2021

Choose a reason for hiding this comment

hanshasselberg commented Jun 17, 2021 • edited Loading

bcmdarroch commented Jun 17, 2021

hanshasselberg commented Jun 18, 2021

hanshasselberg commented Jun 16, 2021 •

edited

Loading

riddhi89 Jun 16, 2021 •

edited

Loading

bcmdarroch Jun 16, 2021 •

edited

Loading

hanshasselberg commented Jun 17, 2021 •

edited

Loading