v0.11.0 release (#11)

Added support for V10MP2R2 model Removed support for specifying version plan by specific version (e.g 6.6.4) Co-authored-by: Tomas Simacek <tsimacek@pruestorage.com>

Author: tsimacek

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.11.0 (Sep, 20, 2024)
+* Added support for V10MP2R2 model
+* Removed support for specifying version plan by specific version (e.g `6.6.4`)
+
 ## 0.10.0 (July 9, 2024)
 
 * Added support for tagging by resource type, refer to the [documentation](docs/resources/array_azure.md#nested-schema-for-resource_tags)

Makefile

@@ -23,7 +23,7 @@ setup-basic:
 @mkdir -p .build-logs/
 
 setup-goreleaser:
-@curl -sfLO https://github.com/goreleaser/goreleaser/releases/download/v1.9.2/goreleaser_Linux_x86_64.tar.gz
+@curl -sfLO https://github.com/goreleaser/goreleaser/releases/download/v2.0.1/goreleaser_Linux_x86_64.tar.gz
 @mkdir -p $(TMPBIN)
 @tar -C $(TMPBIN) -xf goreleaser_Linux_x86_64.tar.gz
 @rm goreleaser_Linux_x86_64.tar.gz
@@ -36,7 +36,7 @@ test-goreleaser-release: setup-goreleaser setup-basic
 @gpg --batch --delete-secret-keys $(TEST_GPG_FINGERPRINT) &>/dev/null || true
 @gpg --batch --delete-keys $(TEST_GPG_FINGERPRINT) &>/dev/null || true
 @gpg --import < testing/private-key.gpg >> .build-logs/goreleaser-release 2>&1
-@GPG_FINGERPRINT=$(TEST_GPG_FINGERPRINT) CI="" goreleaser release --debug --snapshot --rm-dist >> .build-logs/goreleaser-release 2>&1
+@GPG_FINGERPRINT=$(TEST_GPG_FINGERPRINT) CI="" goreleaser release --verbose --snapshot --clean >> .build-logs/goreleaser-release 2>&1
 
 test-goreleaser-check: setup-goreleaser setup-basic
 @CI="" goreleaser check >> .build-logs/goreleaser-check 2>&1

cbs/common.go

@@ -142,11 +142,11 @@ func validateAzureManagedApplicationName(v interface{}, k string) (warnings []st
 func validateVersionPrefixTag(v interface{}, k string) (warnings []string, errors []error) {
 value := v.(string)
 
-pattern := `^\d+\.\d+(?:\.\d+|\.x)?$`
+pattern := `^\d+\.\d+\.x$`
 regexpPattern := regexp.MustCompile(pattern)
 
 if !regexpPattern.MatchString(value) {
-errors = append(errors, fmt.Errorf("version prefix tag format not correct"))
+errors = append(errors, fmt.Errorf("%q must follow {major}.{minor}.x format. See documentation for examples", k))
 }
 
 return warnings, errors

cbs/data_azure_plans.go

@@ -125,7 +125,7 @@ func (a PlanByVersion) Len() int { return len(a) }
 func (a PlanByVersion) Less(i, j int) bool { return a[i].Version.LessThan(&a[j].Version) }
 func (a PlanByVersion) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
 
-var plan_name_regexp = regexp.MustCompile(`^[\w]+_([\d]+)_([\d]+)_([\d]+)$`)
+var plan_name_regexp = regexp.MustCompile(`^[\w]+_([\d]+)_([\d]+)_(x)$`)
 
 // Retrieve a plan information from Azure DefaultTemplate artifact
 func GetPlanFromTemplateJson(data []byte) (*Plan, error) {
@@ -152,7 +152,11 @@ func versionPlans(plans []Plan) ([]VersionedPlan, error) {
 var versioned_plans []VersionedPlan
 for _, plan := range plans {
 match := plan_name_regexp.FindStringSubmatch(plan.Name)
-version, err := version.NewVersion(fmt.Sprintf("%s.%s.%s", match[1], match[2], match[3]))
+patch := match[3]
+if patch == "x" {
+patch = "99"
+}
+version, err := version.NewVersion(fmt.Sprintf("%s.%s.%s", match[1], match[2], patch))
 if err != nil {
 return nil, fmt.Errorf("Unable to parse version string in plan name: %s", plan.Name)
 }

cbs/data_azure_plans_test.go

@@ -96,19 +96,12 @@ func testAccDataAzurePlans() resource.TestCheckFunc {
 for i := 0; i < plans_size; i++ {
 // Check product version derivation from plan name makes sense.
 plan_name := data_resource.Primary.Attributes["plans."+strconv.Itoa(i)+".name"]
-name_match := plan_name_regexp.FindStringSubmatch(plan_name)
-name_version, err := version.NewVersion(fmt.Sprintf("%s.%s.%s", name_match[1], name_match[2], name_match[3]))
-if err != nil {
-return err
-}
-reference_version, _ := version.NewVersion("6.0.0")
-if name_version.LessThanOrEqual(reference_version) {
-return fmt.Errorf("Incorrect product version: %s", name_version.String())
+if !plan_name_regexp.MatchString(plan_name) {
+return fmt.Errorf("Incorrect plan id/name: %s, it should be in format of ", plan_name)
 }
-
 // We expect that product and publisher is a well-known string.
 plan_product := data_resource.Primary.Attributes["plans."+strconv.Itoa(i)+".product"]
-if plan_product != "pure_storage_cloud_block_store_deployment" {
+if plan_product != "pure_storage_cloud_block_store_deployment" && plan_product != "pure_cloud_block_store_product_deployment" {
 return fmt.Errorf("Incorrect plan product: %s", plan_product)
 }
 plan_publisher := data_resource.Primary.Attributes["plans."+strconv.Itoa(i)+".publisher"]
@@ -138,13 +131,17 @@ func testAccDataCbsPlanAzure() resource.TestCheckFunc {
 
 plan_name := data_resource.Primary.Attributes["name"]
 match := plan_name_regexp.FindStringSubmatch(plan_name)
-version_tag := fmt.Sprintf("%s.%s.%s", match[1], match[2], match[3])
+patch := match[3]
+if patch == "x" {
+patch = "99"
+}
+version_tag := fmt.Sprintf("%s.%s.%s", match[1], match[2], patch)
 if len(match) != 4 || !re.MatchString(version_tag) {
 return fmt.Errorf("Incorrect plan name: %s", plan_name)
 }
 
 plan_product := data_resource.Primary.Attributes["product"]
-if plan_product != "pure_storage_cloud_block_store_deployment" {
+if plan_product != "pure_storage_cloud_block_store_deployment" && plan_product != "pure_cloud_block_store_product_deployment" {
 return fmt.Errorf("Incorrect plan product : %s", plan_product)
 }
 

cbs/resource_array_azure.go

@@ -51,8 +51,8 @@ import (
 
 // Default managed application plan
 const (
-defaultPlanName = "cbs_azure_6_3_8"
-defaultPlanProduct = "pure_storage_cloud_block_store_deployment"
+defaultPlanName = "cbs_azure_6_5_x"
+defaultPlanProduct = "pure_cloud_block_store_product_deployment"
 defaultPlanPublisher = "purestoragemarketplaceadmin"
 defaultPlanVersion = "1.0.0"
 )
@@ -166,6 +166,7 @@ func resourceArrayAzure() *schema.Resource {
 ValidateFunc: validation.StringInSlice([]string{
 "V10MUR1",
 "V20MUR1",
+"V10MP2R2",
 "V20MP2R2",
 }, false),
 },

cbs/resource_array_azure_test.go

@@ -49,7 +49,7 @@ func TestAccArrayAzure_basic(t *testing.T) {
 // when tags are provided plan is needed to get plan specific
 // list of resources to assign all tags to each resource
 cbsAzureParam.PlanName = plans[0].Plan.Name
-cbsAzureParam.PlanProduct = "pure_storage_cloud_block_store_deployment"
+cbsAzureParam.PlanProduct = plans[0].Plan.Product
 cbsAzureParam.PlanPublisher = "purestoragemarketplaceadmin"
 cbsAzureParam.PlanVersion = plans[0].Plan.Version
 

docs/data-sources/azure_plans.md

@@ -8,22 +8,22 @@ description: |-
 
 # cbs_plan_azure (Data Source)
 
-Provides plan specific details specified by plan version parameter (or version prefix e.g. `6.6.4` or `6.6.x`)
+Provides plan specific details specified by plan version parameter. The version needs to be specified in format of version prefix e.g. `6.5.x` or `6.6.x` and similar. Specific versions like `6.6.10` are not supported as only the latest version in a given release line is svailable in the marketplace offer for deployment.
 
 ## Example Usage
 ```hcl
-data "cbs_plan_azure" "66x_latest_plan" {
+data "cbs_plan_azure" "cbs_plan_66x" {
  plan_version = "6.6.x"
 }
 
 resource "cbs_array_azure" "azure_instance" {
  (...)
 
  plan {
- name = data.cbs_plan_azure.66x_latest_plan.name
- product = data.cbs_plan_azure.66x_latest_plan.product
- publisher = data.cbs_plan_azure.66x_latest_plan.publisher
- version = data.cbs_plan_azure.66x_latest_plan.version
+ name = data.cbs_plan_azure.cbs_plan_66x.name
+ product = data.cbs_plan_azure.cbs_plan_66x.product
+ publisher = data.cbs_plan_azure.cbs_plan_66x.publisher
+ version = data.cbs_plan_azure.cbs_plan_66x.version
  }
 
  lifecycle {
@@ -34,7 +34,7 @@ resource "cbs_array_azure" "azure_instance" {
 }
 
 output "cbs_azure_available_plans" {
- value = data.cbs_plan_azure.66x_latest_plan
+ value = data.cbs_plan_azure.cbs_plan_66x
 }
 ```
 

docs/resources/array_azure.md

@@ -103,7 +103,7 @@ resource "cbs_array_azure" "azure_instance" {
 ## Argument Reference
 
 - `alert_recipients` (Optional) - List of email addresses to receive alerts.
-- `array_model` (Required) - CBS array size to launch. The possible values are `V10MUR1`, `V20MUR1` or `V20MP2R2`.
+- `array_model` (Required) - CBS array size to launch. The possible values are `V10MUR1`, `V20MUR1`, `V10MP2R2` or `V20MP2R2`.
 - `array_name` (Required) - Name of the array, and the name of the managed application.
 Required when the array is deployed for use in a Fusion cluster.
 - `iscsi_subnet` (Required) - Subnet containing the iSCSI interfaces on the array.

examples/aws_array/main.tf

@@ -2,7 +2,7 @@ terraform {
  required_providers {
  cbs = {
  source = "PureStorage-OpenConnect/cbs"
- version = "~> 0.10.0"
+ version = "~> 0.11.0"
  }
  }
 }