Merge pull request #213 from controlplane-com/majid/workload-updates-20251208

Draft: Add Allow as an option to workload job concurrency policy

Author: enk21

.vscode/launch.json

@@ -20,7 +20,7 @@
       "args": [
         //
         "-test.run",
-        "TestAccControlPlaneMk8s_basic",
+        "TestAccControlPlaneWorkload_basic",
         "-test.v"
       ]
     }

docs/data-sources/workload.md

@@ -333,11 +333,12 @@ KEDA (Kubernetes-based Event Driven Autoscaling) configuration.
 
 Read-Only:
 
+- **trigger** (Block List) ([see below](#nestedblock--options--autoscaling--keda--trigger)).
+- **advanced** (Block List) ([see below](#nestedblock--options--autoscaling--keda--advanced)).
+- **fallback** (Block List, Max: 1) ([see below](#nestedblock--options--autoscaling--keda--fallback)).
 - **polling_interval** (Number) Seconds between KEDA polling cycles.
 - **cooldown_period** (Number) Cooldown seconds after scaling to zero before scaling up again.
 - **initial_cooldown_period** (Number) Initial cooldown after scaling to zero.
-- **trigger** (Block List) ([see below](#nestedblock--options--autoscaling--keda--trigger)).
-- **advanced** (Block List) ([see below](#nestedblock--options--autoscaling--keda--advanced)).
 
 <a id="nestedblock--options--autoscaling--keda--trigger"></a>
 
@@ -383,6 +384,19 @@ Read-Only:
 - **metric_type** (String) Metric type used for the composed metric.
 - **formula** (String) Expression that combines or transforms metrics.
 
+<a id="nestedblock--options--autoscaling--keda--fallback"></a>
+
+### `options.autoscaling.keda.fallback`
+
+Required:
+
+- **failure_threshold** (Number) Number of consecutive failures required to trigger fallback behavior.
+- **replicas** (Number) Number of replicas to scale to when fallback is triggered.
+
+Optional:
+
+- **behavior** (String) Behavior to apply when fallback is triggered. Valid values: `static`, `currentReplicas`, `currentReplicasIfHigher`, `currentReplicasIfLower`.
+
 <a id="nestedblock--options--multi_zone"></a>
 
 ### `options.multi_zone`
@@ -411,7 +425,7 @@ Exports cron workload settings.
 Read-Only:
 
 - **schedule** (String) Cron schedule expression determining job execution times.
-- **concurrency_policy** (String) Either `Forbid` or `Replace`. Determines how overlapping jobs are handled.
+- **concurrency_policy** (String) Either `Forbid`, `Replace` or `Allow`. Determines how overlapping jobs are handled.
 - **history_limit** (Number) Maximum completed job instances retained. Integer between `1` and `10`. Default: `5`.
 - **restart_policy** (String) Either `OnFailure` or `Never`. Default: `Never`.
 - **active_deadline_seconds** (Number) Maximum seconds a job can run before it is forcibly stopped.

docs/resources/workload.md

@@ -388,11 +388,12 @@ KEDA (Kubernetes-based Event Driven Autoscaling) allows for advanced autoscaling
 
 Optional:
 
+- **trigger** (Block List) ([see below](#nestedblock--options--autoscaling--keda--trigger))
+- **advanced** (Block List) ([see below](#nestedblock--options--autoscaling--keda--advanced))
+- **fallback** (Block List, Max: 1) ([see below](#nestedblock--options--autoscaling--keda--fallback))
 - **polling_interval** (Number) The interval in seconds at which KEDA will poll the external metrics to determine if scaling is required.
 - **cooldown_period** (Number) The cooldown period in seconds after scaling down to 0 replicas before KEDA will allow scaling up again.
 - **initial_cooldown_period** (Number) The initial cooldown period in seconds after scaling down to 0 replicas before KEDA will allow scaling up again.
-- **trigger** (Block List) ([see below](#nestedblock--options--autoscaling--keda--trigger))
-- **advanced** (Block List) ([see below](#nestedblock--options--autoscaling--keda--advanced))
 
 <a id="nestedblock--options--autoscaling--keda--trigger"></a>
 
@@ -443,6 +444,19 @@ Optional:
 - **metric_type** (String) Defines metric type used for this new composite-metric.
 - **formula** (String) Composes metrics together and allows them to be modified/manipulated. It accepts mathematical/conditional statements.
 
+<a id="nestedblock--options--autoscaling--keda--fallback"></a>
+
+### `options.autoscaling.keda.fallback`
+
+Required:
+
+- **failure_threshold** (Number) Number of consecutive failures required to trigger fallback behavior.
+- **replicas** (Number) Number of replicas to scale to when fallback is triggered.
+
+Optional:
+
+- **behavior** (String) Behavior to apply when fallback is triggered. Valid values: `static`, `currentReplicas`, `currentReplicasIfHigher`, `currentReplicasIfLower`.
+
 <a id="nestedblock--options--multi_zone"></a>
 
 ### `options.multi_zone`
@@ -461,7 +475,7 @@ Required:
 
 Optional:
 
-- **concurrency_policy** (String) Either 'Forbid' or 'Replace'. This determines what Control Plane will do when the schedule requires a job to start, while a prior instance of the job is still running. Enum: [ Forbid, Replace ] Default: `Forbid`
+- **concurrency_policy** (String) Either `Forbid`, `Replace`, or `Allow`. This determines what Control Plane will do when the schedule requires a job to start, while a prior instance of the job is still running.
 - **history_limit** (Number) The maximum number of completed job instances to display. This should be an integer between 1 and 10. Default: `5`
 - **restart_policy** (String) Either 'OnFailure' or 'Never'. This determines what Control Plane will do when a job instance fails. Enum: [ OnFailure, Never ] Default: `Never`
 - **active_deadline_seconds** (Number) The maximum number of seconds Control Plane will wait for the job to complete. If a job does not succeed or fail in the allotted time, Control Plane will stop the job, moving it into the Removed status.
@@ -1011,6 +1025,12 @@ resource "cpln_workload" "new" {
             formula           = "m * 2"
           }
         }
+
+        fallback {
+          failure_threshold = 3
+          replicas          = 1
+          behavior          = "static"
+        }
       }
     }
   }
@@ -1964,6 +1984,12 @@ resource "cpln_workload" "new" {
             formula           = "m * 2"
           }
         }
+
+        fallback {
+          failure_threshold = 3
+          replicas          = 1
+          behavior          = "static"
+        }
       }
     }
   }

internal/provider/client/workload.go

@@ -219,11 +219,12 @@ type WorkloadOptionsAutoscalingMulti struct {
 }
 
 type WorkloadOptionsAutoscalingKeda struct {
+	Triggers              *[]WorkloadOptionsAutoscalingKedaTrigger `json:"triggers,omitempty"`
+	Advanced              *WorkloadOptionsAutoscalingKedaAdvanced  `json:"advanced,omitempty"`
+	Fallback              *WorkloadOptionsAutoscalingKedaFallback  `json:"fallback,omitempty"`
 	PollingInterval       *int                                     `json:"pollingInterval,omitempty"`
 	CooldownPeriod        *int                                     `json:"cooldownPeriod,omitempty"`
 	InitialCooldownPeriod *int                                     `json:"initialCooldownPeriod,omitempty"`
-	Triggers              *[]WorkloadOptionsAutoscalingKedaTrigger `json:"triggers,omitempty"`
-	Advanced              *WorkloadOptionsAutoscalingKedaAdvanced  `json:"advanced,omitempty"`
 }
 
 type WorkloadOptionsAutoscalingKedaTrigger struct {
@@ -250,6 +251,12 @@ type WorkloadOptionsAutoscalingKedaAdvancedScalingModifiers struct {
 	Formula          *string `json:"formula,omitempty"`
 }
 
+type WorkloadOptionsAutoscalingKedaFallback struct {
+	FailureThreshold *int    `json:"failureThreshold,omitempty"`
+	Replicas         *int    `json:"replicas,omitempty"`
+	Behavior         *string `json:"behavior,omitempty"`
+}
+
 type WorkloadOptionsMultiZone struct {
 	Enabled *bool `json:"enabled,omitempty"`
 }

internal/provider/data_source_workload.go

@@ -511,7 +511,7 @@ func (d *WorkloadDataSource) Schema(ctx context.Context, req datasource.SchemaRe
 							Computed:    true,
 						},
 						"concurrency_policy": schema.StringAttribute{
-							Description: "Either 'Forbid' or 'Replace'. This determines what Control Plane will do when the schedule requires a job to start, while a prior instance of the job is still running. Enum: [ Forbid, Replace ] Default: `Forbid`.",
+							Description: "Either 'Forbid', 'Replace', or 'Allow'. This determines what Control Plane will do when the schedule requires a job to start, while a prior instance of the job is still running.",
 							Computed:    true,
 						},
 						"history_limit": schema.Int32Attribute{
@@ -1011,6 +1011,25 @@ func (d *WorkloadDataSource) OptionsSchema(description string) schema.ListNested
 												},
 											},
 										},
+										"fallback": schema.ListNestedBlock{
+											Description: "Fallback configuration for KEDA.",
+											NestedObject: schema.NestedBlockObject{
+												Attributes: map[string]schema.Attribute{
+													"failure_threshold": schema.Int32Attribute{
+														Description: "Number of consecutive failures required to trigger fallback behavior.",
+														Computed:    true,
+													},
+													"replicas": schema.Int32Attribute{
+														Description: "Number of replicas to scale to when fallback is triggered.",
+														Computed:    true,
+													},
+													"behavior": schema.StringAttribute{
+														Description: "Behavior to apply when fallback is triggered.",
+														Computed:    true,
+													},
+												},
+											},
+										},
 									},
 								},
 							},

internal/provider/models/workload/workload.go

@@ -448,21 +448,23 @@ func (o OptionsAutoscalingMultiModel) AttributeTypes() attr.Type {
 // Options -> Autoscaling -> Keda //
 
 type OptionsAutoscalingKedaModel struct {
+	Triggers              types.List  `tfsdk:"trigger"`
+	Advanced              types.List  `tfsdk:"advanced"`
+	Fallback              types.List  `tfsdk:"fallback"`
 	PollingInterval       types.Int32 `tfsdk:"polling_interval"`
 	CooldownPeriod        types.Int32 `tfsdk:"cooldown_period"`
 	InitialCooldownPeriod types.Int32 `tfsdk:"initial_cooldown_period"`
-	Triggers              types.List  `tfsdk:"trigger"`
-	Advanced              types.List  `tfsdk:"advanced"`
 }
 
 func (o OptionsAutoscalingKedaModel) AttributeTypes() attr.Type {
 	return types.ObjectType{
 		AttrTypes: map[string]attr.Type{
+			"trigger":                 types.ListType{ElemType: OptionsAutoscalingKedaTriggerModel{}.AttributeTypes()},
+			"advanced":                types.ListType{ElemType: OptionsAutoscalingKedaAdvancedModel{}.AttributeTypes()},
+			"fallback":                types.ListType{ElemType: OptionsAutoscalingKedaFallbackModel{}.AttributeTypes()},
 			"polling_interval":        types.Int32Type,
 			"cooldown_period":         types.Int32Type,
 			"initial_cooldown_period": types.Int32Type,
-			"trigger":                 types.ListType{ElemType: OptionsAutoscalingKedaTriggerModel{}.AttributeTypes()},
-			"advanced":                types.ListType{ElemType: OptionsAutoscalingKedaAdvancedModel{}.AttributeTypes()},
 		},
 	}
 }
@@ -539,6 +541,24 @@ func (o OptionsAutoscalingKedaAdvancedScalingModifiersModel) AttributeTypes() at
 	}
 }
 
+// Options -> Autoscaling -> Keda -> Fallback //
+
+type OptionsAutoscalingKedaFallbackModel struct {
+	FailureThreshold types.Int32  `tfsdk:"failure_threshold"`
+	Replicas         types.Int32  `tfsdk:"replicas"`
+	Behavior         types.String `tfsdk:"behavior"`
+}
+
+func (o OptionsAutoscalingKedaFallbackModel) AttributeTypes() attr.Type {
+	return types.ObjectType{
+		AttrTypes: map[string]attr.Type{
+			"failure_threshold": types.Int32Type,
+			"replicas":          types.Int32Type,
+			"behavior":          types.StringType,
+		},
+	}
+}
+
 // Options -> Muli Zone //
 
 type OptionsMultiZoneModel struct {

internal/provider/resource_workload.go

@@ -760,12 +760,12 @@ func (wr *WorkloadResource) Schema(ctx context.Context, req resource.SchemaReque
 							Required:    true,
 						},
 						"concurrency_policy": schema.StringAttribute{
-							Description: "Either 'Forbid' or 'Replace'. This determines what Control Plane will do when the schedule requires a job to start, while a prior instance of the job is still running. Enum: [ Forbid, Replace ] Default: `Forbid`.",
+							Description: "Either 'Forbid', 'Replace', or 'Allow'. This determines what Control Plane will do when the schedule requires a job to start, while a prior instance of the job is still running.",
 							Optional:    true,
 							Computed:    true,
 							Default:     stringdefault.StaticString("Forbid"),
 							Validators: []validator.String{
-								stringvalidator.OneOf("Forbid", "Replace"),
+								stringvalidator.OneOf("Forbid", "Replace", "Allow"),
 							},
 						},
 						"history_limit": schema.Int32Attribute{
@@ -1593,6 +1593,31 @@ func (wr *WorkloadResource) OptionsSchema(description string) schema.ListNestedB
 												listvalidator.SizeAtMost(1),
 											},
 										},
+										"fallback": schema.ListNestedBlock{
+											Description: "Fallback configuration for KEDA.",
+											NestedObject: schema.NestedBlockObject{
+												Attributes: map[string]schema.Attribute{
+													"failure_threshold": schema.Int32Attribute{
+														Description: "Number of consecutive failures required to trigger fallback behavior.",
+														Required:    true,
+													},
+													"replicas": schema.Int32Attribute{
+														Description: "Number of replicas to scale to when fallback is triggered.",
+														Required:    true,
+													},
+													"behavior": schema.StringAttribute{
+														Description: "Behavior to apply when fallback is triggered.",
+														Optional:    true,
+														Validators: []validator.String{
+															stringvalidator.OneOf("static", "currentReplicas", "currentReplicasIfHigher", "currentReplicasIfLower"),
+														},
+													},
+												},
+											},
+											Validators: []validator.List{
+												listvalidator.SizeAtMost(1),
+											},
+										},
 									},
 								},
 								Validators: []validator.List{
@@ -2783,11 +2808,12 @@ func (wro *WorkloadResourceOperator) buildOptionsAutoscalingKeda(state types.Lis
 
 	// Construct and return the output
 	return &client.WorkloadOptionsAutoscalingKeda{
+		Triggers:              wro.buildOptionsAutoscalingKedaTrigger(block.Triggers),
+		Advanced:              wro.buildOptionsAutoscalingKedaAdvanced(block.Advanced),
+		Fallback:              wro.buildOptionsAutoscalingKedaFallback(block.Fallback),
 		PollingInterval:       BuildInt(block.PollingInterval),
 		CooldownPeriod:        BuildInt(block.CooldownPeriod),
 		InitialCooldownPeriod: BuildInt(block.InitialCooldownPeriod),
-		Triggers:              wro.buildOptionsAutoscalingKedaTrigger(block.Triggers),
-		Advanced:              wro.buildOptionsAutoscalingKedaAdvanced(block.Advanced),
 	}
 }
 
@@ -2884,6 +2910,27 @@ func (wro *WorkloadResourceOperator) buildOptionsAutoscalingKedaAdvancedScalingM
 	}
 }
 
+// buildOptionsAutoscalingKedaFallback constructs a WorkloadOptionsAutoscalingKedaFallback from the given Terraform state.
+func (wro *WorkloadResourceOperator) buildOptionsAutoscalingKedaFallback(state types.List) *client.WorkloadOptionsAutoscalingKedaFallback {
+	// Convert Terraform list into model blocks using generic helper
+	blocks, ok := BuildList[models.OptionsAutoscalingKedaFallbackModel](wro.Ctx, wro.Diags, state)
+
+	// Return nil if conversion failed or list was empty
+	if !ok {
+		return nil
+	}
+
+	// Take the first (and only) block
+	block := blocks[0]
+
+	// Construct and return the output
+	return &client.WorkloadOptionsAutoscalingKedaFallback{
+		FailureThreshold: BuildInt(block.FailureThreshold),
+		Replicas:         BuildInt(block.Replicas),
+		Behavior:         BuildString(block.Behavior),
+	}
+}
+
 // buildOptionsMultiZone constructs a WorkloadOptionsMultiZone from the given Terraform state.
 func (wro *WorkloadResourceOperator) buildOptionsMultiZone(state types.List) *client.WorkloadOptionsMultiZone {
 	// Convert Terraform list into model blocks using generic helper
@@ -3907,11 +3954,12 @@ func (wro *WorkloadResourceOperator) flattenOptionsAutoscalingKeda(input *client
 
 	// Build a single block
 	block := models.OptionsAutoscalingKedaModel{
+		Triggers:              wro.flattenOptionsAutoscalingKedaTrigger(input.Triggers),
+		Advanced:              wro.flattenOptionsAutoscalingKedaAdvanced(input.Advanced),
+		Fallback:              wro.flattenOptionsAutoscalingKedaFallback(input.Fallback),
 		PollingInterval:       FlattenInt(input.PollingInterval),
 		CooldownPeriod:        FlattenInt(input.CooldownPeriod),
 		InitialCooldownPeriod: FlattenInt(input.InitialCooldownPeriod),
-		Triggers:              wro.flattenOptionsAutoscalingKedaTrigger(input.Triggers),
-		Advanced:              wro.flattenOptionsAutoscalingKedaAdvanced(input.Advanced),
 	}
 
 	// Return the successfully created types.List
@@ -4015,6 +4063,28 @@ func (wro *WorkloadResourceOperator) flattenOptionsAutoscalingKedaAdvancedScalin
 	return FlattenList(wro.Ctx, wro.Diags, []models.OptionsAutoscalingKedaAdvancedScalingModifiersModel{block})
 }
 
+// flattenOptionsAutoscalingKedaFallback transforms *client.WorkloadOptionsAutoscalingKedaFallback into a types.List.
+func (wro *WorkloadResourceOperator) flattenOptionsAutoscalingKedaFallback(input *client.WorkloadOptionsAutoscalingKedaFallback) types.List {
+	// Get attribute types
+	elementType := models.OptionsAutoscalingKedaFallbackModel{}.AttributeTypes()
+
+	// Check if the input is nil
+	if input == nil {
+		// Return a null list
+		return types.ListNull(elementType)
+	}
+
+	// Build a single block
+	block := models.OptionsAutoscalingKedaFallbackModel{
+		FailureThreshold: FlattenInt(input.FailureThreshold),
+		Replicas:         FlattenInt(input.Replicas),
+		Behavior:         types.StringPointerValue(input.Behavior),
+	}
+
+	// Return the successfully created types.List
+	return FlattenList(wro.Ctx, wro.Diags, []models.OptionsAutoscalingKedaFallbackModel{block})
+}
+
 // flattenOptionsMultiZone transforms *client.WorkloadOptionsMultiZone into a types.List.
 func (wro *WorkloadResourceOperator) flattenOptionsMultiZone(input *client.WorkloadOptionsMultiZone) types.List {
 	// Get attribute types

internal/provider/resource_workload_test.go

@@ -1657,6 +1657,13 @@ func (wrt *WorkloadResourceTest) BuildStandardUpdate1TestStep(initialCase Provid
 											},
 										},
 									},
+									"fallback": []map[string]interface{}{
+										{
+											"failure_threshold": "3",
+											"replicas":          "1",
+											"behavior":          "static",
+										},
+									},
 								},
 							},
 						},
@@ -3972,6 +3979,12 @@ resource "cpln_workload" "%s" {
             formula           = "m * 2"
           }
         }
+
+        fallback {
+          failure_threshold = 3
+          replicas          = 1
+          behavior          = "static"
+        }
       }
     }
   }