Skip to content

Commit

Permalink
Merge pull request #257 from aquasecurity/SLK-77487-object-windows-ci…
Browse files Browse the repository at this point in the history 
…s-enabled-in-image-assurance-policy-returns-an-extraneous-json-object-property

Slk 77487 object windows cis enabled in image assurance policy returns an extraneous json object property
  • Loading branch information
@semyonmor
semyonmor authored Jan 18, 2024
2 parents 57cf643 + f7b4847 commit 3faa5bd
Show file tree
Hide file tree
Showing 21 changed files with 266 additions and 209 deletions.
3 changes: 2 additions & 1 deletion aquasec/data_enforcer_group.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import (

func dataSourceEnforcerGroup() *schema.Resource {
return &schema.Resource{
Read: dataEnforcerGroupRead,
Description: "The data source `aquasec_enforcer_groups` provides an Enforcer group template that generates a configuration file, which is subsequently used to generate one or more Enforcers using a Docker command.",
Read: dataEnforcerGroupRead,
Schema: map[string]*schema.Schema{
"group_id": {
Type: schema.TypeString,
Expand Down
20 changes: 11 additions & 9 deletions aquasec/data_function_assurance_policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func dataFunctionAssurancePolicy() *schema.Resource {
},
"cves_black_list_enabled": {
Type: schema.TypeBool,
Description: "Indicates if cves blacklist is relevant.",
Description: "Indicates if CVEs blacklist is relevant.",
Computed: true,
},
"packages_black_list_enabled": {
Expand Down Expand Up @@ -142,7 +142,7 @@ func dataFunctionAssurancePolicy() *schema.Resource {
},
"blacklisted_licenses_enabled": {
Type: schema.TypeBool,
Description: "Lndicates if license blacklist is relevant.",
Description: "Indicates if license blacklist is relevant.",
Computed: true,
},
"blacklisted_licenses": {
Expand Down Expand Up @@ -282,15 +282,15 @@ func dataFunctionAssurancePolicy() *schema.Resource {
},
"cves_black_list": {
Type: schema.TypeList,
Description: "List of cves blacklisted items.",
Description: "List of CVEs blacklisted items.",
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"packages_black_list": {
Type: schema.TypeSet,
Description: "List of backlisted images.",
Description: "List of blacklisted images.",
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -412,12 +412,14 @@ func dataFunctionAssurancePolicy() *schema.Resource {
Computed: true,
},
"docker_cis_enabled": {
Type: schema.TypeBool,
Computed: true,
Type: schema.TypeBool,
Description: "Checks the host according to the Docker CIS benchmark, if Docker is found on the host.",
Computed: true,
},
"kube_cis_enabled": {
Type: schema.TypeBool,
Computed: true,
Type: schema.TypeBool,
Description: "Performs a Kubernetes CIS benchmark check for the host.",
Computed: true,
},
"enforce_excessive_permissions": {
Type: schema.TypeBool,
Expand All @@ -433,7 +435,7 @@ func dataFunctionAssurancePolicy() *schema.Resource {
},
"cves_white_list_enabled": {
Type: schema.TypeBool,
Description: "Indicates if cves whitelist is relevant.",
Description: "Indicates if CVEs whitelist is relevant.",
Computed: true,
},
"cves_white_list": {
Expand Down
20 changes: 11 additions & 9 deletions aquasec/data_host_assurance_policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func dataHostAssurancePolicy() *schema.Resource {
},
"cves_black_list_enabled": {
Type: schema.TypeBool,
Description: "Indicates if cves blacklist is relevant.",
Description: "Indicates if CVEs blacklist is relevant.",
Computed: true,
},
"packages_black_list_enabled": {
Expand Down Expand Up @@ -142,7 +142,7 @@ func dataHostAssurancePolicy() *schema.Resource {
},
"blacklisted_licenses_enabled": {
Type: schema.TypeBool,
Description: "Lndicates if license blacklist is relevant.",
Description: "Indicates if license blacklist is relevant.",
Computed: true,
},
"blacklisted_licenses": {
Expand Down Expand Up @@ -282,15 +282,15 @@ func dataHostAssurancePolicy() *schema.Resource {
},
"cves_black_list": {
Type: schema.TypeList,
Description: "List of cves blacklisted items.",
Description: "List of CVEs blacklisted items.",
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"packages_black_list": {
Type: schema.TypeSet,
Description: "List of backlisted images.",
Description: "List of blacklisted images.",
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -412,12 +412,14 @@ func dataHostAssurancePolicy() *schema.Resource {
Computed: true,
},
"docker_cis_enabled": {
Type: schema.TypeBool,
Computed: true,
Type: schema.TypeBool,
Description: "Checks the host according to the Docker CIS benchmark, if Docker is found on the host.",
Computed: true,
},
"kube_cis_enabled": {
Type: schema.TypeBool,
Computed: true,
Type: schema.TypeBool,
Description: "Performs a Kubernetes CIS benchmark check for the host.",
Computed: true,
},
"enforce_excessive_permissions": {
Type: schema.TypeBool,
Expand All @@ -433,7 +435,7 @@ func dataHostAssurancePolicy() *schema.Resource {
},
"cves_white_list_enabled": {
Type: schema.TypeBool,
Description: "Indicates if cves whitelist is relevant.",
Description: "Indicates if CVEs whitelist is relevant.",
Computed: true,
},
"cves_white_list": {
Expand Down
20 changes: 11 additions & 9 deletions aquasec/data_image_assurance_policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func dataImageAssurancePolicy() *schema.Resource {
},
"cves_black_list_enabled": {
Type: schema.TypeBool,
Description: "Indicates if cves blacklist is relevant.",
Description: "Indicates if CVEs blacklist is relevant.",
Computed: true,
},
"packages_black_list_enabled": {
Expand Down Expand Up @@ -142,7 +142,7 @@ func dataImageAssurancePolicy() *schema.Resource {
},
"blacklisted_licenses_enabled": {
Type: schema.TypeBool,
Description: "Lndicates if license blacklist is relevant.",
Description: "Indicates if license blacklist is relevant.",
Computed: true,
},
"blacklisted_licenses": {
Expand Down Expand Up @@ -282,15 +282,15 @@ func dataImageAssurancePolicy() *schema.Resource {
},
"cves_black_list": {
Type: schema.TypeList,
Description: "List of cves blacklisted items.",
Description: "List of CVEs blacklisted items.",
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"packages_black_list": {
Type: schema.TypeSet,
Description: "List of backlisted images.",
Description: "List of blacklisted images.",
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -412,12 +412,14 @@ func dataImageAssurancePolicy() *schema.Resource {
Computed: true,
},
"docker_cis_enabled": {
Type: schema.TypeBool,
Computed: true,
Type: schema.TypeBool,
Description: "Checks the host according to the Docker CIS benchmark, if Docker is found on the host.",
Computed: true,
},
"kube_cis_enabled": {
Type: schema.TypeBool,
Computed: true,
Type: schema.TypeBool,
Description: "Performs a Kubernetes CIS benchmark check for the host.",
Computed: true,
},
"enforce_excessive_permissions": {
Type: schema.TypeBool,
Expand All @@ -433,7 +435,7 @@ func dataImageAssurancePolicy() *schema.Resource {
},
"cves_white_list_enabled": {
Type: schema.TypeBool,
Description: "Indicates if cves whitelist is relevant.",
Description: "Indicates if CVEs whitelist is relevant.",
Computed: true,
},
"cves_white_list": {
Expand Down
42 changes: 23 additions & 19 deletions aquasec/data_kubernetes_assurance_policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
},
"cvss_severity_enabled": {
Type: schema.TypeBool,
Description: "Indicates if the cvss severity is scanned.",
Description: "Indicates if the CVSS severity is scanned.",
Computed: true,
},
"cvss_severity": {
Type: schema.TypeString,
Description: "Identifier of the cvss severity.",
Description: "Identifier of the CVSS severity.",
Computed: true,
},
"cvss_severity_exclude_no_fix": {
Type: schema.TypeBool,
Description: "Indicates that policy should ignore cvss cases that do not have a known fix.",
Description: "Indicates that policy should ignore CVSS cases that do not have a known fix.",
Computed: true,
},
"custom_severity_enabled": {
Expand Down Expand Up @@ -73,12 +73,12 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
},
"scap_enabled": {
Type: schema.TypeBool,
Description: "Indicates if scanning should include scap.",
Description: "Indicates if scanning should include SCAP.",
Computed: true,
},
"cves_black_list_enabled": {
Type: schema.TypeBool,
Description: "Indicates if cves blacklist is relevant.",
Description: "Indicates if CVEs blacklist is relevant.",
Computed: true,
},
"kubernetes_controls_names": {
Expand Down Expand Up @@ -121,7 +121,7 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
},
"fail_cicd": {
Type: schema.TypeBool,
Description: "Indicates if cicd failures will fail the image.",
Description: "Indicates if CI/CD failures will fail the image.",
Computed: true,
},
"block_failed": {
Expand All @@ -135,22 +135,24 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
Computed: true,
},
"monitored_malware_paths": {
Type: schema.TypeList,
Computed: true,
Type: schema.TypeList,
Description: "Directories to be monitored.",
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"exceptional_monitored_malware_paths": {
Type: schema.TypeList,
Computed: true,
Type: schema.TypeList,
Description: "Directories to be excluded from monitoring.",
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"blacklisted_licenses_enabled": {
Type: schema.TypeBool,
Description: "Lndicates if license blacklist is relevant.",
Description: "Indicates if license blacklist is relevant.",
Computed: true,
},
"blacklisted_licenses": {
Expand Down Expand Up @@ -290,15 +292,15 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
},
"cves_black_list": {
Type: schema.TypeList,
Description: "List of cves blacklisted items.",
Description: "List of CVEs blacklisted items.",
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"packages_black_list": {
Type: schema.TypeSet,
Description: "List of backlisted images.",
Description: "List of blacklisted images.",
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -420,12 +422,14 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
Computed: true,
},
"docker_cis_enabled": {
Type: schema.TypeBool,
Computed: true,
Type: schema.TypeBool,
Description: "Checks the host according to the Docker CIS benchmark, if Docker is found on the host.",
Computed: true,
},
"kube_cis_enabled": {
Type: schema.TypeBool,
Computed: true,
Type: schema.TypeBool,
Description: "Performs a Kubernetes CIS benchmark check for the host.",
Computed: true,
},
"enforce_excessive_permissions": {
Type: schema.TypeBool,
Expand All @@ -441,12 +445,12 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
},
"cves_white_list_enabled": {
Type: schema.TypeBool,
Description: "Indicates if cves whitelist is relevant.",
Description: "Indicates if CVEs whitelist is relevant.",
Computed: true,
},
"cves_white_list": {
Type: schema.TypeList,
Description: "List of cves whitelisted licenses",
Description: "List of CVEs whitelisted licenses",
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
Expand Down
Loading

0 comments on commit 3faa5bd

Please sign in to comment.