Merge branch 'main' of https://github.com/adambarreiro/terraform-prov…

…ider-vcd into content-library-item

.changes/v4.0.0/1345-features.md

@@ -1,2 +1,2 @@
-* **New Resource:** `vcd_tm_org` to manage TM Organizations [GH-1345]
+* **New Resource:** `vcd_tm_org` to manage TM Organizations [GH-1345, GH-1351]
 * **New Data Source:** `vcd_tm_org` to read TM Organizations [GH-1345]

.gitignore

@@ -25,6 +25,9 @@ website/node_modules
 *.test
 *.iml
 
+# Ignore test coverage files
+*.cover
+
 vcd/vcd_test_config*.json
 vcd/go-vcloud-director.log
 vcd/test-artifacts

GNUmakefile

@@ -139,6 +139,10 @@ testextnetwork: fmtcheck
 # Runs the acceptance test for tm
 testtm: fmtcheck
 	@sh -c "'$(CURDIR)/scripts/runtest.sh' tm"
+# Runs the acceptance test for tm with coverage
+testtm-coverage: fmtcheck
+	@sh -c "'$(CURDIR)/scripts/runtest.sh' tm-coverage"
+
 
 testtm-binary-prepare: install
 	cd vcd && go test -tags tm -vcd-add-provider -vcd-short -v .

scripts/runtest.sh

@@ -406,6 +406,9 @@ case $wanted in
     tm)
         acceptance_test tm
         ;;
+    tm-coverage)
+        acceptance_test tm "-coverprofile=tm.cover"
+        ;;
     network)
         acceptance_test network
         ;;

vcd/resource_vcd_tm_org.go

@@ -184,7 +184,7 @@ func validateRenameOrgDisabled(d *schema.ResourceData, oldCfg *govcd.TmOrg, newC
 	if d.HasChange("name") &&
 		// this condition is a negative xor - it will be matched if Org is not transitioning from or to disabled state
 		((!newCfg.IsEnabled && !oldCfg.TmOrg.IsEnabled) || newCfg.IsEnabled && oldCfg.TmOrg.IsEnabled) {
-		return fmt.Errorf("%s must be disabled (is_enabled=false) to change name", labelTmOrg)
+		return fmt.Errorf("%s must be disabled (is_enabled=false) to change name because it changes tenant login URL", labelTmOrg)
 	}
 
 	return nil

website/docs/r/tm_org.html.markdown

@@ -38,7 +38,8 @@ resource "vcd_tm_org" "test" {
 The following arguments are supported:
 
 * `name` - (Required) A name for Organization with which users log in to it as it will be used in
-  the URL
+  the URL. The Org must be disabled to or transition from previous disabled state
+  (`is_enabled=false`) to change a name because it changes tenant login URL
 * `display_name` - (Required) A human readable name for Organization
 * `description` - (Optional) An optional description for Organization
 * `is_enabled` - (Optional) Defines if Organization is enabled. Default `true`. **Note:**