Cleanup

Author: volcanonoodle

examples/resources/grafana_cloud_access_policy_rotating_token/import.sh

@@ -1 +1 @@
-terraform import grafana_cloud_access_policy_token_rotation.name "{{ region }}:{{ tokenId }}"
+terraform import grafana_cloud_access_policy_rotating_token.name "{{ region }}:{{ tokenId }}"

examples/resources/grafana_cloud_access_policy_rotating_token/resource.tf

@@ -23,7 +23,7 @@ resource "time_rotating" "token_rotation" {
   rotation_days = 30
 }
 
-resource "grafana_cloud_access_policy_token_rotation" "test" {
+resource "grafana_cloud_access_policy_rotating_token" "test" {
   region                  = "prod-us-east-0"
   access_policy_id        = grafana_cloud_access_policy.test.policy_id
   name_prefix             = "my-policy-rotating-token"

internal/resources/cloud/resource_cloud_access_policy_rotating_token.go

@@ -79,7 +79,7 @@ This is similar to the grafana_cloud_access_policy_token resource, but it repres
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				Description:  "Prefix for the name of the access policy token. The actual name will be stored in the computed field `name`, which will be in the format '<name_prefix>-<post_rotation_lifetime seconds>-<rotate_after timestamp>'",
+				Description:  "Prefix for the name of the access policy token. The actual name will be stored in the computed field `name`, which will be in the format '<name_prefix>-<rotate_after>-<post_rotation_lifetime>'",
 				ValidateFunc: validation.StringLenBetween(1, 200),
 			},
 			"rotate_after": {
@@ -119,7 +119,7 @@ This is similar to the grafana_cloud_access_policy_token resource, but it repres
 			"expires_at": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "Expiration date of the access policy token.",
+				Description: "Expiration date of the access policy token. This is the result of adding `rotate_after` and `post_rotation_lifetime`",
 			},
 		}),
 	}

internal/resources/cloud/resource_cloud_access_policy_rotating_token_test.go

@@ -254,50 +254,3 @@ func testAccCloudAccessPolicyRotatingTokenConfigNoToken(name, displayName, regio
 	}
 	`, name, displayName, strings.Join(scopes, `","`), os.Getenv("GRAFANA_CLOUD_ORG"), region)
 }
-
-func testAccCloudAccessPolicyRotatingTokenConfigMismatch(name, displayName, region string, namePrefix string, rotateAfter int64, postRotationLifetime string) string {
-	if displayName != "" {
-		displayName = fmt.Sprintf("display_name = \"%s\"", displayName)
-	}
-
-	scopes := []string{
-		"metrics:read",
-		"logs:write",
-		"accesspolicies:read",
-		"accesspolicies:write",
-		"accesspolicies:delete",
-		"datadog:validate",
-	}
-
-	return fmt.Sprintf(`
-	data "grafana_cloud_organization" "current" {
-		slug = "%[4]s"
-	}
-
-	resource "grafana_cloud_access_policy" "rotating_token_test" {
-		region       = "%[7]s"
-		name         = "%[1]s"
-		%[2]s
-
-		scopes = ["%[3]s"]
-
-		realm {
-			type       = "org"
-			identifier = data.grafana_cloud_organization.current.id
-
-			label_policy {
-				selector = "{namespace=\"default\"}"
-			}
-		}
-	}
-
-	resource "grafana_cloud_access_policy_rotating_token" "test" {
-		region                  = "%[7]s"
-		access_policy_id        = grafana_cloud_access_policy.rotating_token_test.policy_id
-		name_prefix             = "%[5]s"
-		rotate_after            = "%[6]d"
-		post_rotation_lifetime  = "%[8]s"
-		%[2]s
-	}
-	`, name, displayName, strings.Join(scopes, `","`), os.Getenv("GRAFANA_CLOUD_ORG"), namePrefix, rotateAfter, region, postRotationLifetime)
-}