Merge pull request #110 from chkp-alonshev/master

V1.8.0

Author: chkp-alonshev

CHANGELOG.md

@@ -1,3 +1,30 @@
+## 1.8.0 (May 22, 2022)
+
+FEATURES
+
+* **New Resource:** `resource_checkpoint_management_threat_ioc_feed`
+* **New Resource:** `resource_checkpoint_management_domain`
+* **New Resource:** `resource_checkpoint_management_add_repository_package`
+* **New Resource:** `resource_checkpoint_management_delete_repository_package`
+* **New Resource:** `resource_checkpoint_management_time`
+* **New Resource:** `resource_checkpoint_management_trusted_client`
+* **New Data Source:** `data_source_checkpoint_management_threat_ioc_feed`
+* **New Data Source:** `data_source_checkpoint_management_domain`
+* **New Data Source:** `data_source_checkpoint_management_repository_package`
+* **New Data Source:** `data_source_checkpoint_management_time`
+* **New Data Source:** `data_source_checkpoint_management_trusted_client`
+
+ENHANCEMENTS
+
+* `data_source_checkpoint_management_simple_gateway` - Add support to `application_control_and_url_filtering_settings` field.
+* `resource_checkpoint_management_simple_gateway` - Add support to `application_control_and_url_filtering_settings` field.
+
+BUG FIXES
+
+* `resource_checkpoint_management_checkpoint_host` - Fix bug that the `logs_settings` field forced user to put default values as input. Made name field optional and not required.
+* `data_source_checkpoint_management_checkpoint_host` - Fix bug that the `logs_settings` field forced user to put default values as input. Made name field optional and not required.
+* `resource_checkpoint_management_aws_data_center_server` - Fix bug that the `enable_sts_assume_role` field treated as string instead of bool.
+
 ## 1.7.0 (February 24, 2022)
 
 ENHANCEMENTS

checkpoint/data_source_checkpoint_management_checkpoint_host.go

@@ -479,6 +479,7 @@ func dataSourceManagementCheckpointHostRead(d *schema.ResourceData, m interface{
 					}
 					interfacesListToReturn = append(interfacesListToReturn, interfacesMapToAdd)
 				}
+				_ = d.Set("interfaces", interfacesListToReturn)
 			}
 		}
 	}

checkpoint/data_source_checkpoint_management_domain.go

@@ -0,0 +1,176 @@
+package checkpoint
+
+import (
+	"fmt"
+	checkpoint "github.com/CheckPointSW/cp-mgmt-api-go-sdk/APIFiles"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"log"
+	"strconv"
+)
+
+func dataSourceManagementDomain() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceManagementDomainRead,
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Object name.",
+			},
+			"uid": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Object unique identifier.",
+			},
+			"servers": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "Domain servers.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"name": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Object name. Must be unique in the domain.",
+						},
+						"ipv4_address": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "IPv4 address.",
+						},
+						"ipv6_address": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "IPv6 address.",
+						},
+						"multi_domain_server": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "Multi Domain server name or UID.",
+						},
+						"active": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Description: "Activate domain server. Only one domain server is allowed to be active.",
+						},
+						"skip_start_domain_server": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Description: "Set this value to be true to prevent starting the new created domain.",
+						},
+						"type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Domain server type.",
+						},
+					},
+				},
+			},
+			"color": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Color of the object. Should be one of existing colors.",
+			},
+			"comments": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Comments string.",
+			},
+		},
+	}
+}
+
+func dataSourceManagementDomainRead(d *schema.ResourceData, m interface{}) error {
+	client := m.(*checkpoint.ApiClient)
+
+	name := d.Get("name").(string)
+	uid := d.Get("uid").(string)
+
+	payload := make(map[string]interface{})
+
+	if name != "" {
+		payload["name"] = name
+	} else if uid != "" {
+		payload["uid"] = uid
+	}
+
+	showDomainRes, err := client.ApiCall("show-domain", payload, client.GetSessionID(), true, client.IsProxyUsed())
+	if err != nil {
+		return fmt.Errorf(err.Error())
+	}
+	if !showDomainRes.Success {
+		return fmt.Errorf(showDomainRes.ErrorMsg)
+	}
+
+	domain := showDomainRes.GetData()
+
+	log.Println("Read Domain - Show JSON = ", domain)
+
+	if v := domain["uid"]; v != nil {
+		_ = d.Set("uid", v)
+		d.SetId(v.(string))
+	}
+
+	if v := domain["name"]; v != nil {
+		_ = d.Set("name", v)
+	}
+
+	if domain["servers"] != nil {
+
+		serversList, ok := domain["servers"].([]interface{})
+
+		if ok {
+
+			if len(serversList) > 0 {
+
+				var serversListToReturn []map[string]interface{}
+
+				for i := range serversList {
+
+					serversMap := serversList[i].(map[string]interface{})
+
+					serversMapToAdd := make(map[string]interface{})
+
+					if v, _ := serversMap["name"]; v != nil {
+						serversMapToAdd["name"] = v
+					}
+					if v, _ := serversMap["ipv4-address"]; v != nil {
+						serversMapToAdd["ipv4_address"] = v
+					}
+					if v, _ := serversMap["ipv6-address"]; v != nil {
+						serversMapToAdd["ipv4_address"] = v
+					}
+					if v, _ := serversMap["multi-domain-server"]; v != nil {
+						serversMapToAdd["multi_domain_server"] = v
+					}
+					if v, _ := serversMap["active"]; v != nil {
+						serversMapToAdd["active"] = strconv.FormatBool(v.(bool))
+					} else {
+						serversMapToAdd["active"] = true
+					}
+					if v, _ := serversMap["skip-start-domain-server"]; v != nil {
+						serversMapToAdd["skip_start_domain_server"] = strconv.FormatBool(v.(bool))
+					} else {
+						serversMapToAdd["skip_start_domain_server"] = false
+					}
+					if v, _ := serversMap["type"]; v != nil {
+						serversMapToAdd["type"] = v
+					}
+
+					serversListToReturn = append(serversListToReturn, serversMapToAdd)
+				}
+				_ = d.Set("servers", serversListToReturn)
+			}
+		}
+	}
+
+	if v := domain["color"]; v != nil {
+		_ = d.Set("color", v)
+	}
+
+	if v := domain["comments"]; v != nil {
+		_ = d.Set("comments", v)
+	}
+
+	return nil
+}

