Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion blueprints/fabric-rti/terraform/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ terraform {
}
fabric = {
source = "microsoft/fabric"
version = "1.3.0"
version = "1.10.0"
}
}
required_version = ">= 1.12.0, < 2.0"
Expand Down
2 changes: 1 addition & 1 deletion blueprints/fabric/terraform/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
fabric = {
source = "microsoft/fabric"
version = "1.3.0"
version = "1.10.0"
}
msgraph = {
source = "microsoft/msgraph"
Expand Down
2 changes: 1 addition & 1 deletion blueprints/full-multi-node-cluster/terraform/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ terraform {
}
fabric = {
source = "microsoft/fabric"
version = "1.3.0"
version = "1.10.0"
}
}
required_version = ">= 1.12.0, < 2.0"
Expand Down
4 changes: 4 additions & 0 deletions src/000-cloud/031-fabric/ci/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,8 @@ module "ci" {
should_create_fabric_workspace = var.should_create_fabric_workspace
should_create_fabric_lakehouse = var.should_create_fabric_lakehouse
should_create_fabric_eventhouse = var.should_create_fabric_eventhouse

// CI defaults to skipping validation since capacity may be paused
skip_capacity_state_validation = var.skip_capacity_state_validation

}
6 changes: 6 additions & 0 deletions src/000-cloud/031-fabric/ci/terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,9 @@ variable "should_create_fabric_workspace" {
type = bool
default = false
}

variable "skip_capacity_state_validation" {
type = bool
description = "When true, skips validation of Fabric capacity state during workspace provisioning. Useful for non-production environments where capacity may be paused."
default = true
}
2 changes: 1 addition & 1 deletion src/000-cloud/031-fabric/ci/terraform/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ terraform {
}
fabric = {
source = "microsoft/fabric"
version = "1.3.0"
version = "1.10.0"
}
}
required_version = ">= 1.12.0, < 2.0"
Expand Down
7 changes: 4 additions & 3 deletions src/000-cloud/031-fabric/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ module "fabric_workspace" {

source = "./modules/workspace"

workspace_display_name = local.fabric_workspace_name
workspace_description = var.workspace_description
capacity_id = local.capacity_id
workspace_display_name = local.fabric_workspace_name
workspace_description = var.workspace_description
capacity_id = local.capacity_id
skip_capacity_state_validation = var.skip_capacity_state_validation
}

module "fabric_lakehouse" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
fabric = {
source = "microsoft/fabric"
version = "1.3.0"
version = "1.10.0"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
fabric = {
source = "microsoft/fabric"
version = "1.3.0"
version = "1.10.0"
}
}
required_version = ">= 1.12.0, < 2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
# Documentation: https://aka.ms/fabric/terraform

resource "fabric_workspace" "this" {
display_name = var.workspace_display_name
description = var.workspace_description
capacity_id = var.capacity_id
display_name = var.workspace_display_name
description = var.workspace_description
capacity_id = var.capacity_id
skip_capacity_state_validation = var.skip_capacity_state_validation
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,8 @@ variable "capacity_id" {
type = string
description = "The capacity ID for the workspace"
}

variable "skip_capacity_state_validation" {
type = bool
description = "When true, skips validation of Fabric capacity state during workspace provisioning. Useful for non-production environments where capacity may be paused."
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
fabric = {
source = "microsoft/fabric"
version = "1.3.0"
version = "1.10.0"
}
}
required_version = ">= 1.12.0, < 2.0"
Expand Down
5 changes: 5 additions & 0 deletions src/000-cloud/031-fabric/terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,8 @@ variable "workspace_description" {
description = "The description of the Microsoft Fabric workspace"
default = "Microsoft Fabric workspace for the Edge AI Accelerator solution"
}

variable "skip_capacity_state_validation" {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the component root level this variable needs a default. Per the repo guideline, a component's public interface variables are optional with a sensible default, while internal module variables (e.g. modules/workspace/variables.tf) stay required with no default — that part is already correct here.

As written (no default), skip_capacity_state_validation becomes a required argument, which breaks every consumer that doesn't pass it. I validated locally and both fabric and fabric-rti blueprints fail terraform validate with Missing required argument. Your ci/terraform/variables.tf variant already sets default = true, so this looks like an accidental omission.

Suggested

variable "skip_capacity_state_validation" {
  type        = bool
  description = "When true, skips validation of Fabric capacity state during workspace provisioning. Useful for non-production environments where capacity may be paused."
  default     = true
}

type = bool
description = "When true, skips validation of Fabric capacity state during workspace provisioning. Useful for non-production environments where capacity may be paused."
}
2 changes: 1 addition & 1 deletion src/000-cloud/031-fabric/terraform/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
fabric = {
source = "microsoft/fabric"
version = "1.3.0"
version = "1.10.0"
}
}
required_version = ">= 1.12.0, < 2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/000-cloud/032-fabric-rti/ci/terraform/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
fabric = {
source = "microsoft/fabric"
version = "1.3.0"
version = "1.10.0"
}
}
required_version = ">= 1.12.0, < 2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/000-cloud/032-fabric-rti/terraform/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
fabric = {
source = "microsoft/fabric"
version = "1.3.0"
version = "1.10.0"
}
}
required_version = ">= 1.12.0, < 2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
}
fabric = {
source = "microsoft/fabric"
version = ">= 1.3.0"
version = "1.10.0"
}
}
}
Loading