Merge pull request #875 from khaossolutions/fix/project-recompute-path

[gitlab_project] re-compute project attributes if path or namespace changed

Author: timofurrer

internal/provider/resource_gitlab_project.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
@@ -388,6 +389,12 @@ var _ = registerResource("gitlab_project", func() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: resourceGitLabProjectSchema,
+		CustomizeDiff: customdiff.All(
+			customdiff.ComputedIf("path_with_namespace", namespaceOrPathChanged),
+			customdiff.ComputedIf("ssh_url_to_repo", namespaceOrPathChanged),
+			customdiff.ComputedIf("http_url_to_repo", namespaceOrPathChanged),
+			customdiff.ComputedIf("web_url", namespaceOrPathChanged),
+		),
 	}
 })
 
@@ -1137,3 +1144,7 @@ func flattenProjectPushRules(pushRules *gitlab.ProjectPushRules) (values []map[s
 		},
 	}
 }
+
+func namespaceOrPathChanged(ctx context.Context, d *schema.ResourceDiff, meta interface{}) bool {
+	return d.HasChange("namespace_id") || d.HasChange("path")
+}

internal/provider/resource_gitlab_project_test.go

@@ -600,24 +600,29 @@ func TestAccGitlabProject_transfer(t *testing.T) {
 		CIForwardDeploymentEnabled:      true,
 	}
 
+	pathBeforeTransfer := fmt.Sprintf("foogroup-%d/foo-%d", rInt, rInt)
+	pathAfterTransfer := fmt.Sprintf("foo2group-%d/foo-%d", rInt, rInt)
+
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
 		ProviderFactories: providerFactories,
 		CheckDestroy:      testAccCheckGitlabProjectDestroy,
 		Steps: []resource.TestStep{
 			// Create a project in a group
 			{
-				Config: testAccGitlabProjectInGroupConfig(rInt),
+				Config: testAccGitlabProjectTransferBetweenGroupsBefore(rInt),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGitlabProjectExists("gitlab_project.foo", &received),
+					resource.TestCheckResourceAttrPtr("gitlab_project_variable.foo", "value", &pathBeforeTransfer),
 				),
 			},
 			// Create a second group and set the transfer the project to this group
 			{
-				Config: testAccGitlabProjectTransferBetweenGroups(rInt),
+				Config: testAccGitlabProjectTransferBetweenGroupsAfter(rInt),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGitlabProjectExists("gitlab_project.foo", &received),
 					testAccCheckAggregateGitlabProject(&transferred, &received),
+					resource.TestCheckResourceAttrPtr("gitlab_project_variable.foo", "value", &pathAfterTransfer),
 				),
 			},
 		},
@@ -1117,7 +1122,35 @@ resource "gitlab_project" "foo" {
 	`, rInt, rInt, rInt)
 }
 
-func testAccGitlabProjectTransferBetweenGroups(rInt int) string {
+func testAccGitlabProjectTransferBetweenGroupsBefore(rInt int) string {
+	return fmt.Sprintf(`
+resource "gitlab_group" "foo" {
+  name = "foogroup-%d"
+  path = "foogroup-%d"
+  visibility_level = "public"
+}
+
+resource "gitlab_project" "foo" {
+  name = "foo-%d"
+  description = "Terraform acceptance tests"
+  namespace_id = "${gitlab_group.foo.id}"
+
+  # So that acceptance tests can be run in a gitlab organization
+  # with no billing
+  visibility_level = "public"
+  build_coverage_regex = "foo"
+}
+
+resource "gitlab_project_variable" "foo" {
+  project = "${gitlab_project.foo.id}"
+
+  key = "FOO"
+  value = "${gitlab_project.foo.path_with_namespace}"
+}
+	`, rInt, rInt, rInt)
+}
+
+func testAccGitlabProjectTransferBetweenGroupsAfter(rInt int) string {
 	return fmt.Sprintf(`
 resource "gitlab_group" "foo" {
   name = "foogroup-%d"
@@ -1141,6 +1174,13 @@ resource "gitlab_project" "foo" {
   visibility_level = "public"
   build_coverage_regex = "foo"
 }
+
+resource "gitlab_project_variable" "foo" {
+  project = "${gitlab_project.foo.id}"
+
+  key = "FOO"
+  value = "${gitlab_project.foo.path_with_namespace}"
+}
 	`, rInt, rInt, rInt, rInt, rInt)
 }