Skip to content

feat(workspace_git): enhance item resource by adding new attribute #705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
catalina-gav wants to merge 8 commits into
base: main
Choose a base branch
from
Open

feat(workspace_git): enhance item resource by adding new attribute #705

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8d73e94
add allow override items to resourceWorkspaceGitModel
Oct 29, 2025
0d0753c
update doc
Oct 29, 2025
eaca99a
add changelog
Oct 29, 2025
b55302f
Merge branch 'main' into dev/catalina-gav/enhance-workspace-git-resource
badeamarjieh Nov 17, 2025
c0ea24a
Merge branch 'main' into dev/catalina-gav/enhance-workspace-git-resource
catalina-gav Dec 5, 2025
6876547
align model to api
Dec 11, 2025
80512d6
Merge branch 'main' into dev/catalina-gav/enhance-workspace-git-resource
catalina-gav Dec 18, 2025
b9849ab
update docs
Dec 18, 2025
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
5 changes: 5 additions & 0 deletions .changes/unreleased/changed-20251029-124208.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
kind: changed
body: Enhanced `fabric_workspace_git` resource by adding new allow_override_items attribute
time: 2025-10-29T12:42:08.211811035Z
custom:
Issue: "704"
1 change: 1 addition & 0 deletions docs/resources/workspace_git.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ resource "fabric_workspace_git" "github" {

### Optional

- `allow_override_items` (Boolean) <i style="color:red;font-weight: bold">(ForceNew)</i> User consent to override incoming items during the update from Git process. When incoming items are present and the allow override items is not specified or is provided as false, the update operation will not start. Default value is false.
- `timeouts` (Attributes) (see [below for nested schema](#nestedatt--timeouts))

### Read-Only
Expand Down
7 changes: 5 additions & 2 deletions internal/services/workspacegit/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ type resourceWorkspaceGitModel struct {
baseWorkspaceGitModel

InitializationStrategy types.String `tfsdk:"initialization_strategy"`
AllowOverrideItems types.Bool `tfsdk:"allow_override_items"`
Timeouts timeoutsR.Value `tfsdk:"timeouts"`
}

Expand Down Expand Up @@ -211,14 +212,16 @@ type requestGitUpdateFrom struct {
fabcore.UpdateFromGitRequest
}

func (to *requestGitUpdateFrom) set(remoteCommitHash, conflictResolutionPolicy *string) {
func (to *requestGitUpdateFrom) set(remoteCommitHash, conflictResolutionPolicy *string, allowOverrideItems *bool) {
policy := fabcore.ConflictResolutionPolicyPreferWorkspace
if *conflictResolutionPolicy != "None" {
policy = fabcore.ConflictResolutionPolicy(*conflictResolutionPolicy)
}

to.RemoteCommitHash = remoteCommitHash
to.Options = &fabcore.UpdateOptions{}
to.Options = &fabcore.UpdateOptions{
AllowOverrideItems: allowOverrideItems,
}
to.ConflictResolution = &fabcore.WorkspaceConflictResolution{
ConflictResolutionPolicy: azto.Ptr(policy),
ConflictResolutionType: azto.Ptr(fabcore.ConflictResolutionTypeWorkspace),
Expand Down
2 changes: 1 addition & 1 deletion internal/services/workspacegit/resource_workspace_git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func (r *resourceWorkspaceGit) Create(ctx context.Context, req resource.CreateRe
case fabcore.RequiredActionUpdateFromGit: // Update from Git.
var reqGitUpdateFrom requestGitUpdateFrom

reqGitUpdateFrom.set(gitInitResp.RemoteCommitHash, plan.InitializationStrategy.ValueStringPointer())
reqGitUpdateFrom.set(gitInitResp.RemoteCommitHash, plan.InitializationStrategy.ValueStringPointer(), plan.AllowOverrideItems.ValueBoolPointer())

_, err = r.client.UpdateFromGit(ctx, plan.WorkspaceID.ValueString(), reqGitUpdateFrom.UpdateFromGitRequest, nil)
case fabcore.RequiredActionNone:
Expand Down
10 changes: 10 additions & 0 deletions internal/services/workspacegit/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
schemaD "github.com/hashicorp/terraform-plugin-framework/datasource/schema" //revive:disable-line:import-alias-naming
"github.com/hashicorp/terraform-plugin-framework/path"
schemaR "github.com/hashicorp/terraform-plugin-framework/resource/schema" //revive:disable-line:import-alias-naming
"github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/objectplanmodifier"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
Expand Down Expand Up @@ -98,6 +99,15 @@ func itemSchema() superschema.Schema { //nolint:maintidx
},
},
},
"allow_override_items": superschema.BoolAttribute{
Resource: &schemaR.BoolAttribute{
MarkdownDescription: "User consent to override incoming items during the update from Git process. When incoming items are present and the allow override items is not specified or is provided as false, the update operation will not start. Default value is false.",
Optional: true,
PlanModifiers: []planmodifier.Bool{
boolplanmodifier.RequiresReplace(),
},
},
},
"git_connection_state": superschema.StringAttribute{
Common: &schemaR.StringAttribute{
MarkdownDescription: "The Git connection state",
Expand Down
Loading