From 0ddfe333302663882af65dc9572a27a952051587 Mon Sep 17 00:00:00 2001 From: JohnSharpe Date: Wed, 1 May 2024 09:55:37 +0100 Subject: [PATCH] Renamed fixed_plan to essentials_plan --- ..._plan.md => rediscloud_essentials_plan.md} | 14 +- ... datasource_rediscloud_essentials_plan.go} | 8 +- ...asource_rediscloud_essentials_plan_test.go | 138 ++++++++++++++++++ .../datasource_rediscloud_fixed_plan_test.go | 138 ------------------ provider/provider.go | 2 +- 5 files changed, 150 insertions(+), 150 deletions(-) rename docs/data-sources/{rediscloud_fixed_plan.md => rediscloud_essentials_plan.md} (87%) rename provider/{datasource_rediscloud_fixed_plan.go => datasource_rediscloud_essentials_plan.go} (97%) create mode 100644 provider/datasource_rediscloud_essentials_plan_test.go delete mode 100644 provider/datasource_rediscloud_fixed_plan_test.go diff --git a/docs/data-sources/rediscloud_fixed_plan.md b/docs/data-sources/rediscloud_essentials_plan.md similarity index 87% rename from docs/data-sources/rediscloud_fixed_plan.md rename to docs/data-sources/rediscloud_essentials_plan.md index c057d5a6..626da021 100644 --- a/docs/data-sources/rediscloud_fixed_plan.md +++ b/docs/data-sources/rediscloud_essentials_plan.md @@ -1,25 +1,25 @@ --- layout: "rediscloud" -page_title: "Redis Cloud: rediscloud_fixed_plan" +page_title: "Redis Cloud: rediscloud_essentials_plan" description: |- - Fixed Plan data source in the Terraform provider Redis Cloud. + Essentials Plan data source in the Terraform provider Redis Cloud. --- -# Data Source: rediscloud_fixed_plan +# Data Source: rediscloud_essentials_plan -The Fixed Plan data source allows access to the templates for Fixed Subscriptions. +The Essentials Plan data source allows access to the templates for Essentials Subscriptions. ## Example Usage ```hcl -data "rediscloud_fixed_plan" "example" { +data "rediscloud_essentials_plan" "example" { name = "Single-Zone_1GB" provider = "AWS" region = "us-west-1" } -output "rediscloud_fixed_plan" { - value = data.rediscloud_fixed_plan.example.id +output "rediscloud_essentials_plan" { + value = data.rediscloud_essentials_plan.example.id } ``` diff --git a/provider/datasource_rediscloud_fixed_plan.go b/provider/datasource_rediscloud_essentials_plan.go similarity index 97% rename from provider/datasource_rediscloud_fixed_plan.go rename to provider/datasource_rediscloud_essentials_plan.go index fe667d9a..1cd4e1c2 100644 --- a/provider/datasource_rediscloud_fixed_plan.go +++ b/provider/datasource_rediscloud_essentials_plan.go @@ -10,10 +10,10 @@ import ( "strings" ) -func dataSourceRedisCloudFixedPlan() *schema.Resource { +func dataSourceRedisCloudEssentialsPlan() *schema.Resource { return &schema.Resource{ - Description: "", - ReadContext: dataSourceRedisCloudFixedPlanRead, + Description: "An Essentials subscription plan", + ReadContext: dataSourceRedisCloudEssentialsPlanRead, Schema: map[string]*schema.Schema{ "id": { @@ -145,7 +145,7 @@ func dataSourceRedisCloudFixedPlan() *schema.Resource { } } -func dataSourceRedisCloudFixedPlanRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func dataSourceRedisCloudEssentialsPlanRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics api := meta.(*apiClient) diff --git a/provider/datasource_rediscloud_essentials_plan_test.go b/provider/datasource_rediscloud_essentials_plan_test.go new file mode 100644 index 00000000..3960fe47 --- /dev/null +++ b/provider/datasource_rediscloud_essentials_plan_test.go @@ -0,0 +1,138 @@ +package provider + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "regexp" + "testing" +) + +func TestAccDataSourceRedisCloudEssentialsPlan_basic(t *testing.T) { + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + ProviderFactories: providerFactories, + CheckDestroy: nil, // Essentials Plans aren't managed by this provider + Steps: []resource.TestStep{ + { + Config: testAccDataSourceRedisCloudEssentialsPlan, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "id", "34843"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "name", "30MB"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "size", "30"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "size_measurement_unit", "MB"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "cloud_provider", "AWS"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "region", "us-east-1"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "region_id", "1"), + resource.TestCheckResourceAttrSet("data.rediscloud_essentials_plan.basic", "price"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "price_currency", "USD"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "price_period", "Month"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "maximum_databases", "1"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "maximum_throughput", "100"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "maximum_bandwidth_in_gb", "5"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "availability", "No replication"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "connections", "30"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "cidr_allow_rules", "1"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "support_data_persistence", "false"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "support_instant_and_daily_backups", "false"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "support_replication", "false"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "support_clustering", "false"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "supported_alerts.#", "2"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.basic", "customer_support", "Basic"), + ), + }, + }, + }) +} + +func TestAccDataSourceRedisCloudEssentialsPlan_azure(t *testing.T) { + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + ProviderFactories: providerFactories, + CheckDestroy: nil, // Essentials Plans aren't managed by this provider + Steps: []resource.TestStep{ + { + Config: testAccDataSourceRedisCloudEssentialsPlanAzure, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "id", "35008"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "name", "Single-Zone_Persistence_1GB"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "size", "1"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "size_measurement_unit", "GB"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "cloud_provider", "Azure"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "region", "west-us"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "region_id", "17"), + resource.TestCheckResourceAttrSet("data.rediscloud_essentials_plan.azure", "price"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "price_currency", "USD"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "price_period", "Month"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "maximum_databases", "1"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "maximum_throughput", "2000"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "maximum_bandwidth_in_gb", "200"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "availability", "Single-zone"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "connections", "1024"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "cidr_allow_rules", "8"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "support_data_persistence", "true"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "support_instant_and_daily_backups", "true"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "support_replication", "true"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "support_clustering", "false"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "supported_alerts.#", "5"), + resource.TestCheckResourceAttr("data.rediscloud_essentials_plan.azure", "customer_support", "Standard"), + ), + }, + }, + }) +} + +func TestAccDataSourceRedisCloudEssentialsPlan_ambiguous(t *testing.T) { + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + ProviderFactories: providerFactories, + CheckDestroy: nil, // Essentials Plans aren't managed by this provider + Steps: []resource.TestStep{ + { + Config: testAccDataSourceRedisCloudEssentialsPlanAmbiguous, + ExpectError: regexp.MustCompile("Your query returned more than one result. Please change try a more specific search criteria and try again."), + }, + }, + }) +} + +func TestAccDataSourceRedisCloudEssentialsPlan_impossible(t *testing.T) { + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + ProviderFactories: providerFactories, + CheckDestroy: nil, // Essentials Plans aren't managed by this provider + Steps: []resource.TestStep{ + { + Config: testAccDataSourceRedisCloudEssentialsPlanImpossible, + ExpectError: regexp.MustCompile("Your query returned no results. Please change your search criteria and try again."), + }, + }, + }) +} + +const testAccDataSourceRedisCloudEssentialsPlan = ` +data "rediscloud_essentials_plan" "basic" { + id = 34843 +} +` + +const testAccDataSourceRedisCloudEssentialsPlanAzure = ` +data "rediscloud_essentials_plan" "azure" { + id = 35008 + cloud_provider = "Azure" +} +` + +const testAccDataSourceRedisCloudEssentialsPlanAmbiguous = ` +data "rediscloud_essentials_plan" "ambiguous" { + name = "30MB" +} +` + +const testAccDataSourceRedisCloudEssentialsPlanImpossible = ` +data "rediscloud_essentials_plan" "impossible" { + name = "There should never be a essentials plan with this name!" +} +` diff --git a/provider/datasource_rediscloud_fixed_plan_test.go b/provider/datasource_rediscloud_fixed_plan_test.go deleted file mode 100644 index ad5bdcc8..00000000 --- a/provider/datasource_rediscloud_fixed_plan_test.go +++ /dev/null @@ -1,138 +0,0 @@ -package provider - -import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "regexp" - "testing" -) - -func TestAccDataSourceRedisCloudFixedPlan_basic(t *testing.T) { - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - ProviderFactories: providerFactories, - CheckDestroy: nil, // Fixed Plans aren't managed by this provider - Steps: []resource.TestStep{ - { - Config: testAccDataSourceRedisCloudFixedPlan, - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "id", "34843"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "name", "30MB"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "size", "30"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "size_measurement_unit", "MB"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "cloud_provider", "AWS"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "region", "us-east-1"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "region_id", "1"), - resource.TestCheckResourceAttrSet("data.rediscloud_fixed_plan.basic", "price"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "price_currency", "USD"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "price_period", "Month"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "maximum_databases", "1"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "maximum_throughput", "100"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "maximum_bandwidth_in_gb", "5"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "availability", "No replication"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "connections", "30"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "cidr_allow_rules", "1"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "support_data_persistence", "false"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "support_instant_and_daily_backups", "false"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "support_replication", "false"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "support_clustering", "false"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "supported_alerts.#", "2"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.basic", "customer_support", "Basic"), - ), - }, - }, - }) -} - -func TestAccDataSourceRedisCloudFixedPlan_azure(t *testing.T) { - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - ProviderFactories: providerFactories, - CheckDestroy: nil, // Fixed Plans aren't managed by this provider - Steps: []resource.TestStep{ - { - Config: testAccDataSourceRedisCloudFixedPlanAzure, - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "id", "35008"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "name", "Single-Zone_Persistence_1GB"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "size", "1"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "size_measurement_unit", "GB"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "cloud_provider", "Azure"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "region", "west-us"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "region_id", "17"), - resource.TestCheckResourceAttrSet("data.rediscloud_fixed_plan.azure", "price"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "price_currency", "USD"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "price_period", "Month"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "maximum_databases", "1"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "maximum_throughput", "2000"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "maximum_bandwidth_in_gb", "200"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "availability", "Single-zone"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "connections", "1024"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "cidr_allow_rules", "8"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "support_data_persistence", "true"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "support_instant_and_daily_backups", "true"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "support_replication", "true"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "support_clustering", "false"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "supported_alerts.#", "5"), - resource.TestCheckResourceAttr("data.rediscloud_fixed_plan.azure", "customer_support", "Standard"), - ), - }, - }, - }) -} - -func TestAccDataSourceRedisCloudFixedPlan_ambiguous(t *testing.T) { - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - ProviderFactories: providerFactories, - CheckDestroy: nil, // Fixed Plans aren't managed by this provider - Steps: []resource.TestStep{ - { - Config: testAccDataSourceRedisCloudFixedPlanAmbiguous, - ExpectError: regexp.MustCompile("Your query returned more than one result. Please change try a more specific search criteria and try again."), - }, - }, - }) -} - -func TestAccDataSourceRedisCloudFixedPlan_impossible(t *testing.T) { - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - ProviderFactories: providerFactories, - CheckDestroy: nil, // Fixed Plans aren't managed by this provider - Steps: []resource.TestStep{ - { - Config: testAccDataSourceRedisCloudFixedPlanImpossible, - ExpectError: regexp.MustCompile("Your query returned no results. Please change your search criteria and try again."), - }, - }, - }) -} - -const testAccDataSourceRedisCloudFixedPlan = ` -data "rediscloud_fixed_plan" "basic" { - id = 34843 -} -` - -const testAccDataSourceRedisCloudFixedPlanAzure = ` -data "rediscloud_fixed_plan" "azure" { - id = 35008 - cloud_provider = "Azure" -} -` - -const testAccDataSourceRedisCloudFixedPlanAmbiguous = ` -data "rediscloud_fixed_plan" "ambiguous" { - name = "30MB" -} -` - -const testAccDataSourceRedisCloudFixedPlanImpossible = ` -data "rediscloud_fixed_plan" "impossible" { - name = "There should never be a fixed plan with this name!" -} -` diff --git a/provider/provider.go b/provider/provider.go index aa4c9c43..f976f6dd 100644 --- a/provider/provider.go +++ b/provider/provider.go @@ -52,7 +52,7 @@ func New(version string) func() *schema.Provider { "rediscloud_acl_rule": dataSourceRedisCloudAclRule(), "rediscloud_acl_role": dataSourceRedisCloudAclRole(), "rediscloud_acl_user": dataSourceRedisCloudAclUser(), - "rediscloud_fixed_plan": dataSourceRedisCloudFixedPlan(), + "rediscloud_essentials_plan": dataSourceRedisCloudEssentialsPlan(), }, ResourcesMap: map[string]*schema.Resource{ "rediscloud_cloud_account": resourceRedisCloudCloudAccount(),