feat: multi select building block inputs

Adds support for multi select inputs and cleans up the building block resources code.
Also corrects schema restrictions for allowed input/output types.

Author: henryde

CHANGELOG.md

@@ -1,55 +1,77 @@
+## v0.14.0
+
+FEATURES:
+
+- Support multi select building block inputs.
+- Payment method resources.
+
+FIXES:
+
+- Restrict allowed value types for building block inputs, combined inputs and outputs.
+
 ## v0.13.0
 
 FEATURES:
+
 - Add metering config support to `meshstack_mesh_platform` resource and data source.
 - Add quotas to `meshstack_landingzone` resource and data source.
 
 FIXES:
+
 - Correctly model nullable platform config fields.
 
 ## v0.12.4
 
 FEATURES:
+
 - Add quota definitions to meshPlatforms.
 
 ## v0.12.3
 
 FIXES:
+
 - Bump terraform-plugin-docs and fix docs.
 
 ## v0.12.2
 
 FIXES:
+
 - Fix possible nil-pointer issue when handling obfuscated secrets.
 
 ## v0.12.1
 
 FIXES:
+
 - Handle obfuscated secrets in meshPlatform Azure Type.
 
 ## v0.12.0
 
 FEATURES:
+
 - Added `meshstack_mesh_platform` resource.
 - Added `meshstack_mesh_platform` data source.
 
 FIXES:
+
 - Fix landing zone data source.
 
 ## v0.11.0
 
 FEATURES:
+
 - Added `meshstack_mesh_landing_zone` resource.
 - Added `meshstack_mesh_landing_zone` data source.
 - Automatically set `type` inside platform_properties for landing zones.
 
 FIXES:
+
 - Fix landing zone status handling.
 - Make `type` a read-only property for landing zones.
 
 ## v0.10.1
 
 FIXES:
+
 - Correctly handle external changes to `meshstack_project` tags.
 - Prefer explicit provider configuration over environment variables.
 - Fix issues with optional `value_type` attributes for `meshstack_tag_definition`.
@@ -58,56 +80,66 @@ FIXES:
 ## v0.10.0
 
 FEATURES:
+
 - Added `meshstack_workspace_user_binding` resource.
 - Added `meshstack_workspace_group_binding` resource.
 
 ## v0.9.0
 
 FEATURES:
+
 - Added polling for building block (v2) and tenant (v4) resources until creation and deletion are complete.
 
 ## v0.8.0
 
 FEATURES:
+
 - Added `meshstack_workspace` resource.
 - Added `meshstack_workspace` data source.
 - Added `meshstack_tenant_v4` resource.
 - Added `meshstack_tenant_v4` data source.
 
 FIXES:
+
 - Allow `value_code` in `meshstack_building_block_v2` and `meshstack_building_block` resources.
 - Documentation.
 
 ## v0.7.1
 
 FEATURES:
+
 - Source provider configuration from environment variables.
 
 ## v0.7.0
 
 FEATURES:
+
 - Added `meshstack_building_block_v2` data source.
 - Added `meshstack_building_block_v2` resource.
 
 ## v0.6.1
 
 REFACTOR:
+
 - Validate success responses by checking for HTTP status codes in the 2xx range
 
 ## v0.6.0
 
 FEATURES:
+
 - Added `meshstack_tag_definitions` data source.
 - Added `meshstack_tag_definition` data source.
 - Added `meshstack_tag_definition` resource.
 
 ## v0.5.5
 
 FIXES:
+
 - HTTP response code for tenant creation is now 201.
 - HTTP response code for project creation is now 201.
 
 ## v0.5.4
 
 FIXES:
+
 - HTTP response code for building block creation is now 201.

client/buildingblock.go

