Skip to content

Commit 00d6c4f

Browse files
Update Composer configuration description to inform configuration is not supported in Composer 3 (#12996) (#9310)
[upstream:d886321ea5248ec2ac0574bf27ba112d8d007495] Signed-off-by: Modular Magician <[email protected]>
1 parent bd38076 commit 00d6c4f

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

.changelog/12996.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
composer: inform users that the `task_logs_retention_config` is not relevant to Composer 3 and add `airflow_metadata_retention_config`
3+
```

google-beta/services/composer/resource_composer_environment.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,14 +721,14 @@ func ResourceComposerEnvironment() *schema.Resource {
721721
Type: schema.TypeString,
722722
Optional: true,
723723
ValidateFunc: validation.StringInSlice([]string{"CLOUD_LOGGING_ONLY", "CLOUD_LOGGING_AND_CLOUD_STORAGE"}, false),
724-
Description: `Whether logs in cloud logging only is enabled or not. This field is supported for Cloud Composer environments in versions composer-2.0.32-airflow-2.1.4 and newer.`,
724+
Description: `Whether logs in cloud logging only is enabled or not. This field is supported for Cloud Composer environments in versions composer-2.0.32-airflow-2.1.4 and newer but not in composer-3*`,
725725
},
726726
},
727727
},
728728
},
729729
"airflow_metadata_retention_config": {
730730
Type: schema.TypeList,
731-
Description: `Optional. The configuration setting for database retention.`,
731+
Description: `Optional. The policy for airflow metadata database retention.`,
732732
Optional: true,
733733
Computed: true,
734734
Elem: &schema.Resource{

website/docs/r/composer_environment.html.markdown

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,17 +1367,20 @@ The following arguments are supported:
13671367
[documented below](#nested_data_retention_config_c3).
13681368

13691369
<a name="nested_data_retention_config_c3"></a>The `data_retention_config` block supports:
1370-
* `task_logs_retention_config` -
1370+
* `airflow_metadata_retention_config` -
13711371
(Optional)
1372-
The configuration setting for Airflow task logs. Structure is
1373-
[documented below](#nested_task_logs_retention_config_c3).
1372+
The retention policy for airflow metadata database. Structure is
1373+
[documented below](#nested_airflow_metadata_retention_config_c3).
13741374

1375-
<a name="nested_task_logs_retention_config_c3"></a>The `task_logs_retention_config` block supports:
1376-
* `storage_mode` -
1375+
<a name="nested_airflow_metadata_retention_config_c3"></a>The `airflow_metadata_retention_config` block supports:
1376+
* `retention_mode` -
13771377
(Optional)
1378-
The mode of storage for Airflow task logs. Values for storage mode are
1379-
`CLOUD_LOGGING_ONLY` to only store logs in cloud logging and
1380-
`CLOUD_LOGGING_AND_CLOUD_STORAGE` to store logs in cloud logging and cloud storage.
1378+
Retention can be either enabled or disabled. Values for retention_mode are
1379+
`RETENTION_MODE_ENABLED` to enable retention and `RETENTION_MODE_DISABLED`
1380+
to disable retention.
1381+
* `retention_days` -
1382+
(Optional)
1383+
How many days data should be retained for.
13811384

13821385

13831386
<a name="nested_storage_config_c3"></a>The `storage_config` block supports:

0 commit comments

Comments
 (0)