Skip to content

Commit 3faa5bd

Browse files
semyonmorsemyonmor
authored
Merge pull request #257 from aquasecurity/SLK-77487-object-windows-cis-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
2 parents 57cf643 + f7b4847 commit 3faa5bd

21 files changed

+266
-209
lines changed

‎aquasec/data_enforcer_group.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import (
99

1010
func dataSourceEnforcerGroup() *schema.Resource {
1111
return &schema.Resource{
12-
Read: dataEnforcerGroupRead,
12+
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.",
13+
Read: dataEnforcerGroupRead,
1314
Schema: map[string]*schema.Schema{
1415
"group_id": {
1516
Type: schema.TypeString,

‎aquasec/data_function_assurance_policy.go‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func dataFunctionAssurancePolicy() *schema.Resource {
7878
},
7979
"cves_black_list_enabled": {
8080
Type: schema.TypeBool,
81-
Description: "Indicates if cves blacklist is relevant.",
81+
Description: "Indicates if CVEs blacklist is relevant.",
8282
Computed: true,
8383
},
8484
"packages_black_list_enabled": {
@@ -142,7 +142,7 @@ func dataFunctionAssurancePolicy() *schema.Resource {
142142
},
143143
"blacklisted_licenses_enabled": {
144144
Type: schema.TypeBool,
145-
Description: "Lndicates if license blacklist is relevant.",
145+
Description: "Indicates if license blacklist is relevant.",
146146
Computed: true,
147147
},
148148
"blacklisted_licenses": {
@@ -282,15 +282,15 @@ func dataFunctionAssurancePolicy() *schema.Resource {
282282
},
283283
"cves_black_list": {
284284
Type: schema.TypeList,
285-
Description: "List of cves blacklisted items.",
285+
Description: "List of CVEs blacklisted items.",
286286
Computed: true,
287287
Elem: &schema.Schema{
288288
Type: schema.TypeString,
289289
},
290290
},
291291
"packages_black_list": {
292292
Type: schema.TypeSet,
293-
Description: "List of backlisted images.",
293+
Description: "List of blacklisted images.",
294294
Computed: true,
295295
Elem: &schema.Resource{
296296
Schema: map[string]*schema.Schema{
@@ -412,12 +412,14 @@ func dataFunctionAssurancePolicy() *schema.Resource {
412412
Computed: true,
413413
},
414414
"docker_cis_enabled": {
415-
Type: schema.TypeBool,
416-
Computed: true,
415+
Type: schema.TypeBool,
416+
Description: "Checks the host according to the Docker CIS benchmark, if Docker is found on the host.",
417+
Computed: true,
417418
},
418419
"kube_cis_enabled": {
419-
Type: schema.TypeBool,
420-
Computed: true,
420+
Type: schema.TypeBool,
421+
Description: "Performs a Kubernetes CIS benchmark check for the host.",
422+
Computed: true,
421423
},
422424
"enforce_excessive_permissions": {
423425
Type: schema.TypeBool,
@@ -433,7 +435,7 @@ func dataFunctionAssurancePolicy() *schema.Resource {
433435
},
434436
"cves_white_list_enabled": {
435437
Type: schema.TypeBool,
436-
Description: "Indicates if cves whitelist is relevant.",
438+
Description: "Indicates if CVEs whitelist is relevant.",
437439
Computed: true,
438440
},
439441
"cves_white_list": {

‎aquasec/data_host_assurance_policy.go‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func dataHostAssurancePolicy() *schema.Resource {
7878
},
7979
"cves_black_list_enabled": {
8080
Type: schema.TypeBool,
81-
Description: "Indicates if cves blacklist is relevant.",
81+
Description: "Indicates if CVEs blacklist is relevant.",
8282
Computed: true,
8383
},
8484
"packages_black_list_enabled": {
@@ -142,7 +142,7 @@ func dataHostAssurancePolicy() *schema.Resource {
142142
},
143143
"blacklisted_licenses_enabled": {
144144
Type: schema.TypeBool,
145-
Description: "Lndicates if license blacklist is relevant.",
145+
Description: "Indicates if license blacklist is relevant.",
146146
Computed: true,
147147
},
148148
"blacklisted_licenses": {
@@ -282,15 +282,15 @@ func dataHostAssurancePolicy() *schema.Resource {
282282
},
283283
"cves_black_list": {
284284
Type: schema.TypeList,
285-
Description: "List of cves blacklisted items.",
285+
Description: "List of CVEs blacklisted items.",
286286
Computed: true,
287287
Elem: &schema.Schema{
288288
Type: schema.TypeString,
289289
},
290290
},
291291
"packages_black_list": {
292292
Type: schema.TypeSet,
293-
Description: "List of backlisted images.",
293+
Description: "List of blacklisted images.",
294294
Computed: true,
295295
Elem: &schema.Resource{
296296
Schema: map[string]*schema.Schema{
@@ -412,12 +412,14 @@ func dataHostAssurancePolicy() *schema.Resource {
412412
Computed: true,
413413
},
414414
"docker_cis_enabled": {
415-
Type: schema.TypeBool,
416-
Computed: true,
415+
Type: schema.TypeBool,
416+
Description: "Checks the host according to the Docker CIS benchmark, if Docker is found on the host.",
417+
Computed: true,
417418
},
418419
"kube_cis_enabled": {
419-
Type: schema.TypeBool,
420-
Computed: true,
420+
Type: schema.TypeBool,
421+
Description: "Performs a Kubernetes CIS benchmark check for the host.",
422+
Computed: true,
421423
},
422424
"enforce_excessive_permissions": {
423425
Type: schema.TypeBool,
@@ -433,7 +435,7 @@ func dataHostAssurancePolicy() *schema.Resource {
433435
},
434436
"cves_white_list_enabled": {
435437
Type: schema.TypeBool,
436-
Description: "Indicates if cves whitelist is relevant.",
438+
Description: "Indicates if CVEs whitelist is relevant.",
437439
Computed: true,
438440
},
439441
"cves_white_list": {

‎aquasec/data_image_assurance_policy.go‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func dataImageAssurancePolicy() *schema.Resource {
7878
},
7979
"cves_black_list_enabled": {
8080
Type: schema.TypeBool,
81-
Description: "Indicates if cves blacklist is relevant.",
81+
Description: "Indicates if CVEs blacklist is relevant.",
8282
Computed: true,
8383
},
8484
"packages_black_list_enabled": {
@@ -142,7 +142,7 @@ func dataImageAssurancePolicy() *schema.Resource {
142142
},
143143
"blacklisted_licenses_enabled": {
144144
Type: schema.TypeBool,
145-
Description: "Lndicates if license blacklist is relevant.",
145+
Description: "Indicates if license blacklist is relevant.",
146146
Computed: true,
147147
},
148148
"blacklisted_licenses": {
@@ -282,15 +282,15 @@ func dataImageAssurancePolicy() *schema.Resource {
282282
},
283283
"cves_black_list": {
284284
Type: schema.TypeList,
285-
Description: "List of cves blacklisted items.",
285+
Description: "List of CVEs blacklisted items.",
286286
Computed: true,
287287
Elem: &schema.Schema{
288288
Type: schema.TypeString,
289289
},
290290
},
291291
"packages_black_list": {
292292
Type: schema.TypeSet,
293-
Description: "List of backlisted images.",
293+
Description: "List of blacklisted images.",
294294
Computed: true,
295295
Elem: &schema.Resource{
296296
Schema: map[string]*schema.Schema{
@@ -412,12 +412,14 @@ func dataImageAssurancePolicy() *schema.Resource {
412412
Computed: true,
413413
},
414414
"docker_cis_enabled": {
415-
Type: schema.TypeBool,
416-
Computed: true,
415+
Type: schema.TypeBool,
416+
Description: "Checks the host according to the Docker CIS benchmark, if Docker is found on the host.",
417+
Computed: true,
417418
},
418419
"kube_cis_enabled": {
419-
Type: schema.TypeBool,
420-
Computed: true,
420+
Type: schema.TypeBool,
421+
Description: "Performs a Kubernetes CIS benchmark check for the host.",
422+
Computed: true,
421423
},
422424
"enforce_excessive_permissions": {
423425
Type: schema.TypeBool,
@@ -433,7 +435,7 @@ func dataImageAssurancePolicy() *schema.Resource {
433435
},
434436
"cves_white_list_enabled": {
435437
Type: schema.TypeBool,
436-
Description: "Indicates if cves whitelist is relevant.",
438+
Description: "Indicates if CVEs whitelist is relevant.",
437439
Computed: true,
438440
},
439441
"cves_white_list": {

‎aquasec/data_kubernetes_assurance_policy.go‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
3535
},
3636
"cvss_severity_enabled": {
3737
Type: schema.TypeBool,
38-
Description: "Indicates if the cvss severity is scanned.",
38+
Description: "Indicates if the CVSS severity is scanned.",
3939
Computed: true,
4040
},
4141
"cvss_severity": {
4242
Type: schema.TypeString,
43-
Description: "Identifier of the cvss severity.",
43+
Description: "Identifier of the CVSS severity.",
4444
Computed: true,
4545
},
4646
"cvss_severity_exclude_no_fix": {
4747
Type: schema.TypeBool,
48-
Description: "Indicates that policy should ignore cvss cases that do not have a known fix.",
48+
Description: "Indicates that policy should ignore CVSS cases that do not have a known fix.",
4949
Computed: true,
5050
},
5151
"custom_severity_enabled": {
@@ -73,12 +73,12 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
7373
},
7474
"scap_enabled": {
7575
Type: schema.TypeBool,
76-
Description: "Indicates if scanning should include scap.",
76+
Description: "Indicates if scanning should include SCAP.",
7777
Computed: true,
7878
},
7979
"cves_black_list_enabled": {
8080
Type: schema.TypeBool,
81-
Description: "Indicates if cves blacklist is relevant.",
81+
Description: "Indicates if CVEs blacklist is relevant.",
8282
Computed: true,
8383
},
8484
"kubernetes_controls_names": {
@@ -121,7 +121,7 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
121121
},
122122
"fail_cicd": {
123123
Type: schema.TypeBool,
124-
Description: "Indicates if cicd failures will fail the image.",
124+
Description: "Indicates if CI/CD failures will fail the image.",
125125
Computed: true,
126126
},
127127
"block_failed": {
@@ -135,22 +135,24 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
135135
Computed: true,
136136
},
137137
"monitored_malware_paths": {
138-
Type: schema.TypeList,
139-
Computed: true,
138+
Type: schema.TypeList,
139+
Description: "Directories to be monitored.",
140+
Computed: true,
140141
Elem: &schema.Schema{
141142
Type: schema.TypeString,
142143
},
143144
},
144145
"exceptional_monitored_malware_paths": {
145-
Type: schema.TypeList,
146-
Computed: true,
146+
Type: schema.TypeList,
147+
Description: "Directories to be excluded from monitoring.",
148+
Computed: true,
147149
Elem: &schema.Schema{
148150
Type: schema.TypeString,
149151
},
150152
},
151153
"blacklisted_licenses_enabled": {
152154
Type: schema.TypeBool,
153-
Description: "Lndicates if license blacklist is relevant.",
155+
Description: "Indicates if license blacklist is relevant.",
154156
Computed: true,
155157
},
156158
"blacklisted_licenses": {
@@ -290,15 +292,15 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
290292
},
291293
"cves_black_list": {
292294
Type: schema.TypeList,
293-
Description: "List of cves blacklisted items.",
295+
Description: "List of CVEs blacklisted items.",
294296
Computed: true,
295297
Elem: &schema.Schema{
296298
Type: schema.TypeString,
297299
},
298300
},
299301
"packages_black_list": {
300302
Type: schema.TypeSet,
301-
Description: "List of backlisted images.",
303+
Description: "List of blacklisted images.",
302304
Computed: true,
303305
Elem: &schema.Resource{
304306
Schema: map[string]*schema.Schema{
@@ -420,12 +422,14 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
420422
Computed: true,
421423
},
422424
"docker_cis_enabled": {
423-
Type: schema.TypeBool,
424-
Computed: true,
425+
Type: schema.TypeBool,
426+
Description: "Checks the host according to the Docker CIS benchmark, if Docker is found on the host.",
427+
Computed: true,
425428
},
426429
"kube_cis_enabled": {
427-
Type: schema.TypeBool,
428-
Computed: true,
430+
Type: schema.TypeBool,
431+
Description: "Performs a Kubernetes CIS benchmark check for the host.",
432+
Computed: true,
429433
},
430434
"enforce_excessive_permissions": {
431435
Type: schema.TypeBool,
@@ -441,12 +445,12 @@ func dataKubernetesAssurancePolicy() *schema.Resource {
441445
},
442446
"cves_white_list_enabled": {
443447
Type: schema.TypeBool,
444-
Description: "Indicates if cves whitelist is relevant.",
448+
Description: "Indicates if CVEs whitelist is relevant.",
445449
Computed: true,
446450
},
447451
"cves_white_list": {
448452
Type: schema.TypeList,
449-
Description: "List of cves whitelisted licenses",
453+
Description: "List of CVEs whitelisted licenses",
450454
Computed: true,
451455
Elem: &schema.Schema{
452456
Type: schema.TypeString,

0 commit comments

Comments
 (0)