checkpoint/data_source_checkpoint_management_domain_test.go

@@ -0,0 +1,53 @@
+package checkpoint
+
+import (
+	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"os"
+	"testing"
+)
+
+func TestAccDataSourceCheckpointManagementDomain_basic(t *testing.T) {
+	objName := "tfTestManagementDomain_" + acctest.RandString(6)
+	resourceName := "checkpoint_management_domain.test"
+	dataSourceName := "data.checkpoint_management_domain.data_test"
+
+	context := os.Getenv("CHECKPOINT_CONTEXT")
+	if context != "web_api" {
+		t.Skip("Skipping management test")
+	} else if context == "" {
+		t.Skip("Env CHECKPOINT_CONTEXT must be specified to run this acc test")
+	}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceManagementDomainConfig(objName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrPair(dataSourceName, "name", resourceName, "name"),
+				),
+			},
+		},
+	})
+}
+
+func testAccDataSourceManagementDomainConfig(name string) string {
+	return fmt.Sprintf(`
+resource "checkpoint_management_domain" "test" {
+        name = "%s"
+        servers {
+		name = "serv"
+		ipv4_address = "1.2.3.4"
+		multi_domain_server = "5.5.5.5"
+		}
+	
+}
+
+data "checkpoint_management_domain" "data_test" {
+        name = "${checkpoint_management_domain.test.name}"
+}
+`, name)
+}

checkpoint/data_source_checkpoint_management_repository_package.go

@@ -0,0 +1,65 @@
+package checkpoint
+
+import (
+	"fmt"
+	checkpoint "github.com/CheckPointSW/cp-mgmt-api-go-sdk/APIFiles"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"log"
+)
+
+func dataSourceManagementRepositoryPackage() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceManagementRepositoryPackageRead,
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "The name of the repository package.",
+			},
+			"task_id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Unique identifier of the 'show-repository-package' task. Use the 'show-task' command to check the progress of the task.",
+			},
+		},
+	}
+}
+
+func dataSourceManagementRepositoryPackageRead(d *schema.ResourceData, m interface{}) error {
+	client := m.(*checkpoint.ApiClient)
+
+	name := d.Get("name").(string)
+
+	payload := make(map[string]interface{})
+
+	payload["name"] = name
+
+	showRepositoryPackageRes, err := client.ApiCall("show-repository-package", payload, client.GetSessionID(), true, client.IsProxyUsed())
+	if err != nil {
+		return fmt.Errorf(err.Error())
+	}
+	if !showRepositoryPackageRes.Success {
+		return fmt.Errorf(showRepositoryPackageRes.ErrorMsg)
+	}
+
+	RepositoryPackage := showRepositoryPackageRes.GetData()
+
+	log.Println("Read RepositoryPackage - Show JSON = ", RepositoryPackage)
+
+	if v := RepositoryPackage["uid"]; v != nil {
+		_ = d.Set("uid", v)
+		d.SetId(v.(string))
+	} else {
+		d.SetId("ff")
+	}
+
+	if v, ok := d.GetOk("name"); ok {
+		_ = d.Set("name", v.(string))
+	}
+
+	if v, ok := d.GetOk("task_id"); ok {
+		_ = d.Set("task_id", v.(string))
+	}
+
+	return nil
+}