From 4efe544e9be8e155b61da8bfa7dfbd00364401f7 Mon Sep 17 00:00:00 2001 From: Up Neck <163534172+up2neck@users.noreply.github.com> Date: Thu, 5 Sep 2024 08:37:13 +0300 Subject: [PATCH] Minimal google provider version chaged Signed-off-by: Up Neck <163534172+up2neck@users.noreply.github.com> --- README.md | 43 +++++++++++++++++++------------------- docs/upgrading_to_v10.0.md | 3 +++ versions.tf | 2 +- 3 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 docs/upgrading_to_v10.0.md diff --git a/README.md b/README.md index eb7b07d9..3e5f9427 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ Current version is 9.X. Upgrade guides: - [4.X -> 5.0](/docs/upgrading_to_v5.0.md) - [6.X -> 7.0](/docs/upgrading_to_v7.0.md) - [8.X -> 9.0](/docs/upgrading_to_v9.0.md) +- [9.X -> 10.0](/docs/upgrading_to_v10.0.md) ## Usage @@ -54,30 +55,30 @@ so that all dependencies are met. ## Inputs -| Name | Description | Type | Default | Required | -|------|-------------|------|---------|:--------:| -| bigquery\_options | (Optional) Options that affect sinks exporting data to BigQuery. use\_partitioned\_tables - (Required) Whether to use BigQuery's partition tables. |
object({
use_partitioned_tables = bool
})
| `null` | no | -| description | A description of this sink. The maximum length of the description is 8000 characters. | `string` | `null` | no | -| destination\_uri | The self\_link URI of the destination resource (This is available as an output coming from one of the destination submodules) | `string` | n/a | yes | -| disabled | (Optional) If set to true, then the sink is disabled and it does not export any log entries. | `bool` | `false` | no | -| exclusions | (Optional) A list of sink exclusion filters. |
list(object({
name = string,
description = string,
filter = string,
disabled = bool
}))
| `[]` | no | -| filter | The filter to apply when exporting logs. Only log entries that match the filter are exported. Default is '' which exports all logs. | `string` | `""` | no | -| include\_children | Only valid if 'organization' or 'folder' is chosen as var.parent\_resource.type. Determines whether or not to include children organizations/folders in the sink export. If true, logs associated with child projects are also exported; otherwise only logs relating to the provided organization/folder are included. | `bool` | `false` | no | -| intercept\_children | Only valid if 'organization' or 'folder' is chosen as var.parent\_resource.type. Whether or not to intercept logs from child projects. If true, matching logs will not match with sinks in child resources, except \_Required sinks. This sink will be visible to child resources when listing sinks. | `bool` | `false` | no | -| log\_sink\_name | The name of the log sink to be created. | `string` | n/a | yes | -| parent\_resource\_id | The ID of the GCP resource in which you create the log sink. If var.parent\_resource\_type is set to 'project', then this is the Project ID (and etc). | `string` | n/a | yes | -| parent\_resource\_type | The GCP resource in which you create the log sink. The value must not be computed, and must be one of the following: 'project', 'folder', 'billing\_account', or 'organization'. | `string` | `"project"` | no | -| unique\_writer\_identity | Whether or not to create a unique identity associated with this sink. If false (the default), then the writer\_identity used is serviceAccount:cloud-logs@system.gserviceaccount.com. If true, then a unique service account is created and used for the logging sink. | `bool` | `false` | no | +| Name | Description | Type | Default | Required | +| ------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- | :------: | +| bigquery\_options | (Optional) Options that affect sinks exporting data to BigQuery. use\_partitioned\_tables - (Required) Whether to use BigQuery's partition tables. |
object({
use_partitioned_tables = bool
})
| `null` | no | +| description | A description of this sink. The maximum length of the description is 8000 characters. | `string` | `null` | no | +| destination\_uri | The self\_link URI of the destination resource (This is available as an output coming from one of the destination submodules) | `string` | n/a | yes | +| disabled | (Optional) If set to true, then the sink is disabled and it does not export any log entries. | `bool` | `false` | no | +| exclusions | (Optional) A list of sink exclusion filters. |
list(object({
name = string,
description = string,
filter = string,
disabled = bool
}))
| `[]` | no | +| filter | The filter to apply when exporting logs. Only log entries that match the filter are exported. Default is '' which exports all logs. | `string` | `""` | no | +| include\_children | Only valid if 'organization' or 'folder' is chosen as var.parent\_resource.type. Determines whether or not to include children organizations/folders in the sink export. If true, logs associated with child projects are also exported; otherwise only logs relating to the provided organization/folder are included. | `bool` | `false` | no | +| intercept\_children | Only valid if 'organization' or 'folder' is chosen as var.parent\_resource.type. Whether or not to intercept logs from child projects. If true, matching logs will not match with sinks in child resources, except \_Required sinks. This sink will be visible to child resources when listing sinks. | `bool` | `false` | no | +| log\_sink\_name | The name of the log sink to be created. | `string` | n/a | yes | +| parent\_resource\_id | The ID of the GCP resource in which you create the log sink. If var.parent\_resource\_type is set to 'project', then this is the Project ID (and etc). | `string` | n/a | yes | +| parent\_resource\_type | The GCP resource in which you create the log sink. The value must not be computed, and must be one of the following: 'project', 'folder', 'billing\_account', or 'organization'. | `string` | `"project"` | no | +| unique\_writer\_identity | Whether or not to create a unique identity associated with this sink. If false (the default), then the writer\_identity used is serviceAccount:cloud-logs@system.gserviceaccount.com. If true, then a unique service account is created and used for the logging sink. | `bool` | `false` | no | ## Outputs -| Name | Description | -|------|-------------| -| filter | The filter to be applied when exporting logs. | -| log\_sink\_resource\_id | The resource ID of the log sink that was created. | -| log\_sink\_resource\_name | The resource name of the log sink that was created. | -| parent\_resource\_id | The ID of the GCP resource in which you create the log sink. | -| writer\_identity | The service account that logging uses to write log entries to the destination. | +| Name | Description | +| ------------------------- | ------------------------------------------------------------------------------ | +| filter | The filter to be applied when exporting logs. | +| log\_sink\_resource\_id | The resource ID of the log sink that was created. | +| log\_sink\_resource\_name | The resource name of the log sink that was created. | +| parent\_resource\_id | The ID of the GCP resource in which you create the log sink. | +| writer\_identity | The service account that logging uses to write log entries to the destination. | diff --git a/docs/upgrading_to_v10.0.md b/docs/upgrading_to_v10.0.md new file mode 100644 index 00000000..a6c679a1 --- /dev/null +++ b/docs/upgrading_to_v10.0.md @@ -0,0 +1,3 @@ +# Upgrading to Log Export v10.0 + +The v10.0 release of Log Export is a backwards incompatible release and features a new feature `intercept_children` for folder and oraganization logging sinks. Minimum provider version `5.27` ia required. diff --git a/versions.tf b/versions.tf index 2bd307ae..a7eda993 100644 --- a/versions.tf +++ b/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = ">= 3.53, < 6" + version = ">= 5.27, < 6" } }