Add timeout to run script and some general fixes (#233)

Author: chkp-royl

checkpoint/resource_checkpoint_management_access_rule.go

@@ -897,7 +897,7 @@ func updateManagementAccessRule(d *schema.ResourceData, m interface{}) error {
 	}
 
 	if d.HasChange("content") {
-		if v, ok := d.GetOkExists("content"); ok {
+		if v, ok := d.GetOk("content"); ok {
 			accessRule["content"] = v.(*schema.Set).List()
 		}
 		//else {
@@ -965,7 +965,7 @@ func updateManagementAccessRule(d *schema.ResourceData, m interface{}) error {
 	}
 
 	if d.HasChange("install_on") {
-		if v, ok := d.GetOkExists("install_on"); ok {
+		if v, ok := d.GetOk("install_on"); ok {
 			accessRule["install-on"] = v.(*schema.Set).List()
 		}
 		//else {
@@ -975,7 +975,7 @@ func updateManagementAccessRule(d *schema.ResourceData, m interface{}) error {
 	}
 
 	if d.HasChange("service") {
-		if v, ok := d.GetOkExists("service"); ok {
+		if v, ok := d.GetOk("service"); ok {
 			accessRule["service"] = v.(*schema.Set).List()
 		}
 		//else {
@@ -991,7 +991,7 @@ func updateManagementAccessRule(d *schema.ResourceData, m interface{}) error {
 	}
 
 	if d.HasChange("source") {
-		if v, ok := d.GetOkExists("source"); ok {
+		if v, ok := d.GetOk("source"); ok {
 			accessRule["source"] = v.(*schema.Set).List()
 		}
 		//else {
@@ -1007,7 +1007,7 @@ func updateManagementAccessRule(d *schema.ResourceData, m interface{}) error {
 	}
 
 	if d.HasChange("time") {
-		if v, ok := d.GetOkExists("time"); ok {
+		if v, ok := d.GetOk("time"); ok {
 			accessRule["time"] = v.(*schema.Set).List()
 		}
 		//else {
@@ -1080,7 +1080,7 @@ func updateManagementAccessRule(d *schema.ResourceData, m interface{}) error {
 	}
 
 	if d.HasChange("vpn_communities") {
-		if v, ok := d.GetOkExists("vpn_communities"); ok {
+		if v, ok := d.GetOk("vpn_communities"); ok {
 			accessRule["vpn"] = v.(*schema.Set).List()
 		}
 	}

checkpoint/resource_checkpoint_management_command_run_script.go

@@ -47,6 +47,12 @@ func resourceManagementRunScript() *schema.Resource {
 				ForceNew:    true,
 				Description: "Comments string.",
 			},
+			"timeout": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "Script timeout in seconds.",
+			},
 			"tasks": {
 				Type:        schema.TypeSet,
 				Computed:    true,
@@ -88,6 +94,10 @@ func createManagementRunScript(d *schema.ResourceData, m interface{}) error {
 		payload["comments"] = v.(string)
 	}
 
+	if v, ok := d.GetOk("timeout"); ok {
+		payload["timeout"] = v
+	}
+
 	runScriptRes, err := client.ApiCall("run-script", payload, client.GetSessionID(), true, client.IsProxyUsed())
 	if err != nil {
 		return fmt.Errorf(err.Error())

website/docs/index.html.markdown

@@ -396,7 +396,7 @@ The table below shows the compatibility between the Terraform Release version an
 | v2.7.0                    | v1.1            | 255 and higher |
 
 <br>
--> **Note:** When you install or upgrade the Terraform Release version, make sure to also upgrade CME to the corresponding CME Take to properly configure CME resources.
+**Note:** When you install or upgrade the Terraform Release version, make sure to also upgrade CME to the corresponding CME Take to properly configure CME resources.
 
 For details about upgrading CME, please refer to the documentation [here](https://sc1.checkpoint.com/documents/IaaS/WebAdminGuides/EN/CP_CME/Content/Topics-CME/Installing_and_Updating_CME.htm?tocpath=_____4).
 
@@ -444,6 +444,7 @@ This section describes best practices for working with the Check Point provider.
 
 #### Trigger field
 From version 1.2 the provider was enhanced where a `triggers` field for resource `install-policy`, `publish` and `logout` was added for re-execution if there are any changes in the configuration files.
+
 ```hcl
 # Put the Check Point configuration in a sub folder and refer to is as a module
 module "chkp_policy" {
@@ -461,6 +462,7 @@ resource "checkpoint_management_publish" "publish" {
   triggers = local.publish_triggers
 }
 ```
+<br>
 
 #### Avoid large bulk publishes
 From version 2.5.0 the provider was enhanced with support to auto publish mode using `auto_publish_batch_size` or via the `CHECKPOINT_AUTO_PUBLISH_BATCH_SIZE` environment variable to configure the number of batch size to automatically run publish.
@@ -474,6 +476,7 @@ provider "checkpoint" {
   auto_publish_batch_size = "100"
 }
 ```
+<br>
 
 #### Control publish post destroy
 From version 2.6.0 the provider was enhanced where a new flag was added `run_publish_on_destroy` to `checkpoint_management_publish` which indicates whether to run publish on destroy.

website/docs/r/checkpoint_management_run_script.html.markdown

@@ -29,7 +29,8 @@ The following arguments are supported:
 * `script` - (Required) Script body. 
 * `targets` - (Required) On what targets to execute this command. Targets may be identified by their name, or object unique identifier.targets blocks are documented below.
 * `args` - (Optional) Script arguments. 
-* `comments` - (Optional) Comments string. 
+* `comments` - (Optional) Comments string.
+* `timeout` - (Optional) Script timeout in seconds.
 * `tasks` - (Computed) Collection of asynchronous task unique identifiers.
 * `response` - Response message in JSON format.