Modify docs, examples and tests to reference prod-us-east-0 instead of us. (#2032)

nachogiljaldo · web-flow · commit 021c33891de7 · 2025-02-17T12:55:09.000+01:00
diff --git a/docs/index.md b/docs/index.md
@@ -58,7 +58,7 @@ resource "grafana_cloud_stack" "my_stack" {
 
   name        = "myteststack"
   slug        = "myteststack"
-  region_slug = "us"
+  region_slug = "prod-us-east-0"
 }
 
 // Step 2: Create a service account and key for the stack
@@ -102,7 +102,7 @@ variable "cloud_access_policy_token" {
 }
 variable "stack_slug" {}
 variable "cloud_region" {
-  default = "us"
+  default = "prod-us-east-0"
 }
 
 // Step 1: Create a stack
diff --git a/docs/resources/cloud_access_policy.md b/docs/resources/cloud_access_policy.md
@@ -27,7 +27,7 @@ data "grafana_cloud_organization" "current" {
 }
 
 resource "grafana_cloud_access_policy" "test" {
-  region       = "us"
+  region       = "prod-us-east-0"
   name         = "my-policy"
   display_name = "My Policy"
 
@@ -44,7 +44,7 @@ resource "grafana_cloud_access_policy" "test" {
 }
 
 resource "grafana_cloud_access_policy_token" "test" {
-  region           = "us"
+  region           = "prod-us-east-0"
   access_policy_id = grafana_cloud_access_policy.test.policy_id
   name             = "my-policy-token"
   display_name     = "My Policy Token"
diff --git a/docs/resources/cloud_access_policy_token.md b/docs/resources/cloud_access_policy_token.md
@@ -27,7 +27,7 @@ data "grafana_cloud_organization" "current" {
 }
 
 resource "grafana_cloud_access_policy" "test" {
-  region       = "us"
+  region       = "prod-us-east-0"
   name         = "my-policy"
   display_name = "My Policy"
 
@@ -44,7 +44,7 @@ resource "grafana_cloud_access_policy" "test" {
 }
 
 resource "grafana_cloud_access_policy_token" "test" {
-  region           = "us"
+  region           = "prod-us-east-0"
   access_policy_id = grafana_cloud_access_policy.test.policy_id
   name             = "my-policy-token"
   display_name     = "My Policy Token"
diff --git a/docs/resources/cloud_private_data_source_connect_network.md b/docs/resources/cloud_private_data_source_connect_network.md
@@ -27,7 +27,7 @@ data "grafana_cloud_stack" "current" {
 }
 
 resource "grafana_cloud_private_data_source_connect_network" "test" {
-  region           = "us"
+  region           = "prod-us-east-0"
   name             = "my-pdc"
   display_name     = "My PDC"
   stack_identifier = data.grafana_cloud_stack.current.id
diff --git a/docs/resources/cloud_private_data_source_connect_network_token.md b/docs/resources/cloud_private_data_source_connect_network_token.md
@@ -27,7 +27,7 @@ data "grafana_cloud_stack" "current" {
 }
 
 resource "grafana_cloud_private_data_source_connect_network" "test" {
-  region           = "us"
+  region           = "prod-us-east-0"
   name             = "my-pdc"
   display_name     = "My PDC"
   stack_identifier = data.grafana_cloud_stack.current.id
diff --git a/docs/resources/synthetic_monitoring_installation.md b/docs/resources/synthetic_monitoring_installation.md
@@ -35,7 +35,7 @@ variable "cloud_access_policy_token" {
 }
 variable "stack_slug" {}
 variable "cloud_region" {
-  default = "us"
+  default = "prod-us-east-0"
 }
 
 // Step 1: Create a stack
diff --git a/examples/provider/provider-cloud.tf b/examples/provider/provider-cloud.tf
@@ -9,7 +9,7 @@ resource "grafana_cloud_stack" "my_stack" {
 
   name        = "myteststack"
   slug        = "myteststack"
-  region_slug = "us"
+  region_slug = "prod-us-east-0"
 }
 
 // Step 2: Create a service account and key for the stack
diff --git a/examples/resources/grafana_cloud_access_policy/resource.tf b/examples/resources/grafana_cloud_access_policy/resource.tf
@@ -3,7 +3,7 @@ data "grafana_cloud_organization" "current" {
 }
 
 resource "grafana_cloud_access_policy" "test" {
-  region       = "us"
+  region       = "prod-us-east-0"
   name         = "my-policy"
   display_name = "My Policy"
 
@@ -20,7 +20,7 @@ resource "grafana_cloud_access_policy" "test" {
 }
 
 resource "grafana_cloud_access_policy_token" "test" {
-  region           = "us"
+  region           = "prod-us-east-0"
   access_policy_id = grafana_cloud_access_policy.test.policy_id
   name             = "my-policy-token"
   display_name     = "My Policy Token"
diff --git a/examples/resources/grafana_cloud_access_policy_token/resource.tf b/examples/resources/grafana_cloud_access_policy_token/resource.tf
@@ -3,7 +3,7 @@ data "grafana_cloud_organization" "current" {
 }
 
 resource "grafana_cloud_access_policy" "test" {
-  region       = "us"
+  region       = "prod-us-east-0"
   name         = "my-policy"
   display_name = "My Policy"
 
@@ -20,7 +20,7 @@ resource "grafana_cloud_access_policy" "test" {
 }
 
 resource "grafana_cloud_access_policy_token" "test" {
-  region           = "us"
+  region           = "prod-us-east-0"
   access_policy_id = grafana_cloud_access_policy.test.policy_id
   name             = "my-policy-token"
   display_name     = "My Policy Token"
diff --git a/examples/resources/grafana_cloud_private_data_source_connect_network/resource.tf b/examples/resources/grafana_cloud_private_data_source_connect_network/resource.tf
@@ -3,7 +3,7 @@ data "grafana_cloud_stack" "current" {
 }
 
 resource "grafana_cloud_private_data_source_connect_network" "test" {
-  region           = "us"
+  region           = "prod-us-east-0"
   name             = "my-pdc"
   display_name     = "My PDC"
   stack_identifier = data.grafana_cloud_stack.current.id
diff --git a/examples/resources/grafana_cloud_private_data_source_connect_network_token/resource.tf b/examples/resources/grafana_cloud_private_data_source_connect_network_token/resource.tf
@@ -3,7 +3,7 @@ data "grafana_cloud_stack" "current" {
 }
 
 resource "grafana_cloud_private_data_source_connect_network" "test" {
-  region           = "us"
+  region           = "prod-us-east-0"
   name             = "my-pdc"
   display_name     = "My PDC"
   stack_identifier = data.grafana_cloud_stack.current.id
diff --git a/examples/resources/grafana_synthetic_monitoring_installation/resource.tf b/examples/resources/grafana_synthetic_monitoring_installation/resource.tf
@@ -3,7 +3,7 @@ variable "cloud_access_policy_token" {
 }
 variable "stack_slug" {}
 variable "cloud_region" {
-  default = "us"
+  default = "prod-us-east-0"
 }
 
 // Step 1: Create a stack
diff --git a/internal/resources/cloud/data_source_cloud_access_policies_test.go b/internal/resources/cloud/data_source_cloud_access_policies_test.go
@@ -30,11 +30,11 @@ func TestDataSourceAccessPolicy_Basic(t *testing.T) {
 		"datadog:validate",
 	}
 
-	accessPolicyConfig := testAccCloudAccessPolicyTokenConfigBasic(randomName, randomName+"display", "us", scopes, expiresAt)
+	accessPolicyConfig := testAccCloudAccessPolicyTokenConfigBasic(randomName, randomName+"display", "prod-us-east-0", scopes, expiresAt)
 	setItemMatcher := func(s *terraform.State) error {
 		return resource.TestCheckTypeSetElemNestedAttrs("data.grafana_cloud_access_policies.test", "access_policies.*", map[string]string{
 			"id":           *policy.Id,
-			"region":       "us",
+			"region":       "prod-us-east-0",
 			"name":         randomName,
 			"display_name": randomName + "display",
 			"status":       *policy.Status,
@@ -43,7 +43,7 @@ func TestDataSourceAccessPolicy_Basic(t *testing.T) {
 
 	resource.ParallelTest(t, resource.TestCase{
 		ProtoV5ProviderFactories: testutils.ProtoV5ProviderFactories,
-		CheckDestroy:             testAccCloudAccessPolicyCheckDestroy("us", &policy),
+		CheckDestroy:             testAccCloudAccessPolicyCheckDestroy("prod-us-east-0", &policy),
 		Steps: []resource.TestStep{
 			// Test without filters
 			{
@@ -70,23 +70,23 @@ func TestDataSourceAccessPolicy_Basic(t *testing.T) {
 			},
 			// Test with region filter
 			{
-				Config: accessPolicyConfig + testAccDataSourceAccessPoliciesConfigBasic(nil, common.Ref("us")),
+				Config: accessPolicyConfig + testAccDataSourceAccessPoliciesConfigBasic(nil, common.Ref("prod-us-east-0")),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCloudAccessPolicyCheckExists("grafana_cloud_access_policy.test", &policy),
 
 					resource.TestCheckNoResourceAttr("data.grafana_cloud_access_policies.test", "name_filter"),
-					resource.TestCheckResourceAttr("data.grafana_cloud_access_policies.test", "region_filter", "us"),
+					resource.TestCheckResourceAttr("data.grafana_cloud_access_policies.test", "region_filter", "prod-us-east-0"),
 					setItemMatcher,
 				),
 			},
 			// Test with name and region filter
 			{
-				Config: accessPolicyConfig + testAccDataSourceAccessPoliciesConfigBasic(&randomName, common.Ref("us")),
+				Config: accessPolicyConfig + testAccDataSourceAccessPoliciesConfigBasic(&randomName, common.Ref("prod-us-east-0")),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCloudAccessPolicyCheckExists("grafana_cloud_access_policy.test", &policy),
 
 					resource.TestCheckResourceAttr("data.grafana_cloud_access_policies.test", "name_filter", randomName),
-					resource.TestCheckResourceAttr("data.grafana_cloud_access_policies.test", "region_filter", "us"),
+					resource.TestCheckResourceAttr("data.grafana_cloud_access_policies.test", "region_filter", "prod-us-east-0"),
 					resource.TestCheckResourceAttr("data.grafana_cloud_access_policies.test", "access_policies.#", "1"),
 					setItemMatcher,
 				),
diff --git a/internal/resources/cloud/resource_cloud_access_policy_token_test.go b/internal/resources/cloud/resource_cloud_access_policy_token_test.go
@@ -48,12 +48,12 @@ func TestResourceAccessPolicyToken_Basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		ProtoV5ProviderFactories: testutils.ProtoV5ProviderFactories,
 		CheckDestroy: resource.ComposeTestCheckFunc(
-			testAccCloudAccessPolicyCheckDestroy("us", &policy),
-			testAccCloudAccessPolicyTokenCheckDestroy("us", &policyToken),
+			testAccCloudAccessPolicyCheckDestroy("prod-us-east-0", &policy),
+			testAccCloudAccessPolicyTokenCheckDestroy("prod-us-east-0", &policyToken),
 		),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCloudAccessPolicyTokenConfigBasic(initialName, "", "us", initialScopes, expiresAt),
+				Config: testAccCloudAccessPolicyTokenConfigBasic(initialName, "", "prod-us-east-0", initialScopes, expiresAt),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCloudAccessPolicyCheckExists("grafana_cloud_access_policy.test", &policy),
 					testAccCloudAccessPolicyTokenCheckExists("grafana_cloud_access_policy_token.test", &policyToken),
@@ -76,15 +76,15 @@ func TestResourceAccessPolicyToken_Basic(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccCloudAccessPolicyTokenConfigBasic(initialName, "", "us", initialScopes, expiresAt),
+				Config: testAccCloudAccessPolicyTokenConfigBasic(initialName, "", "prod-us-east-0", initialScopes, expiresAt),
 				PreConfig: func() {
 					orgID, err := strconv.ParseInt(*policy.OrgId, 10, 32)
 					if err != nil {
 						t.Fatal(err)
 					}
 					client := testutils.Provider.Meta().(*common.Client).GrafanaCloudAPI
 					_, _, err = client.TokensAPI.DeleteToken(context.Background(), *policyToken.Id).
-						Region("us").
+						Region("prod-us-east-0").
 						OrgId(int32(orgID)).
 						XRequestId("deleting-token").Execute()
 					if err != nil {
@@ -93,7 +93,7 @@ func TestResourceAccessPolicyToken_Basic(t *testing.T) {
 				},
 			},
 			{
-				Config: testAccCloudAccessPolicyTokenConfigBasic(initialName, "updated", "us", updatedScopes, expiresAt),
+				Config: testAccCloudAccessPolicyTokenConfigBasic(initialName, "updated", "prod-us-east-0", updatedScopes, expiresAt),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCloudAccessPolicyCheckExists("grafana_cloud_access_policy.test", &policy),
 					testAccCloudAccessPolicyTokenCheckExists("grafana_cloud_access_policy_token.test", &policyToken),
@@ -112,7 +112,7 @@ func TestResourceAccessPolicyToken_Basic(t *testing.T) {
 			},
 			// Recreate
 			{
-				Config: testAccCloudAccessPolicyTokenConfigBasic(updatedName, "updated", "us", updatedScopes, expiresAt),
+				Config: testAccCloudAccessPolicyTokenConfigBasic(updatedName, "updated", "prod-us-east-0", updatedScopes, expiresAt),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCloudAccessPolicyCheckExists("grafana_cloud_access_policy.test", &policy),
 					testAccCloudAccessPolicyTokenCheckExists("grafana_cloud_access_policy_token.test", &policyToken),
@@ -152,7 +152,7 @@ func TestResourceAccessPolicyToken_NoExpiration(t *testing.T) {
 		ProtoV5ProviderFactories: testutils.ProtoV5ProviderFactories,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCloudAccessPolicyTokenConfigBasic(randomName, "", "us", []string{"metrics:read"}, ""),
+				Config: testAccCloudAccessPolicyTokenConfigBasic(randomName, "", "prod-us-east-0", []string{"metrics:read"}, ""),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCloudAccessPolicyCheckExists("grafana_cloud_access_policy.test", &policy),
 					testAccCloudAccessPolicyTokenCheckExists("grafana_cloud_access_policy_token.test", &policyToken),
diff --git a/internal/resources/cloud/resource_private_data_source_connect_network_token_test.go b/internal/resources/cloud/resource_private_data_source_connect_network_token_test.go
@@ -27,12 +27,12 @@ func TestResourcePrivateDataSourceConnectNetworkToken_Basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		ProtoV5ProviderFactories: testutils.ProtoV5ProviderFactories,
 		CheckDestroy: resource.ComposeTestCheckFunc(
-			testAccCloudAccessPolicyCheckDestroy("us", &pdcNetwork),
-			testAccCloudAccessPolicyTokenCheckDestroy("us", &pdcNetworkToken),
+			testAccCloudAccessPolicyCheckDestroy("prod-us-east-0", &pdcNetwork),
+			testAccCloudAccessPolicyTokenCheckDestroy("prod-us-east-0", &pdcNetworkToken),
 		),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCloudPrivateDataSourceConnectNetworkConfigBasic(initialName, "", "us"),
+				Config: testAccCloudPrivateDataSourceConnectNetworkConfigBasic(initialName, "", "prod-us-east-0"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCloudAccessPolicyCheckExists("grafana_cloud_access_policy.test", &pdcNetwork),
 					testAccCloudAccessPolicyTokenCheckExists("grafana_cloud_access_policy_token.test", &pdcNetworkToken),

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ resource "grafana_cloud_stack" "my_stack" {`
`58`	`58`
`59`	`59`	`name = "myteststack"`
`60`	`60`	`slug = "myteststack"`
`61`		`- region_slug = "us"`
	`61`	`+ region_slug = "prod-us-east-0"`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// Step 2: Create a service account and key for the stack`
`@@ -102,7 +102,7 @@ variable "cloud_access_policy_token" {`
`102`	`102`	`}`
`103`	`103`	`variable "stack_slug" {}`
`104`	`104`	`variable "cloud_region" {`
`105`		`- default = "us"`
	`105`	`+ default = "prod-us-east-0"`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`// Step 1: Create a stack`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ data "grafana_cloud_organization" "current" {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`resource "grafana_cloud_access_policy" "test" {`
`30`		`- region = "us"`
	`30`	`+ region = "prod-us-east-0"`
`31`	`31`	`name = "my-policy"`
`32`	`32`	`display_name = "My Policy"`
`33`	`33`
`@@ -44,7 +44,7 @@ resource "grafana_cloud_access_policy" "test" {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`resource "grafana_cloud_access_policy_token" "test" {`
`47`		`- region = "us"`
	`47`	`+ region = "prod-us-east-0"`
`48`	`48`	`access_policy_id = grafana_cloud_access_policy.test.policy_id`
`49`	`49`	`name = "my-policy-token"`
`50`	`50`	`display_name = "My Policy Token"`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ data "grafana_cloud_stack" "current" {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`resource "grafana_cloud_private_data_source_connect_network" "test" {`
`30`		`- region = "us"`
	`30`	`+ region = "prod-us-east-0"`
`31`	`31`	`name = "my-pdc"`
`32`	`32`	`display_name = "My PDC"`
`33`	`33`	`stack_identifier = data.grafana_cloud_stack.current.id`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ variable "cloud_access_policy_token" {`
`35`	`35`	`}`
`36`	`36`	`variable "stack_slug" {}`
`37`	`37`	`variable "cloud_region" {`
`38`		`- default = "us"`
	`38`	`+ default = "prod-us-east-0"`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`// Step 1: Create a stack`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ resource "grafana_cloud_stack" "my_stack" {`
`9`	`9`
`10`	`10`	`name = "myteststack"`
`11`	`11`	`slug = "myteststack"`
`12`		`- region_slug = "us"`
	`12`	`+ region_slug = "prod-us-east-0"`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`// Step 2: Create a service account and key for the stack`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ data "grafana_cloud_organization" "current" {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`resource "grafana_cloud_access_policy" "test" {`
`6`		`- region = "us"`
	`6`	`+ region = "prod-us-east-0"`
`7`	`7`	`name = "my-policy"`
`8`	`8`	`display_name = "My Policy"`
`9`	`9`
`@@ -20,7 +20,7 @@ resource "grafana_cloud_access_policy" "test" {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`resource "grafana_cloud_access_policy_token" "test" {`
`23`		`- region = "us"`
	`23`	`+ region = "prod-us-east-0"`
`24`	`24`	`access_policy_id = grafana_cloud_access_policy.test.policy_id`
`25`	`25`	`name = "my-policy-token"`
`26`	`26`	`display_name = "My Policy Token"`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ data "grafana_cloud_stack" "current" {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`resource "grafana_cloud_private_data_source_connect_network" "test" {`
`6`		`- region = "us"`
	`6`	`+ region = "prod-us-east-0"`
`7`	`7`	`name = "my-pdc"`
`8`	`8`	`display_name = "My PDC"`
`9`	`9`	`stack_identifier = data.grafana_cloud_stack.current.id`