Merge remote-tracking branch 'origin/main' into SLK-73211-terraform-p…

…rovider-bug-terraform-for-role-mapping-doesnt-accept-commas # Conflicts: # docs/resources/role_mapping.md
aquasecurity · Dec 18, 2023 · 06c718a · 06c718a
2 parents d1047cf + de939b8
commit 06c718a
Show file tree

Hide file tree

Showing 50 changed files with 8 additions and 112 deletions.
diff --git a/aquasec/resource_registry.go b/aquasec/resource_registry.go
@@ -50,7 +50,7 @@ func resourceRegistry() *schema.Resource {
 			},
 			"type": {
 				Type:        schema.TypeString,
-				Description: "Registry type (HUB / V1 / V2 / ENGINE / AWS / GCR).",
+				Description: "Registry type (HUB / V1 / V2 / ACR / ENGINE / AWS / GCR).",
 				Required:    true,
 			},
 			"username": {

diff --git a/docs/data-sources/acknowledges.md b/docs/data-sources/acknowledges.md
@@ -55,5 +55,3 @@ Read-Only:
 - `resource_path` (String)
 - `resource_type` (String)
 - `resource_version` (String)
-
-
diff --git a/docs/data-sources/application_scope.md b/docs/data-sources/application_scope.md
@@ -237,5 +237,3 @@ Optional:
 
 - `attribute` (String)
 - `value` (String)
-
-
diff --git a/docs/data-sources/aqua_labels.md b/docs/data-sources/aqua_labels.md
@@ -38,5 +38,3 @@ Read-Only:
 - `created` (String)
 - `description` (String)
 - `name` (String)
-
-
diff --git a/docs/data-sources/container_runtime_policy.md b/docs/data-sources/container_runtime_policy.md
@@ -122,5 +122,3 @@ Read-Only:
 - `attribute` (String)
 - `name` (String)
 - `value` (String)
-
-
diff --git a/docs/data-sources/enforcer_groups.md b/docs/data-sources/enforcer_groups.md
@@ -120,5 +120,3 @@ Read-Only:
 - `namespace` (String)
 - `service_account` (String)
 - `type` (String)
-
-
diff --git a/docs/data-sources/firewall_policy.md b/docs/data-sources/firewall_policy.md
@@ -52,5 +52,3 @@ Read-Only:
 - `port_range` (String) Range of ports affected by firewall.
 - `resource` (String) Information of the resource.
 - `resource_type` (String) Type of the resource.
-
-
diff --git a/docs/data-sources/function_assurance_policy.md b/docs/data-sources/function_assurance_policy.md
@@ -199,5 +199,3 @@ Read-Only:
 
 - `imagename` (String)
 - `registry` (String)
-
-
diff --git a/docs/data-sources/function_runtime_policy.md b/docs/data-sources/function_runtime_policy.md
@@ -56,5 +56,3 @@ Read-Only:
 - `attribute` (String)
 - `name` (String)
 - `value` (String)
-
-
diff --git a/docs/data-sources/gateways.md b/docs/data-sources/gateways.md
@@ -62,5 +62,3 @@ Read-Only:
 - `public_address` (String)
 - `status` (String)
 - `version` (String)
-
-
diff --git a/docs/data-sources/groups.md b/docs/data-sources/groups.md
@@ -36,5 +36,3 @@ Read-Only:
 - `created` (String)
 - `group_id` (String)
 - `name` (String)
-
-
diff --git a/docs/data-sources/host_assurance_policy.md b/docs/data-sources/host_assurance_policy.md
@@ -199,5 +199,3 @@ Read-Only:
 
 - `imagename` (String)
 - `registry` (String)
-
-
diff --git a/docs/data-sources/host_runtime_policy.md b/docs/data-sources/host_runtime_policy.md
@@ -131,5 +131,3 @@ Read-Only:
 - `protected_paths` (List of String)
 - `protected_processes` (List of String)
 - `protected_users` (List of String)
-
-
diff --git a/docs/data-sources/image.md b/docs/data-sources/image.md
@@ -169,5 +169,3 @@ Read-Only:
 - `vendor_severity` (String)
 - `vendor_statement` (String)
 - `vendor_url` (String)
-
-
diff --git a/docs/data-sources/image_assurance_policy.md b/docs/data-sources/image_assurance_policy.md
@@ -199,5 +199,3 @@ Read-Only:
 
 - `imagename` (String)
 - `registry` (String)
-
-
diff --git a/docs/data-sources/integration_registries.md b/docs/data-sources/integration_registries.md
@@ -69,5 +69,3 @@ Optional:
 - `enabled` (Boolean)
 - `un_quarantine` (Boolean)
 - `url` (String)
-
-
diff --git a/docs/data-sources/integration_state.md b/docs/data-sources/integration_state.md
@@ -29,5 +29,3 @@ output "aquasec_integration_state" {
 - `oidc_settings` (Boolean) OIDCSettings enabled status
 - `openid_settings` (Boolean) OpenIdSettings enabled status
 - `saml_settings` (Boolean) SAMLSettings enabled status
-
-
diff --git a/docs/data-sources/kubernetes_assurance_policy.md b/docs/data-sources/kubernetes_assurance_policy.md
@@ -200,5 +200,3 @@ Read-Only:
 
 - `imagename` (String)
 - `registry` (String)
-
-
diff --git a/docs/data-sources/notifications.md b/docs/data-sources/notifications.md
@@ -122,5 +122,3 @@ Read-Only:
 - `properties` (Map of String)
 - `template` (Map of String)
 - `type` (String)
-
-
diff --git a/docs/data-sources/permissions_sets.md b/docs/data-sources/permissions_sets.md
@@ -44,5 +44,3 @@ Read-Only:
 - `name` (String)
 - `ui_access` (Boolean)
 - `updated_at` (String)
-
-
diff --git a/docs/data-sources/roles.md b/docs/data-sources/roles.md
@@ -39,5 +39,3 @@ Read-Only:
 - `permission` (String)
 - `scopes` (List of String)
 - `updated_at` (String)
-
-
diff --git a/docs/data-sources/roles_mapping.md b/docs/data-sources/roles_mapping.md
@@ -65,5 +65,3 @@ Read-Only:
 Read-Only:
 
 - `role_mapping` (Map of String)
-
-
diff --git a/docs/data-sources/roles_mapping_saas.md b/docs/data-sources/roles_mapping_saas.md
@@ -38,5 +38,3 @@ Read-Only:
 - `csp_role` (String)
 - `id` (Number)
 - `saml_groups` (List of String)
-
-
diff --git a/docs/data-sources/service.md b/docs/data-sources/service.md
@@ -55,5 +55,3 @@ Read-Only:
 - `attribute` (String)
 - `name` (String)
 - `value` (String)
-
-
diff --git a/docs/data-sources/users.md b/docs/data-sources/users.md
@@ -43,5 +43,3 @@ Read-Only:
 - `type` (String)
 - `ui_access` (Boolean)
 - `user_id` (String)
-
-
diff --git a/docs/data-sources/users_saas.md b/docs/data-sources/users_saas.md
@@ -69,5 +69,3 @@ Read-Only:
 - `id` (Number)
 - `ip_address` (String)
 - `user_id` (Number)
-
-
diff --git a/docs/resources/acknowledge.md b/docs/resources/acknowledge.md
@@ -87,5 +87,3 @@ Read-Only:
 - `expiration_configured_at` (String) The current dat and time when the expiration was set
 - `expiration_configured_by` (String) The user who set the expiration of the issue.
 - `permission` (String) The permissions of the user who acknowledged the issue.
-
-
diff --git a/docs/resources/application_scope.md b/docs/resources/application_scope.md
@@ -282,5 +282,3 @@ Read-Only:
 
 - `attribute` (String)
 - `value` (String)
-
-
diff --git a/docs/resources/aqua_label.md b/docs/resources/aqua_label.md
@@ -28,5 +28,3 @@ description: |-
 - `author` (String) The name of the user who created the Aqua label.
 - `created` (String) The creation date of the Aqua label.
 - `id` (String) The ID of this resource.
-
-
diff --git a/docs/resources/container_runtime_policy.md b/docs/resources/container_runtime_policy.md
@@ -242,5 +242,3 @@ Required:
 Optional:
 
 - `name` (String) Name assigned to the attribute.
-
-
diff --git a/docs/resources/enforcer_groups.md b/docs/resources/enforcer_groups.md
@@ -173,5 +173,3 @@ Read-Only:
 - `kubernetes` (String)
 - `swarm` (String)
 - `windows` (String)
-
-
diff --git a/docs/resources/firewall_policy.md b/docs/resources/firewall_policy.md
@@ -61,5 +61,3 @@ Required:
 Optional:
 
 - `resource` (String) Information of the resource.
-
-
diff --git a/docs/resources/function_assurance_policy.md b/docs/resources/function_assurance_policy.md
@@ -202,5 +202,3 @@ Optional:
 
 - `imagename` (String)
 - `registry` (String)
-
-
diff --git a/docs/resources/function_runtime_policy.md b/docs/resources/function_runtime_policy.md
@@ -84,5 +84,3 @@ Required:
 Optional:
 
 - `name` (String) Name assigned to the attribute.
-
-
diff --git a/docs/resources/group.md b/docs/resources/group.md
@@ -33,5 +33,3 @@ resource "aquasec_group" "group" {
 - `created` (String) The creation date of the group.
 - `group_id` (Number) The ID of the created group.
 - `id` (String) The ID of this resource.
-
-
diff --git a/docs/resources/host_assurance_policy.md b/docs/resources/host_assurance_policy.md
@@ -202,5 +202,3 @@ Optional:
 
 - `imagename` (String)
 - `registry` (String)
-
-
diff --git a/docs/resources/host_runtime_policy.md b/docs/resources/host_runtime_policy.md
@@ -213,5 +213,3 @@ Optional:
 - `protected_paths` (List of String) List of registry paths to be protected.
 - `protected_processes` (List of String) List of registry processes to be protected.
 - `protected_users` (List of String) List of registry users to be protected.
-
-
diff --git a/docs/resources/image.md b/docs/resources/image.md
@@ -175,5 +175,3 @@ Read-Only:
 - `vendor_severity` (String)
 - `vendor_statement` (String)
 - `vendor_url` (String)
-
-
diff --git a/docs/resources/image_assurance_policy.md b/docs/resources/image_assurance_policy.md
@@ -202,5 +202,3 @@ Optional:
 
 - `imagename` (String)
 - `registry` (String)
-
-
diff --git a/docs/resources/integration_registry.md b/docs/resources/integration_registry.md
@@ -50,16 +50,12 @@ resource "aquasec_integration_registry" "integration_registry" {
   pull_image_tag_pattern      = [":Latest", ":latest"]
   pull_repo_patterns_excluded = [":xyz", ":onlytest"]
 
-  scanner_name = [
-    "aqua-scanner-645f867c4f-4sbtj",
-    "aqua-scanner-645f867c4f-8pkdd"
-  ]
-
-  scanner_type = "specific"
-
   url = "us-east-1"
+  scanner_name = []
+  scanner_type = "any"
 
   username = ""
+  password = ""
   webhook {
     enabled       = true
     url           = "https://aquasec.com/"
@@ -75,7 +71,7 @@ resource "aquasec_integration_registry" "integration_registry" {
 ### Required
 
 - `name` (String) The name of the registry; string, required - this will be treated as the registry's ID, so choose a simple alphanumerical name without special signs and spaces
-- `type` (String) Registry type (HUB / V1 / V2 / ENGINE / AWS / GCR).
+- `type` (String) Registry type (HUB / V1 / V2 / ACR / ENGINE / AWS / GCR).
 
 ### Optional
 
@@ -127,5 +123,3 @@ Optional:
 - `enabled` (Boolean)
 - `un_quarantine` (Boolean)
 - `url` (String)
-
-
diff --git a/docs/resources/kubernetes_assurance_policy.md b/docs/resources/kubernetes_assurance_policy.md
@@ -202,5 +202,3 @@ Optional:
 
 - `imagename` (String)
 - `registry` (String)
-
-
diff --git a/docs/resources/notification.md b/docs/resources/notification.md
@@ -116,5 +116,3 @@ resource "aquasec_notification" "email_with_mx" {
 - `id` (String) Notification Id
 - `last_updated` (String) Notification last update time
 - `template` (Map of String) Notification Template
-
-
diff --git a/docs/resources/permissions_sets.md b/docs/resources/permissions_sets.md
@@ -131,5 +131,3 @@ resource "aquasec_permissions_sets" "my_terraform_perm_set" {
 - `author` (String) The name of the user who created the Permission Set.
 - `id` (String) The ID of this resource.
 - `updated_at` (String) The date of the last modification of the Role.
-
-
diff --git a/docs/resources/role.md b/docs/resources/role.md
@@ -42,5 +42,3 @@ resource "aquasec_role" "IaC" {
 - `author` (String) The name of the user who created the role. Only returned from the API for existing permissions, not part of the permission creation/modification structure.
 - `id` (String) The ID of this resource.
 - `updated_at` (String) The date of the last modification of the role.
-
-
diff --git a/docs/resources/role_mapping.md b/docs/resources/role_mapping.md
@@ -71,5 +71,3 @@ Required:
 Required:
 
 - `role_mapping` (Map of String) Role Mapping is used to define the IdP role that the user will assume in Aqua. Use '|' as a separator for multiple roles.
-
-
diff --git a/docs/resources/role_mapping_saas.md b/docs/resources/role_mapping_saas.md
@@ -37,5 +37,3 @@ output "roles_mapping_saas" {
 - `created` (String)
 - `id` (String) The ID of this resource.
 - `role_mapping_id` (Number)
-
-
diff --git a/docs/resources/service.md b/docs/resources/service.md
@@ -58,5 +58,3 @@ Optional:
 - `attribute` (String) Class of supported scope.
 - `name` (String) Name assigned to the attribute.
 - `value` (String) Value assigned to the attribute.
-
-
diff --git a/docs/resources/user.md b/docs/resources/user.md
@@ -54,5 +54,3 @@ resource "aquasec_user" "IaC" {
 - `role` (String) The first role that assigned to the user for backward compatibility.
 - `type` (String) The user type (Aqua, LDAP, SAML, OAuth2, OpenID, Tenant Manager).
 - `ui_access` (Boolean) Whether to allow UI access for users with this Permission Set.
-
-
diff --git a/docs/resources/user_saas.md b/docs/resources/user_saas.md
@@ -81,5 +81,3 @@ Read-Only:
 - `id` (Number)
 - `ip_address` (String)
 - `user_id` (Number)
-
-
diff --git a/examples/resources/aquasec_integration_registry/resource.tf b/examples/resources/aquasec_integration_registry/resource.tf
@@ -35,16 +35,12 @@ resource "aquasec_integration_registry" "integration_registry" {
   pull_image_tag_pattern      = [":Latest", ":latest"]
   pull_repo_patterns_excluded = [":xyz", ":onlytest"]
 
-  scanner_name = [
-    "aqua-scanner-645f867c4f-4sbtj",
-    "aqua-scanner-645f867c4f-8pkdd"
-  ]
-
-  scanner_type = "specific"
-
   url = "us-east-1"
+  scanner_name = []
+  scanner_type = "any"
 
   username = ""
+  password = ""
   webhook {
     enabled       = true
     url           = "https://aquasec.com/"