init/updateFortiManagerTerraform: 1.12.1

Signed-off-by: FTNT-HQCM <hq-devops-admin@fortinet.com>
fortinetdev · Jul 25, 2024 · e9fb558 · e9fb558
1 parent 2637ae9
commit e9fb558
Show file tree

Hide file tree

Showing 44 changed files with 232 additions and 667 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.13.11
+1.22.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 ## 1.13.0 (Unreleased)
 
+## 1.12.1 (Jul 24, 2024)
+
+IMPROVEMENTS:
+* Fix issue of variable mr could not set to 0 on resoure dvmdb_adom
+* Fix invalid data issue for security console resources; 
+* Fix mkey issue of resource system_ntp_ntpserver; 
+* Fix issue when convert list to string;
+* Fix crash issue if the HTTP response is empty;
+
 ## 1.12.0 (Jun 3, 2024)
 
 IMPROVEMENTS:

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 
 - [Terraform](https://www.terraform.io/downloads.html) 0.12.x +
 - [Go](https://golang.org/doc/install) 1.21.x (to build the provider plugin)
-- The provider can cover FortiManager 6.0, 6.2, 6.4, 7.0 versions.
+- The provider can cover FortiManager 6.4 to 7.4 versions.
 
 ## Building the Provider
 

diff --git a/fmg/config.go b/fmg/config.go
@@ -450,8 +450,8 @@ func convintflist2str(v, tfv interface{}) interface{} {
 					return tfv
 				}
 			}
-			return strings.Join(vsList[:], ", ")
 		}
+		return strings.Join(vsList[:], ", ")
 	}
 	return ""
 }

diff --git a/fmg/provider.go b/fmg/provider.go
@@ -126,7 +126,6 @@ func Provider() *schema.Provider {
 			"fortimanager_dvm_cmd_update_devlist":                                                            resourceDvmCmdUpdateDevList(),
 			"fortimanager_dvm_cmd_update_device":                                                             resourceDvmCmdUpdateDevice(),
 			"fortimanager_dvmdb_adom":                                                                        resourceDvmdbAdom(),
-			"fortimanager_dvmdb_device_vdom":                                                                 resourceDvmdbDeviceVdom(),
 			"fortimanager_dvmdb_group":                                                                       resourceDvmdbGroup(),
 			"fortimanager_dvmdb_revision":                                                                    resourceDvmdbRevision(),
 			"fortimanager_dvmdb_script":                                                                      resourceDvmdbScript(),

diff --git a/fmg/resource_dvmdb_adom.go b/fmg/resource_dvmdb_adom.go
@@ -966,7 +966,7 @@ func getObjectDvmdbAdom(d *schema.ResourceData) (*map[string]interface{}, error)
 		}
 	}
 
-	if v, ok := d.GetOk("mr"); ok || d.HasChange("mr") {
+	if v, ok := d.GetOkExists("mr"); ok {
 		t, err := expandDvmdbAdomMr(d, v, "mr")
 		if err != nil {
 			return &obj, err