@@ -14,6 +14,7 @@ const (
 	MESH_BUILDING_BLOCK_IO_TYPE_INTEGER       = "INTEGER"
 	MESH_BUILDING_BLOCK_IO_TYPE_BOOLEAN       = "BOOLEAN"
 	MESH_BUILDING_BLOCK_IO_TYPE_SINGLE_SELECT = "SINGLE_SELECT"
+	MESH_BUILDING_BLOCK_IO_TYPE_MULTI_SELECT  = "MULTI_SELECT"
 	MESH_BUILDING_BLOCK_IO_TYPE_FILE          = "FILE"
 	MESH_BUILDING_BLOCK_IO_TYPE_LIST          = "LIST"
 	MESH_BUILDING_BLOCK_IO_TYPE_CODE          = "CODE"

client/buildingblock_v2.go

@@ -158,11 +158,7 @@ func (c *MeshStackProviderClient) PollBuildingBlockV2UntilCompletion(ctx context
 	var result *MeshBuildingBlockV2
 
 	err := retry.RetryContext(ctx, 30*time.Minute, c.waitForBuildingBlockV2CompletionFunc(uuid, &result))
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
+	return result, err
 }
 
 // waitForBuildingBlockV2CompletionFunc returns a RetryFunc that checks building block completion status
@@ -176,12 +172,12 @@ func (c *MeshStackProviderClient) waitForBuildingBlockV2CompletionFunc(uuid stri
 		if current == nil {
 			return retry.NonRetryableError(fmt.Errorf("building block was not found while waiting for completion"))
 		}
+		*result = current
 
 		// Check if we've reached a terminal state
 		status := current.Status.Status
 		switch status {
 		case BUILDING_BLOCK_STATUS_SUCCEEDED:
-			*result = current
 			return nil // Success, stop retrying
 		case BUILDING_BLOCK_STATUS_FAILED:
 			return retry.NonRetryableError(fmt.Errorf("building block %s reached FAILED state", uuid))

client/tenant_v4.go

@@ -153,11 +153,7 @@ func (c *MeshStackProviderClient) PollTenantV4UntilCreation(ctx context.Context,
 	var result *MeshTenantV4
 
 	err := retry.RetryContext(ctx, 30*time.Minute, c.waitForTenantV4CreationFunc(uuid, &result))
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
+	return result, err
 }
 
 // waitForTenantV4CreationFunc returns a RetryFunc that checks tenant creation status

docs/data-sources/building_block_v2.md

@@ -74,14 +74,18 @@ Read-Only:
 <a id="nestedatt--spec--inputs"></a>
 ### Nested Schema for `spec.inputs`
 
+Optional:
+
+- `value_single_select` (String)
+
 Read-Only:
 
 - `value_bool` (Boolean)
 - `value_code` (String) Code value.
 - `value_file` (String)
 - `value_int` (Number)
-- `value_list` (String) JSON encoded list of objects.
-- `value_single_select` (String)
+- `value_list` (String) Deprecated: use `value_code` instead. JSON encoded list of objects.
+- `value_multi_select` (List of String) Multi-select value (list of strings).
 - `value_string` (String)
 
 
@@ -121,8 +125,5 @@ Read-Only:
 
 - `value_bool` (Boolean)
 - `value_code` (String) Code value.
-- `value_file` (String)
 - `value_int` (Number)
-- `value_list` (String) JSON encoded list of objects.
-- `value_single_select` (String)
 - `value_string` (String)

docs/data-sources/buildingblock.md

@@ -58,20 +58,24 @@ Read-Only:
 Read-Only:
 
 - `display_name` (String) Display name for the Building Block as shown in meshPanel.
-- `inputs` (Attributes Map) Contains all Building Block inputs. Each input has exactly one value attribute set according to its' type. (see [below for nested schema](#nestedatt--spec--inputs))
+- `inputs` (Attributes Map) Contains all building block inputs. Each input has exactly one value attribute set according to its' type. (see [below for nested schema](#nestedatt--spec--inputs))
 - `parent_building_blocks` (Attributes List) List of parent Building Blocks. (see [below for nested schema](#nestedatt--spec--parent_building_blocks))
 
 <a id="nestedatt--spec--inputs"></a>
 ### Nested Schema for `spec.inputs`
 
+Optional:
+
+- `value_single_select` (String)
+
 Read-Only:
 
 - `value_bool` (Boolean)
 - `value_code` (String) Code value.
 - `value_file` (String)
 - `value_int` (Number)
-- `value_list` (String) JSON encoded list of objects.
-- `value_single_select` (String)
+- `value_list` (String) Deprecated: use `value_code` instead. JSON encoded list of objects.
+- `value_multi_select` (List of String) Multi-select value (list of strings).
 - `value_string` (String)
 
 
@@ -90,7 +94,7 @@ Read-Only:
 
 Read-Only:
 
-- `outputs` (Attributes Map) Building Block outputs. Each output has exactly one value attribute set. (see [below for nested schema](#nestedatt--status--outputs))
+- `outputs` (Attributes Map) Building block outputs. Each output has exactly one value attribute set. (see [below for nested schema](#nestedatt--status--outputs))
 - `status` (String) Execution status. One of `WAITING_FOR_DEPENDENT_INPUT`, `WAITING_FOR_OPERATOR_INPUT`, `PENDING`, `IN_PROGRESS`, `SUCCEEDED`, `FAILED`.
 
 <a id="nestedatt--status--outputs"></a>
@@ -100,8 +104,5 @@ Read-Only:
 
 - `value_bool` (Boolean)
 - `value_code` (String) Code value.
-- `value_file` (String)
 - `value_int` (Number)
-- `value_list` (String) JSON encoded list of objects.
-- `value_single_select` (String)
 - `value_string` (String)

docs/resources/building_block_v2.md

@@ -140,9 +140,8 @@ Optional:
 
 - `value_bool` (Boolean)
 - `value_code` (String) Code value.
-- `value_file` (String)
 - `value_int` (Number)
-- `value_list` (String) JSON encoded list of objects.
+- `value_multi_select` (List of String) Multi-select value (list of strings).
 - `value_single_select` (String)
 - `value_string` (String)
 
@@ -159,14 +158,18 @@ Required:
 <a id="nestedatt--spec--combined_inputs"></a>
 ### Nested Schema for `spec.combined_inputs`
 
+Optional:
+
+- `value_single_select` (String)
+
 Read-Only:
 
 - `value_bool` (Boolean)
 - `value_code` (String) Code value.
 - `value_file` (String)
 - `value_int` (Number)
-- `value_list` (String) JSON encoded list of objects.
-- `value_single_select` (String)
+- `value_list` (String) Deprecated: use `value_code` instead. JSON encoded list of objects.
+- `value_multi_select` (List of String) Multi-select value (list of strings).
 - `value_string` (String)
 
 
@@ -199,8 +202,5 @@ Read-Only:
 
 - `value_bool` (Boolean)
 - `value_code` (String) Code value.
-- `value_file` (String)
 - `value_int` (Number)
-- `value_list` (String) JSON encoded list of objects.
-- `value_single_select` (String)
 - `value_string` (String)

docs/resources/buildingblock.md

@@ -72,12 +72,12 @@ Required:
 
 Optional:
 
-- `inputs` (Attributes Map) Building Block user inputs. Each input has exactly one value. Use the value attribute that corresponds to the desired input type, e.g. `value_int` to set an integer input, and leave the remaining attributes empty. (see [below for nested schema](#nestedatt--spec--inputs))
+- `inputs` (Attributes Map) Building block user inputs. Each input has exactly one value. Use the value attribute that corresponds to the desired input type, e.g. `value_int` to set an integer input, and leave the remaining attributes empty. (see [below for nested schema](#nestedatt--spec--inputs))
 - `parent_building_blocks` (Attributes List) List of parent Building Blocks. (see [below for nested schema](#nestedatt--spec--parent_building_blocks))
 
 Read-Only:
 
-- `combined_inputs` (Attributes Map) Contains all Building Block inputs. Each input has exactly one value attribute set according to its' type. (see [below for nested schema](#nestedatt--spec--combined_inputs))
+- `combined_inputs` (Attributes Map) Contains all building block inputs. Each input has exactly one value attribute set according to its' type. (see [below for nested schema](#nestedatt--spec--combined_inputs))
 
 <a id="nestedatt--spec--inputs"></a>
 ### Nested Schema for `spec.inputs`
@@ -86,9 +86,8 @@ Optional:
 
 - `value_bool` (Boolean)
 - `value_code` (String) Code value.
-- `value_file` (String)
 - `value_int` (Number)
-- `value_list` (String) JSON encoded list of objects.
+- `value_multi_select` (List of String) Multi-select value (list of strings).
 - `value_single_select` (String)
 - `value_string` (String)
 
@@ -105,14 +104,18 @@ Required:
 <a id="nestedatt--spec--combined_inputs"></a>
 ### Nested Schema for `spec.combined_inputs`
 
+Optional:
+
+- `value_single_select` (String)
+
 Read-Only:
 
 - `value_bool` (Boolean)
 - `value_code` (String) Code value.
 - `value_file` (String)
 - `value_int` (Number)
-- `value_list` (String) JSON encoded list of objects.
-- `value_single_select` (String)
+- `value_list` (String) Deprecated: use `value_code` instead. JSON encoded list of objects.
+- `value_multi_select` (List of String) Multi-select value (list of strings).
 - `value_string` (String)
 
 
@@ -122,7 +125,7 @@ Read-Only:
 
 Read-Only:
 
-- `outputs` (Attributes Map) Building Block outputs. Each output has exactly one value attribute set. (see [below for nested schema](#nestedatt--status--outputs))
+- `outputs` (Attributes Map) Building block outputs. Each output has exactly one value attribute set. (see [below for nested schema](#nestedatt--status--outputs))
 - `status` (String) Execution status. One of `WAITING_FOR_DEPENDENT_INPUT`, `WAITING_FOR_OPERATOR_INPUT`, `PENDING`, `IN_PROGRESS`, `SUCCEEDED`, `FAILED`.
 
 <a id="nestedatt--status--outputs"></a>
@@ -132,8 +135,5 @@ Read-Only:
 
 - `value_bool` (Boolean)
 - `value_code` (String) Code value.
-- `value_file` (String)
 - `value_int` (Number)
-- `value_list` (String) JSON encoded list of objects.
-- `value_single_select` (String)
 - `value_string` (String)