Skip to content

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

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

Merged
merged 1 commit into from
Feb 17, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions docs/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/resources/cloud_access_policy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions docs/resources/cloud_access_policy_token.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/cloud_private_data_source_connect_network.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/cloud_private_data_source_connect_network_token.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/synthetic_monitoring_installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/provider/provider-cloud.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/resources/grafana_cloud_access_policy/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions examples/resources/grafana_cloud_access_policy_token/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/resources/grafana_cloud_private_data_source_connect_network/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/resources/grafana_cloud_private_data_source_connect_network_token/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/resources/grafana_synthetic_monitoring_installation/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions internal/resources/cloud/data_source_cloud_access_policies_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
{
Expand All @@ -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,
),
Expand Down
16 changes: 8 additions & 8 deletions internal/resources/cloud/resource_cloud_access_policy_token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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 {
Expand All @@ -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),
Expand All @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
6 changes: 3 additions & 3 deletions internal/resources/cloud/resource_private_data_source_connect_network_token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading