Revert "Run make docker-compose/docs"

This reverts commit bd3166e.
cyralinc · Nov 26, 2024 · 0eac919 · 0eac919
1 parent bd3166e
commit 0eac919
Show file tree

Hide file tree

Showing 73 changed files with 27 additions and 98 deletions.
diff --git a/cyral/internal/repository/confanalysis/resource.go b/cyral/internal/repository/confanalysis/resource.go
@@ -125,11 +125,11 @@ func repositoryConfAnalysisResourceSchemaV0() *schema.Resource {
 				Description: "If set to `true` it will also mask filtering conditions like in" +
 					" `WHERE`, `HAVING` or `ON` clauses. **Note**: Enabling this may cause some" +
 					" performance degradation on large tables. It is required to set" +
-					" `enable_data_masking=true` to use this feature.",
-				Type:         schema.TypeBool,
-				Optional:     true,
-				Default:      false,
-				RequiredWith: []string{"enable_data_masking"},
+					" `enable_data_masking=true` to use this feature."
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+				RequiredWith: []string{"enable_data_masking"}
 			},
 			"block_on_violation": {
 				Description: "If set to `true` it will enable query blocking in case of a " +

diff --git a/docs/data-sources/access_token_settings.md b/docs/data-sources/access_token_settings.md
diff --git a/docs/data-sources/datalabel.md b/docs/data-sources/datalabel.md
diff --git a/docs/data-sources/integration_idp.md b/docs/data-sources/integration_idp.md
diff --git a/docs/data-sources/integration_idp_saml.md b/docs/data-sources/integration_idp_saml.md
diff --git a/docs/data-sources/integration_logging.md b/docs/data-sources/integration_logging.md
diff --git a/docs/data-sources/permission.md b/docs/data-sources/permission.md
diff --git a/docs/data-sources/policy_v2.md b/docs/data-sources/policy_v2.md
diff --git a/docs/data-sources/repository.md b/docs/data-sources/repository.md
diff --git a/docs/data-sources/role.md b/docs/data-sources/role.md
diff --git a/docs/data-sources/saml_certificate.md b/docs/data-sources/saml_certificate.md
diff --git a/docs/data-sources/saml_configuration.md b/docs/data-sources/saml_configuration.md
diff --git a/docs/data-sources/sidecar_bound_ports.md b/docs/data-sources/sidecar_bound_ports.md
diff --git a/docs/data-sources/sidecar_cft_template.md b/docs/data-sources/sidecar_cft_template.md
diff --git a/docs/data-sources/sidecar_health.md b/docs/data-sources/sidecar_health.md
diff --git a/docs/data-sources/sidecar_id.md b/docs/data-sources/sidecar_id.md
diff --git a/docs/data-sources/sidecar_instance.md b/docs/data-sources/sidecar_instance.md
diff --git a/docs/data-sources/sidecar_instance_ids.md b/docs/data-sources/sidecar_instance_ids.md
diff --git a/docs/data-sources/sidecar_instance_stats.md b/docs/data-sources/sidecar_instance_stats.md
diff --git a/docs/data-sources/sidecar_listener.md b/docs/data-sources/sidecar_listener.md
diff --git a/docs/data-sources/system_info.md b/docs/data-sources/system_info.md
diff --git a/docs/guides/4.0-migration-guide.md b/docs/guides/4.0-migration-guide.md
diff --git a/docs/guides/iam_auth_rds_pg.md b/docs/guides/iam_auth_rds_pg.md
@@ -246,7 +246,7 @@ module "cyral_sidecar" {
   source = "cyralinc/sidecar-ec2/aws"
 
   # Use the module version that is compatible with your sidecar.
-  version = "~> 4.3"
+  version = "~> 5.0"
 
   sidecar_id = cyral_sidecar.sidecar.id
   control_plane = local.control_plane_host
@@ -265,11 +265,11 @@ module "cyral_sidecar" {
   load_balancer_scheme        = local.sidecar.public_sidecar ? "internet-facing" : "internal"
   associate_public_ip_address = local.sidecar.public_sidecar
 
-  sidecar_dns_hosted_zone_id = local.sidecar.dns_hosted_zone_id
-  sidecar_dns_name           = local.sidecar.dns_name
+  dns_hosted_zone_id = local.sidecar.dns_hosted_zone_id
+  dns_name           = local.sidecar.dns_name
 }
 
 output "sidecar_load_balancer_dns" {
-  value = module.cyral_sidecar.sidecar_load_balancer_dns
+  value = module.cyral_sidecar.load_balancer_dns
 }
 ```
diff --git a/docs/guides/mongodb_cluster_okta_idp.md b/docs/guides/mongodb_cluster_okta_idp.md
@@ -98,17 +98,6 @@ locals {
     # Name of the CloudWatch log group used to push logs
     cloudwatch_log_group_name = "cyral-example-loggroup"
 
-    # Set the parameters to access the private Cyral container
-    # registry. These parameters can be found in the sidecar
-    # Terraform template downloaded from the UI. Use the
-    # commented values to locate the variables and copy the
-    # values from the downloaded template.
-    container_registry = {
-      name         = "" # container_registry
-      username     = "" # container_registry_username
-      registry_key = "" # container_registry_key
-    }
-
     # Specify the maximum number of nodes you expect this cluster to
     # have, taking into consideration future growth. This number must be
     # at least equal to the number of nodes currently in your
@@ -254,7 +243,7 @@ module "cyral_sidecar" {
   source = "cyralinc/sidecar-ec2/aws"
 
   # Use the module version that is compatible with your sidecar.
-  version = "~> 4.0"
+  version = "~> 5.0"
 
   sidecar_version = local.sidecar.sidecar_version
 
@@ -280,22 +269,16 @@ module "cyral_sidecar" {
   load_balancer_scheme        = local.sidecar.public_sidecar ? "internet-facing" : "internal"
   associate_public_ip_address = local.sidecar.public_sidecar
 
-  deploy_secrets   = true
-  secrets_location = "/cyral/sidecars/${cyral_sidecar.sidecar.id}/secrets"
-
-  container_registry          = local.sidecar.container_registry.name
-  container_registry_username = local.sidecar.container_registry.username
-  container_registry_key      = local.sidecar.container_registry.registry_key
   client_id                   = cyral_sidecar_credentials.sidecar_credentials.client_id
   client_secret               = cyral_sidecar_credentials.sidecar_credentials.client_secret
 }
 
 output "sidecar_dns" {
-  value = module.cyral_sidecar.sidecar_dns
+  value = module.cyral_sidecar.dns
 }
 
 output "sidecar_load_balancer_dns" {
-  value = module.cyral_sidecar.sidecar_load_balancer_dns
+  value = module.cyral_sidecar.load_balancer_dns
 }
 ```
 

diff --git a/docs/guides/native_credentials_aws_sm.md b/docs/guides/native_credentials_aws_sm.md
diff --git a/docs/guides/pg_mysql_sidecar_policy.md b/docs/guides/pg_mysql_sidecar_policy.md
diff --git a/docs/guides/repo_level_policy.md b/docs/guides/repo_level_policy.md
diff --git a/docs/guides/s3_browser_and_aws_cli.md b/docs/guides/s3_browser_and_aws_cli.md
@@ -252,7 +252,7 @@ module "cyral_sidecar" {
   source = "cyralinc/sidecar-ec2/aws"
 
   # Use the module version that is compatible with your sidecar.
-  version = "~> 4.3"
+  version = "~> 5.0"
 
   sidecar_id = cyral_sidecar.sidecar.id
   control_plane = local.control_plane_host
@@ -271,17 +271,16 @@ module "cyral_sidecar" {
   load_balancer_scheme        = local.sidecar.public_sidecar ? "internet-facing" : "internal"
   associate_public_ip_address = local.sidecar.public_sidecar
 
-
   load_balancer_certificate_arn = local.sidecar.load_balancer_certificate_arn
   load_balancer_tls_ports       = [
     local.repos.s3.browser_port
   ]
 
-  sidecar_dns_hosted_zone_id = local.sidecar.dns_hosted_zone_id
-  sidecar_dns_name           = local.sidecar.dns_name
+  dns_hosted_zone_id = local.sidecar.dns_hosted_zone_id
+  dns_name           = local.sidecar.dns_name
 }
 
 output "sidecar_load_balancer_dns" {
-  value = module.cyral_sidecar.sidecar_load_balancer_dns
+  value = module.cyral_sidecar.load_balancer_dns
 }
 ```
diff --git a/docs/guides/setup_cp_and_deploy_sidecar.md b/docs/guides/setup_cp_and_deploy_sidecar.md
@@ -70,17 +70,6 @@ locals {
     # Set the allowed CIDR block for monitoring requests to the
     # sidecar
     monitoring_inbound_cidr = ["0.0.0.0/0"]
-
-    # Set the parameters to access the private Cyral container
-    # registry. These parameters can be found in the sidecar
-    # Terraform template downloaded from the UI. Use the
-    # commented values to locate the variables and copy the
-    # values from the downloaded template.
-    container_registry = {
-      name         = "" # container_registry
-      username     = "" # container_registry_username
-      registry_key = "" # container_registry_key
-    }
   }
 }
 
@@ -159,7 +148,7 @@ module "cyral_sidecar" {
   source = "cyralinc/sidecar-ec2/aws"
 
   # Use the module version that is compatible with your sidecar.
-  version = "~> 4.0"
+  version = "~> 5.0"
 
   sidecar_version = local.sidecar.sidecar_version
 
@@ -181,23 +170,16 @@ module "cyral_sidecar" {
   load_balancer_scheme        = local.sidecar.public_sidecar ? "internet-facing" : "internal"
   associate_public_ip_address = local.sidecar.public_sidecar
 
-  deploy_secrets   = true
-  secrets_location = "/cyral/sidecars/${cyral_sidecar.sidecar.id}/secrets"
-
-  container_registry          = local.sidecar.container_registry.name
-  container_registry_username = local.sidecar.container_registry.username
-  container_registry_key      = local.sidecar.container_registry.registry_key
-
   client_id     = cyral_sidecar_credentials.sidecar_credentials.client_id
   client_secret = cyral_sidecar_credentials.sidecar_credentials.client_secret
 }
 
 output "sidecar_dns" {
-  value = module.cyral_sidecar.sidecar_dns
+  value = module.cyral_sidecar.dns
 }
 
 output "sidecar_load_balancer_dns" {
-  value = module.cyral_sidecar.sidecar_load_balancer_dns
+  value = module.cyral_sidecar.load_balancer_dns
 }
 ```
 

diff --git a/docs/guides/smart_ports.md b/docs/guides/smart_ports.md
@@ -93,17 +93,6 @@ locals {
     # Set the allowed CIDR block for monitoring requests to the
     # sidecar
     monitoring_inbound_cidr = ["0.0.0.0/0"]
-
-    # Set the parameters to access the private Cyral container
-    # registry. These parameters can be found in the sidecar
-    # Terraform template downloaded from the UI. Use the
-    # commented values to locate the variables and copy the
-    # values from the downloaded template.
-    container_registry = {
-      name         = "" # container_registry
-      username     = "" # container_registry_username
-      registry_key = "" # container_registry_key
-    }
   }
 }
 
@@ -316,7 +305,7 @@ module "cyral_sidecar" {
   source = "cyralinc/sidecar-ec2/aws"
 
   # Use the module version that is compatible with your sidecar.
-  version = "~> 4.0"
+  version = "~> 5.0"
 
   sidecar_version = local.sidecar.sidecar_version
 
@@ -336,19 +325,12 @@ module "cyral_sidecar" {
   load_balancer_scheme        = local.sidecar.public_sidecar ? "internet-facing" : "internal"
   associate_public_ip_address = local.sidecar.public_sidecar
 
-  deploy_secrets   = true
-  secrets_location = "/cyral/sidecars/${cyral_sidecar.sidecar.id}/secrets"
-
-  container_registry          = local.sidecar.container_registry.name
-  container_registry_username = local.sidecar.container_registry.username
-  container_registry_key      = local.sidecar.container_registry.registry_key
-
   client_id     = cyral_sidecar_credentials.sidecar_credentials.client_id
   client_secret = cyral_sidecar_credentials.sidecar_credentials.client_secret
 }
 
 output "sidecar_load_balancer_dns" {
-  value = module.cyral_sidecar.sidecar_load_balancer_dns
+  value = module.cyral_sidecar.load_balancer_dns
 }
 ```
 
@@ -429,17 +411,6 @@ locals {
     # Set the allowed CIDR block for monitoring requests to the
     # sidecar
     monitoring_inbound_cidr = ["0.0.0.0/0"]
-
-    # Set the parameters to access the private Cyral container
-    # registry. These parameters can be found in the sidecar
-    # Terraform template downloaded from the UI. Use the
-    # commented values to locate the variables and copy the
-    # values from the downloaded template.
-    container_registry = {
-      name         = "" # container_registry
-      username     = "" # container_registry_username
-      registry_key = "" # container_registry_key
-    }
   }
 }
 
@@ -588,7 +559,7 @@ module "cyral_sidecar" {
   source = "cyralinc/sidecar-ec2/aws"
 
   # Use the module version that is compatible with your sidecar.
-  version = "~> 4.0"
+  version = "~> 5.0"
 
   sidecar_version = local.sidecar.sidecar_version
 
@@ -608,18 +579,11 @@ module "cyral_sidecar" {
   load_balancer_scheme        = local.sidecar.public_sidecar ? "internet-facing" : "internal"
   associate_public_ip_address = local.sidecar.public_sidecar
 
-  deploy_secrets   = true
-  secrets_location = "/cyral/sidecars/${cyral_sidecar.sidecar.id}/secrets"
-
-  container_registry          = local.sidecar.container_registry.name
-  container_registry_username = local.sidecar.container_registry.username
-  container_registry_key      = local.sidecar.container_registry.registry_key
-
   client_id     = cyral_sidecar_credentials.sidecar_credentials.client_id
   client_secret = cyral_sidecar_credentials.sidecar_credentials.client_secret
 }
 
 output "sidecar_load_balancer_dns" {
-  value = module.cyral_sidecar.sidecar_load_balancer_dns
+  value = module.cyral_sidecar.load_balancer_dns
 }
 ```
diff --git a/docs/index.md b/docs/index.md
@@ -37,7 +37,7 @@ terraform {
   required_providers {
     cyral = {
       source = "cyralinc/cyral"
-      version = "~> 4.1"
+      version = "~> 4.0"
     }
   }
 }

diff --git a/docs/resources/access_token_settings.md b/docs/resources/access_token_settings.md
diff --git a/docs/resources/datalabel.md b/docs/resources/datalabel.md
diff --git a/docs/resources/integration_aws_iam.md b/docs/resources/integration_aws_iam.md
diff --git a/docs/resources/integration_datadog.md b/docs/resources/integration_datadog.md
diff --git a/docs/resources/integration_elk.md b/docs/resources/integration_elk.md
diff --git a/docs/resources/integration_hc_vault.md b/docs/resources/integration_hc_vault.md
diff --git a/docs/resources/integration_idp_aad.md b/docs/resources/integration_idp_aad.md
diff --git a/docs/resources/integration_idp_adfs.md b/docs/resources/integration_idp_adfs.md
diff --git a/docs/resources/integration_idp_forgerock.md b/docs/resources/integration_idp_forgerock.md
diff --git a/docs/resources/integration_idp_gsuite.md b/docs/resources/integration_idp_gsuite.md
diff --git a/docs/resources/integration_idp_okta.md b/docs/resources/integration_idp_okta.md
diff --git a/docs/resources/integration_idp_ping_one.md b/docs/resources/integration_idp_ping_one.md
diff --git a/docs/resources/integration_idp_saml.md b/docs/resources/integration_idp_saml.md
diff --git a/docs/resources/integration_idp_saml_draft.md b/docs/resources/integration_idp_saml_draft.md
diff --git a/docs/resources/integration_logging.md b/docs/resources/integration_logging.md
@@ -37,7 +37,7 @@ resource "cyral_sidecar_credentials" "creds" {
 
 module "cyral_sidecar" {
   source  = "cyralinc/sidecar-ec2/aws"
-  version = "~> 4.0"
+  version = "~> 5.0"
 
   sidecar_id = cyral_sidecar.sidecar.id
 

diff --git a/docs/resources/integration_logstash.md b/docs/resources/integration_logstash.md
diff --git a/docs/resources/integration_looker.md b/docs/resources/integration_looker.md
diff --git a/docs/resources/integration_mfa_duo.md b/docs/resources/integration_mfa_duo.md
diff --git a/docs/resources/integration_microsoft_teams.md b/docs/resources/integration_microsoft_teams.md
diff --git a/docs/resources/integration_pager_duty.md b/docs/resources/integration_pager_duty.md
diff --git a/docs/resources/integration_slack_alerts.md b/docs/resources/integration_slack_alerts.md
diff --git a/docs/resources/integration_splunk.md b/docs/resources/integration_splunk.md
diff --git a/docs/resources/integration_sumo_logic.md b/docs/resources/integration_sumo_logic.md
diff --git a/docs/resources/policy.md b/docs/resources/policy.md
diff --git a/docs/resources/policy_rule.md b/docs/resources/policy_rule.md
diff --git a/docs/resources/policy_v2.md b/docs/resources/policy_v2.md
diff --git a/docs/resources/rego_policy_instance.md b/docs/resources/rego_policy_instance.md
diff --git a/docs/resources/repository.md b/docs/resources/repository.md
diff --git a/docs/resources/repository_access_gateway.md b/docs/resources/repository_access_gateway.md
diff --git a/docs/resources/repository_access_rules.md b/docs/resources/repository_access_rules.md
diff --git a/docs/resources/repository_binding.md b/docs/resources/repository_binding.md
diff --git a/docs/resources/repository_conf_analysis.md b/docs/resources/repository_conf_analysis.md
@@ -23,6 +23,7 @@ resource "cyral_repository_conf_analysis" "all_conf_analysis_enabled" {
   disable_filter_analysis = false
   enable_dataset_rewrites = true
   enable_data_masking = true
+  mask_all_occurrences = true
   comment_annotation_groups = [ "identity" ]
   log_groups = [ "everything" ]
 }
@@ -37,6 +38,7 @@ resource "cyral_repository_conf_analysis" "all_conf_analysis_disabled" {
   disable_filter_analysis = true
   enable_dataset_rewrites = false
   enable_data_masking = false
+  mask_all_occurrences = false
   comment_annotation_groups = []
   log_groups = []
 }
@@ -79,7 +81,6 @@ resource "cyral_repository_conf_analysis" "all_conf_analysis_disabled" {
     -   `error` - Log analysis errors.
     -   `new-connections` - Log new connections.
     -   `closed-connections` - Log closed connections.
--   `mask_all_occurrences` (Boolean) If set to `true` it will also mask filtering conditions like in `WHERE`, `HAVING` or `ON` clauses. **Note**: Enabling this may cause some performance degradation on large tables. It is required to set `enable_data_masking=true` to use this feature.
 -   `redact` (String) Valid values are: `all`, `none` and `watched`. If set to `all` it will enable the redact of all literal values, `none` will disable it, and `watched` will only redact values from tracked fields set in the Datamap.
 
 ### Read-Only

diff --git a/docs/resources/repository_conf_auth.md b/docs/resources/repository_conf_auth.md
diff --git a/docs/resources/repository_datamap.md b/docs/resources/repository_datamap.md
diff --git a/docs/resources/repository_network_access_policy.md b/docs/resources/repository_network_access_policy.md
diff --git a/docs/resources/repository_user_account.md b/docs/resources/repository_user_account.md
diff --git a/docs/resources/role.md b/docs/resources/role.md
diff --git a/docs/resources/role_sso_groups.md b/docs/resources/role_sso_groups.md
diff --git a/docs/resources/service_account.md b/docs/resources/service_account.md
diff --git a/docs/resources/sidecar.md b/docs/resources/sidecar.md
diff --git a/docs/resources/sidecar_credentials.md b/docs/resources/sidecar_credentials.md
diff --git a/docs/resources/sidecar_listener.md b/docs/resources/sidecar_listener.md