Fix windows_cis_enabled

aquasec/data_function_assurance_policy.go

@@ -290,7 +290,7 @@ func dataFunctionAssurancePolicy() *schema.Resource {
 			},
 			"packages_black_list": {
 				Type:        schema.TypeSet,
-				Description: "List of blacklist images.",
+				Description: "List of blacklisted images.",
 				Computed:    true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{

aquasec/data_host_assurance_policy.go

@@ -290,7 +290,7 @@ func dataHostAssurancePolicy() *schema.Resource {
 			},
 			"packages_black_list": {
 				Type:        schema.TypeSet,
-				Description: "List of blacklist images.",
+				Description: "List of blacklisted images.",
 				Computed:    true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{

aquasec/data_image_assurance_policy.go

@@ -290,7 +290,7 @@ func dataImageAssurancePolicy() *schema.Resource {
 			},
 			"packages_black_list": {
 				Type:        schema.TypeSet,
-				Description: "List of blacklist images.",
+				Description: "List of blacklisted images.",
 				Computed:    true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{

aquasec/data_kubernetes_assurance_policy.go

@@ -300,7 +300,7 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
 			},
 			"packages_black_list": {
 				Type:        schema.TypeSet,
-				Description: "List of blacklist images.",
+				Description: "List of blacklisted images.",
 				Computed:    true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{

aquasec/resource_function_assurance_policy.go

@@ -310,7 +310,7 @@ func resourceFunctionAssurancePolicy() *schema.Resource {
 			},
 			"packages_black_list": {
 				Type:        schema.TypeSet,
-				Description: "List of blacklist images.",
+				Description: "List of blacklisted images.",
 				Optional:    true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{

aquasec/resource_host_assurance_policy.go

@@ -308,7 +308,7 @@ func resourceHostAssurancePolicy() *schema.Resource {
 			},
 			"packages_black_list": {
 				Type:        schema.TypeSet,
-				Description: "List of blacklist images.",
+				Description: "List of blacklisted images.",
 				Optional:    true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{

aquasec/resource_image_assurance_policy.go

@@ -310,7 +310,7 @@ func resourceImageAssurancePolicy() *schema.Resource {
 			},
 			"packages_black_list": {
 				Type:        schema.TypeSet,
-				Description: "List of blacklist images.",
+				Description: "List of blacklisted images.",
 				Optional:    true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -1800,6 +1800,11 @@ func expandAssurancePolicy(d *schema.ResourceData, a_type string) *client.Assura
 		iap.LinuxCisEnabled = linux_cis_enabled.(bool)
 	}
 
+	windows_cis_enabled, ok := d.GetOk("windows_cis_enabled")
+	if ok {
+		iap.WindowsCisEnabled = windows_cis_enabled.(bool)
+	}
+
 	openshift_hardening_enabled, ok := d.GetOk("openshift_hardening_enabled")
 	if ok {
 		iap.OpenshiftHardeningEnabled = openshift_hardening_enabled.(bool)

aquasec/resource_kubernetes_assurance_policy.go

@@ -309,7 +309,7 @@ func resourceKubernetesAssurancePolicy() *schema.Resource {
 			},
 			"packages_black_list": {
 				Type:        schema.TypeSet,
-				Description: "List of blacklist images.",
+				Description: "List of blacklisted images.",
 				Optional:    true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{

aquasec/resource_vmware_assurance_policy.go

@@ -309,7 +309,7 @@ func resourceVMwareAssurancePolicy() *schema.Resource {
 			},
 			"packages_black_list": {
 				Type:        schema.TypeSet,
-				Description: "List of blacklist images.",
+				Description: "List of blacklisted images.",
 				Optional:    true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{

client/assurance_policy.go

@@ -12,7 +12,7 @@ import (
 
 type AssurancePolicy struct {
 	AssuranceType                    string              `json:"assurance_type"`
-	Id                               int                 `json:"id,omitempty"`
+	Id                               int                 `json:"id"`
 	Name                             string              `json:"name"`
 	Author                           string              `json:"author"`
 	Registry                         string              `json:"registry,omitempty"`
@@ -185,19 +185,19 @@ type KubernetesControls struct {
 type KubernetesControlsArray []KubernetesControls
 
 // GetAssurancePolicy - returns single  Assurance Policy
-func (cli *Client) GetAssurancePolicy(name string, at string) (*AssurancePolicy, error) {
+func (cli *Client) GetAssurancePolicy(name string, assuranceType string) (*AssurancePolicy, error) {
 	var err error
 	var response AssurancePolicy
 	var atype string
-	if strings.EqualFold(at, "host") {
+	if strings.EqualFold(assuranceType, "host") {
 		atype = "host"
-	} else if strings.EqualFold(at, "image") {
+	} else if strings.EqualFold(assuranceType, "image") {
 		atype = "image"
-	} else if strings.EqualFold(at, "function") {
+	} else if strings.EqualFold(assuranceType, "function") {
 		atype = "function"
-	} else if strings.EqualFold(at, "kubernetes") {
+	} else if strings.EqualFold(assuranceType, "kubernetes") {
 		atype = "kubernetes"
-	} else if strings.EqualFold(at, "cf_application") {
+	} else if strings.EqualFold(assuranceType, "cf_application") {
 		atype = "cf_application"
 	}
 
@@ -238,18 +238,18 @@ func (cli *Client) GetAssurancePolicy(name string, at string) (*AssurancePolicy,
 }
 
 // CreateAssurancePolicy - creates single Aqua  Assurance Policy
-func (cli *Client) CreateAssurancePolicy(assurancepolicy *AssurancePolicy, at string) error {
-	payload, err := json.Marshal(assurancepolicy)
+func (cli *Client) CreateAssurancePolicy(assurancePolicy *AssurancePolicy, assuranceType string) error {
+	payload, err := json.Marshal(assurancePolicy)
 	var atype string
-	if strings.EqualFold(at, "host") {
+	if strings.EqualFold(assuranceType, "host") {
 		atype = "host"
-	} else if strings.EqualFold(at, "image") {
+	} else if strings.EqualFold(assuranceType, "image") {
 		atype = "image"
-	} else if strings.EqualFold(at, "function") {
+	} else if strings.EqualFold(assuranceType, "function") {
 		atype = "function"
-	} else if strings.EqualFold(at, "kubernetes") {
+	} else if strings.EqualFold(assuranceType, "kubernetes") {
 		atype = "kubernetes"
-	} else if strings.EqualFold(at, "cf_application") {
+	} else if strings.EqualFold(assuranceType, "cf_application") {
 		atype = "cf_application"
 	}
 
@@ -284,24 +284,24 @@ func (cli *Client) CreateAssurancePolicy(assurancepolicy *AssurancePolicy, at st
 }
 
 // UpdateAssurancePolicy updates an existing  Assurance Policy
-func (cli *Client) UpdateAssurancePolicy(assurancepolicy *AssurancePolicy, at string) error {
-	payload, err := json.Marshal(assurancepolicy)
+func (cli *Client) UpdateAssurancePolicy(assurancePolicy *AssurancePolicy, assuranceType string) error {
+	payload, err := json.Marshal(assurancePolicy)
 	if err != nil {
 		return err
 	}
 	var atype string
-	if strings.EqualFold(at, "host") {
+	if strings.EqualFold(assuranceType, "host") {
 		atype = "host"
-	} else if strings.EqualFold(at, "image") {
+	} else if strings.EqualFold(assuranceType, "image") {
 		atype = "image"
-	} else if strings.EqualFold(at, "function") {
+	} else if strings.EqualFold(assuranceType, "function") {
 		atype = "function"
-	} else if strings.EqualFold(at, "kubernetes") {
+	} else if strings.EqualFold(assuranceType, "kubernetes") {
 		atype = "kubernetes"
-	} else if strings.EqualFold(at, "cf_application") {
+	} else if strings.EqualFold(assuranceType, "cf_application") {
 		atype = "cf_application"
 	}
-	apiPath := "/api/v2/assurance_policy/" + atype + "/" + assurancepolicy.Name
+	apiPath := "/api/v2/assurance_policy/" + atype + "/" + assurancePolicy.Name
 	request := cli.gorequest
 	err = cli.limiter.Wait(context.Background())
 	if err != nil {
@@ -329,18 +329,18 @@ func (cli *Client) UpdateAssurancePolicy(assurancepolicy *AssurancePolicy, at st
 }
 
 // DeleteAssurancePolicy removes a  Assurance Policy
-func (cli *Client) DeleteAssurancePolicy(name string, at string) error {
+func (cli *Client) DeleteAssurancePolicy(name string, assuranceType string) error {
 	request := cli.gorequest
 	var atype string
-	if strings.EqualFold(at, "host") {
+	if strings.EqualFold(assuranceType, "host") {
 		atype = "host"
-	} else if strings.EqualFold(at, "image") {
+	} else if strings.EqualFold(assuranceType, "image") {
 		atype = "image"
-	} else if strings.EqualFold(at, "function") {
+	} else if strings.EqualFold(assuranceType, "function") {
 		atype = "function"
-	} else if strings.EqualFold(at, "kubernetes") {
+	} else if strings.EqualFold(assuranceType, "kubernetes") {
 		atype = "kubernetes"
-	} else if strings.EqualFold(at, "cf_application") {
+	} else if strings.EqualFold(assuranceType, "cf_application") {
 		atype = "cf_application"
 	}
 	apiPath := "/api/v2/assurance_policy/" + atype + "/" + name

docs/data-sources/function_assurance_policy.md

@@ -75,7 +75,7 @@ description: |-
 - `maximum_score_exclude_no_fix` (Boolean) Indicates that policy should ignore cases that do not have a known fix.
 - `monitored_malware_paths` (List of String)
 - `only_none_root_users` (Boolean) Indicates if raise a warning for images that should only be run as root.
-- `packages_black_list` (Set of Object) List of blacklist images. (see [below for nested schema](#nestedatt--packages_black_list))
+- `packages_black_list` (Set of Object) List of blacklisted images. (see [below for nested schema](#nestedatt--packages_black_list))
 - `packages_black_list_enabled` (Boolean) Indicates if packages blacklist is relevant.
 - `packages_white_list` (Set of Object) List of whitelisted images. (see [below for nested schema](#nestedatt--packages_white_list))
 - `packages_white_list_enabled` (Boolean) Indicates if packages whitelist is relevant.

docs/data-sources/host_assurance_policy.md

@@ -75,7 +75,7 @@ description: |-
 - `maximum_score_exclude_no_fix` (Boolean) Indicates that policy should ignore cases that do not have a known fix.
 - `monitored_malware_paths` (List of String)
 - `only_none_root_users` (Boolean) Indicates if raise a warning for images that should only be run as root.
-- `packages_black_list` (Set of Object) List of blacklist images. (see [below for nested schema](#nestedatt--packages_black_list))
+- `packages_black_list` (Set of Object) List of blacklisted images. (see [below for nested schema](#nestedatt--packages_black_list))
 - `packages_black_list_enabled` (Boolean) Indicates if packages blacklist is relevant.
 - `packages_white_list` (Set of Object) List of whitelisted images. (see [below for nested schema](#nestedatt--packages_white_list))
 - `packages_white_list_enabled` (Boolean) Indicates if packages whitelist is relevant.

docs/data-sources/image_assurance_policy.md

@@ -75,7 +75,7 @@ description: |-
 - `maximum_score_exclude_no_fix` (Boolean) Indicates that policy should ignore cases that do not have a known fix.
 - `monitored_malware_paths` (List of String)
 - `only_none_root_users` (Boolean) Indicates if raise a warning for images that should only be run as root.
-- `packages_black_list` (Set of Object) List of blacklist images. (see [below for nested schema](#nestedatt--packages_black_list))
+- `packages_black_list` (Set of Object) List of blacklisted images. (see [below for nested schema](#nestedatt--packages_black_list))
 - `packages_black_list_enabled` (Boolean) Indicates if packages blacklist is relevant.
 - `packages_white_list` (Set of Object) List of whitelisted images. (see [below for nested schema](#nestedatt--packages_white_list))
 - `packages_white_list_enabled` (Boolean) Indicates if packages whitelist is relevant.

docs/data-sources/kubernetes_assurance_policy.md

@@ -76,7 +76,7 @@ description: |-
 - `maximum_score_exclude_no_fix` (Boolean) Indicates that policy should ignore cases that do not have a known fix.
 - `monitored_malware_paths` (List of String) Directories to be monitored.
 - `only_none_root_users` (Boolean) Indicates if raise a warning for images that should only be run as root.
-- `packages_black_list` (Set of Object) List of blacklist images. (see [below for nested schema](#nestedatt--packages_black_list))
+- `packages_black_list` (Set of Object) List of blacklisted images. (see [below for nested schema](#nestedatt--packages_black_list))
 - `packages_black_list_enabled` (Boolean) Indicates if packages blacklist is relevant.
 - `packages_white_list` (Set of Object) List of whitelisted images. (see [below for nested schema](#nestedatt--packages_white_list))
 - `packages_white_list_enabled` (Boolean) Indicates if packages whitelist is relevant.

docs/resources/function_assurance_policy.md

@@ -97,7 +97,7 @@ Providing comprehensive audits of all security risks, viewable in Aqua Server or
 - `monitored_malware_paths` (List of String)
 - `only_none_root_users` (Boolean) Indicates if raise a warning for images that should only be run as root.
 - `openshift_hardening_enabled` (Boolean)
-- `packages_black_list` (Block Set) List of blacklist images. (see [below for nested schema](#nestedblock--packages_black_list))
+- `packages_black_list` (Block Set) List of blacklisted images. (see [below for nested schema](#nestedblock--packages_black_list))
 - `packages_black_list_enabled` (Boolean) Indicates if packages blacklist is relevant.
 - `packages_white_list` (Block Set) List of whitelisted images. (see [below for nested schema](#nestedblock--packages_white_list))
 - `packages_white_list_enabled` (Boolean) Indicates if packages whitelist is relevant.

docs/resources/host_assurance_policy.md

@@ -95,7 +95,7 @@ Generates an audit event for host assurance failure.
 - `monitored_malware_paths` (List of String)
 - `only_none_root_users` (Boolean) Indicates if raise a warning for images that should only be run as root.
 - `openshift_hardening_enabled` (Boolean)
-- `packages_black_list` (Block Set) List of blacklist images. (see [below for nested schema](#nestedblock--packages_black_list))
+- `packages_black_list` (Block Set) List of blacklisted images. (see [below for nested schema](#nestedblock--packages_black_list))
 - `packages_black_list_enabled` (Boolean) Indicates if packages blacklist is relevant.
 - `packages_white_list` (Block Set) List of whitelisted images. (see [below for nested schema](#nestedblock--packages_white_list))
 - `packages_white_list_enabled` (Boolean) Indicates if packages whitelist is relevant.

docs/resources/image_assurance_policy.md

@@ -87,7 +87,7 @@ Aqua Image Assurance covers the first part of the container lifecycle: image dev
 - `monitored_malware_paths` (List of String)
 - `only_none_root_users` (Boolean) Indicates if raise a warning for images that should only be run as root.
 - `openshift_hardening_enabled` (Boolean)
-- `packages_black_list` (Block Set) List of blacklist images. (see [below for nested schema](#nestedblock--packages_black_list))
+- `packages_black_list` (Block Set) List of blacklisted images. (see [below for nested schema](#nestedblock--packages_black_list))
 - `packages_black_list_enabled` (Boolean) Indicates if packages blacklist is relevant.
 - `packages_white_list` (Block Set) List of whitelisted images. (see [below for nested schema](#nestedblock--packages_white_list))
 - `packages_white_list_enabled` (Boolean) Indicates if packages whitelist is relevant.

docs/resources/kubernetes_assurance_policy.md

@@ -87,7 +87,7 @@ Kubernetes Assurance is responsible for checking the security of workload config
 - `monitored_malware_paths` (List of String)
 - `only_none_root_users` (Boolean) Indicates if raise a warning for images that should only be run as root.
 - `openshift_hardening_enabled` (Boolean)
-- `packages_black_list` (Block Set) List of blacklist images. (see [below for nested schema](#nestedblock--packages_black_list))
+- `packages_black_list` (Block Set) List of blacklisted images. (see [below for nested schema](#nestedblock--packages_black_list))
 - `packages_black_list_enabled` (Boolean) Indicates if packages blacklist is relevant.
 - `packages_white_list` (Block Set) List of whitelisted images. (see [below for nested schema](#nestedblock--packages_white_list))
 - `packages_white_list_enabled` (Boolean) Indicates if packages whitelist is relevant.

docs/resources/vmware_assurance_policy.md

@@ -87,7 +87,7 @@ description: |-
 - `monitored_malware_paths` (List of String)
 - `only_none_root_users` (Boolean) Indicates if raise a warning for images that should only be run as root.
 - `openshift_hardening_enabled` (Boolean)
-- `packages_black_list` (Block Set) List of blacklist images. (see [below for nested schema](#nestedblock--packages_black_list))
+- `packages_black_list` (Block Set) List of blacklisted images. (see [below for nested schema](#nestedblock--packages_black_list))
 - `packages_black_list_enabled` (Boolean) Indicates if packages blacklist is relevant.
 - `packages_white_list` (Block Set) List of whitelisted images. (see [below for nested schema](#nestedblock--packages_white_list))
 - `packages_white_list_enabled` (Boolean) Indicates if packages whitelist is relevant.