Skip to content

Commit

Permalink
Merge pull request #44 from sparkfabrik/3259_remove_bucket_soft_delete
Browse files Browse the repository at this point in the history 
3259 remove bucket soft delete
  • Loading branch information
@Stevesibilia
Stevesibilia authored Nov 27, 2024
2 parents e03e476 + 5270c22 commit 373f402
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [0.17.1] - 2024-11-27

[Compare with previous version](https://github.com/sparkfabrik/terraform-google-gcp-cloud-native-drupal-resources/compare/0.17.0...0.17.1)

- Update default `bucket_soft_delete_retention_seconds` value (from 604800 seconds to 0 ) to disable soft retention

## [0.17.0] - 2024-11-26

[Compare with previous version](https://github.com/sparkfabrik/terraform-google-gcp-cloud-native-drupal-resources/compare/0.16.0...0.17.0)
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ the random suffix `bucket_append_random_suffix` for the bucket name.
| <a name="input_create_clousql_dumps_bucket"></a> [create\_clousql\_dumps\_bucket](#input\_create\_clousql\_dumps\_bucket) | If true, the module will create a Google Storage bucket that can be used as a destination for CloudSQL dumps. The bucket will also be tagged with the global tags. | `bool` | `false` | no |
| <a name="input_create_databases_and_users"></a> [create\_databases\_and\_users](#input\_create\_databases\_and\_users) | If true, the module will create a user and a database for each project. | `bool` | `true` | no |
| <a name="input_default_k8s_labels"></a> [default\_k8s\_labels](#input\_default\_k8s\_labels) | A map of labels to be applied to all the kubernetes resources created by this module. If a resource specify a map of labels, the default labels will merged with those specified in the resource. | `map(string)` | <pre>{<br/> "managed-by": "terraform"<br/>}</pre> | no |
| <a name="input_drupal_projects_list"></a> [drupal\_projects\_list](#input\_drupal\_projects\_list) | The list of Drupal projects, add a project name and this will create all infrastructure resources needed to run your project (bucket, database, user with relative credentials). Database resources are created in the CloudSQL instance you specified. Please not that you can assign only a database to a single user, the same user cannot be assigned to multiple databases. The default values are thought for a production environment, they will need to be adjusted accordingly for a stage environment. | <pre>list(object({<br/> project_name = string<br/> gitlab_project_id = number<br/> release_branch_name = optional(string, "main")<br/> kubernetes_namespace = optional(string, null)<br/> kubernetes_namespace_labels = optional(map(string), {})<br/> helm_release_name = optional(string, null)<br/> database_name = optional(string, null)<br/> database_user_name = optional(string, null)<br/> database_host = optional(string, null)<br/> database_port = optional(number, 3306)<br/> bucket_name = optional(string, null)<br/> bucket_host = optional(string, "storage.googleapis.com")<br/> bucket_append_random_suffix = optional(bool, true)<br/> bucket_location = optional(string, null)<br/> bucket_storage_class = optional(string, "STANDARD")<br/> bucket_enable_versioning = optional(bool, true)<br/> bucket_enable_disaster_recovery = optional(bool, true)<br/> bucket_force_destroy = optional(bool, false)<br/> bucket_legacy_public_files_path = optional(string, "/public")<br/> bucket_set_all_users_as_viewer = optional(bool, false)<br/> bucket_labels = optional(map(string), {})<br/> bucket_tag_list = optional(list(string), [])<br/> bucket_obj_adm = optional(list(string), [])<br/> bucket_obj_vwr = optional(list(string), [])<br/> bucket_soft_delete_retention_seconds = optional(number, 604800)<br/> }))</pre> | n/a | yes |
| <a name="input_drupal_projects_list"></a> [drupal\_projects\_list](#input\_drupal\_projects\_list) | The list of Drupal projects, add a project name and this will create all infrastructure resources needed to run your project (bucket, database, user with relative credentials). Database resources are created in the CloudSQL instance you specified. Please not that you can assign only a database to a single user, the same user cannot be assigned to multiple databases. The default values are thought for a production environment, they will need to be adjusted accordingly for a stage environment. | <pre>list(object({<br/> project_name = string<br/> gitlab_project_id = number<br/> release_branch_name = optional(string, "main")<br/> kubernetes_namespace = optional(string, null)<br/> kubernetes_namespace_labels = optional(map(string), {})<br/> helm_release_name = optional(string, null)<br/> database_name = optional(string, null)<br/> database_user_name = optional(string, null)<br/> database_host = optional(string, null)<br/> database_port = optional(number, 3306)<br/> bucket_name = optional(string, null)<br/> bucket_host = optional(string, "storage.googleapis.com")<br/> bucket_append_random_suffix = optional(bool, true)<br/> bucket_location = optional(string, null)<br/> bucket_storage_class = optional(string, "STANDARD")<br/> bucket_enable_versioning = optional(bool, true)<br/> bucket_enable_disaster_recovery = optional(bool, true)<br/> bucket_force_destroy = optional(bool, false)<br/> bucket_legacy_public_files_path = optional(string, "/public")<br/> bucket_set_all_users_as_viewer = optional(bool, false)<br/> bucket_labels = optional(map(string), {})<br/> bucket_tag_list = optional(list(string), [])<br/> bucket_obj_adm = optional(list(string), [])<br/> bucket_obj_vwr = optional(list(string), [])<br/> bucket_soft_delete_retention_seconds = optional(number, 0)<br/> }))</pre> | n/a | yes |
| <a name="input_global_tags"></a> [global\_tags](#input\_global\_tags) | A list of tags to be applied to all the drupal buckets, in the form <TAG\_KEY\_SHORTNAME>/<TAG\_VALUE\_SHORTNAME>. If a resource specify a list of tags, the global tags will be overridden and replaced by those specified in the resource. Please note that actually only the buckets are tagged by this module. | `list(string)` | `[]` | no |
| <a name="input_logging_bucket_name"></a> [logging\_bucket\_name](#input\_logging\_bucket\_name) | The name of the logging bucket. If empty, no logging bucket will be added and bucket logs will be disabled. | `string` | `""` | no |
| <a name="input_project_id"></a> [project\_id](#input\_project\_id) | The ID of the project in which the resource belongs. | `string` | n/a | yes |
Expand Down Expand Up @@ -164,6 +164,6 @@ the random suffix `bucket_append_random_suffix` for the bucket name.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_drupal_buckets"></a> [drupal\_buckets](#module\_drupal\_buckets) | github.com/sparkfabrik/terraform-google-gcp-application-bucket-creation-helper | 0.9.0 |
| <a name="module_drupal_buckets"></a> [drupal\_buckets](#module\_drupal\_buckets) | github.com/sparkfabrik/terraform-google-gcp-application-bucket-creation-helper | 0.10.0 |
| <a name="module_drupal_databases_and_users"></a> [drupal\_databases\_and\_users](#module\_drupal\_databases\_and\_users) | github.com/sparkfabrik/terraform-google-gcp-mysql-db-and-user-creation-helper | 0.3.2 |
<!-- END_TF_DOCS -->
12 changes: 6 additions & 6 deletions variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ variable "global_tags" {
}

variable "default_k8s_labels" {
description = "A map of labels to be applied to all the kubernetes resources created by this module. If a resource specify a map of labels, the default labels will merged with those specified in the resource."
type = map(string)
default = {
"managed-by" = "terraform"
}
description = "A map of labels to be applied to all the kubernetes resources created by this module. If a resource specify a map of labels, the default labels will merged with those specified in the resource."
type = map(string)
default = {
"managed-by" = "terraform"
}
}

variable "drupal_projects_list" {
Expand Down Expand Up @@ -73,7 +73,7 @@ variable "drupal_projects_list" {
bucket_tag_list = optional(list(string), [])
bucket_obj_adm = optional(list(string), [])
bucket_obj_vwr = optional(list(string), [])
bucket_soft_delete_retention_seconds = optional(number, 604800)
bucket_soft_delete_retention_seconds = optional(number, 0)
}))

validation {
Expand Down

0 comments on commit 373f402

Please sign in to comment.