Skip to content

Commit 941e9ee

Browse files
authored
Merge pull request #1218 from amine7536/fix-ci_forward_deployment_enabled
resource/gitlab_project: Fix passing `ci_forward_deployment_enabled=false` at project creation
2 parents 0db2a70 + 4675abd commit 941e9ee

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

internal/provider/resource_gitlab_project.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,6 @@ func resourceGitlabProjectCreate(ctx context.Context, d *schema.ResourceData, me
810810
Mirror: gitlab.Bool(d.Get("mirror").(bool)),
811811
MirrorTriggerBuilds: gitlab.Bool(d.Get("mirror_trigger_builds").(bool)),
812812
CIConfigPath: gitlab.String(d.Get("ci_config_path").(string)),
813-
CIForwardDeploymentEnabled: gitlab.Bool(d.Get("ci_forward_deployment_enabled").(bool)),
814813
}
815814

816815
if v, ok := d.GetOk("build_coverage_regex"); ok {
@@ -1204,6 +1203,12 @@ func resourceGitlabProjectCreate(ctx context.Context, d *schema.ResourceData, me
12041203
editProjectOptions.CIDefaultGitDepth = gitlab.Int(v.(int))
12051204
}
12061205

1206+
// nolint:staticcheck // SA1019 ignore deprecated GetOkExists
1207+
// lintignore: XR001 // TODO: replace with alternative for GetOkExists
1208+
if v, ok := d.GetOkExists("ci_forward_deployment_enabled"); ok {
1209+
editProjectOptions.CIForwardDeploymentEnabled = gitlab.Bool(v.(bool))
1210+
}
1211+
12071212
if (editProjectOptions != gitlab.EditProjectOptions{}) {
12081213
if _, _, err := client.Projects.EditProject(d.Id(), &editProjectOptions, gitlab.WithContext(ctx)); err != nil {
12091214
return diag.Errorf("Could not update project %q: %s", d.Id(), err)

internal/provider/resource_gitlab_project_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,6 +1377,7 @@ func TestAccGitlabProject_SetDefaultFalseBooleansOnCreate(t *testing.T) {
13771377
public_builds = false
13781378
merge_pipelines_enabled = false
13791379
merge_trains_enabled = false
1380+
ci_forward_deployment_enabled = false
13801381
}`, rInt),
13811382
},
13821383
{

0 commit comments

Comments
 (0)