Software and workloads configs (#9653) (#16887)

* add dag processor resources

* add web_server_plugins_mode

* add docs

* add tests, replace go client, guard nil PrivateClusterConfig

* new api version

* add mapping for web server plugins mode

* add create test

* make beta only

* valid cpu in dag_processor test

* add 'Computed' to individual workload resources, align.

* make workload resources computed

* remove computed from required fields
[upstream:09a193c942d2b3c1b1fe0a2c857ba1010a149c5c]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/9653.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+google_composer_environment: added support for creation and update for config.software_config.web_server_plugins_mode and config.workloads_config. dag_processor fields.
+```

google/services/composer/resource_composer_environment.go

@@ -637,6 +637,7 @@ func ResourceComposerEnvironment() *schema.Resource {
 										Optional:     true,
 										AtLeastOneOf: workloadsConfigKeys,
 										ForceNew:     false,
+										Computed:     true,
 										Description:  `Configuration for resources used by Airflow schedulers.`,
 										MaxItems:     1,
 										Elem: &schema.Resource{
@@ -645,27 +646,31 @@ func ResourceComposerEnvironment() *schema.Resource {
 													Type:         schema.TypeFloat,
 													Optional:     true,
 													ForceNew:     false,
+													Computed:     true,
 													ValidateFunc: validation.FloatAtLeast(0),
 													Description:  `CPU request and limit for a single Airflow scheduler replica`,
 												},
 												"memory_gb": {
 													Type:         schema.TypeFloat,
 													Optional:     true,
 													ForceNew:     false,
+													Computed:     true,
 													ValidateFunc: validation.FloatAtLeast(0),
 													Description:  `Memory (GB) request and limit for a single Airflow scheduler replica.`,
 												},
 												"storage_gb": {
 													Type:         schema.TypeFloat,
 													Optional:     true,
 													ForceNew:     false,
+													Computed:     true,
 													ValidateFunc: validation.FloatAtLeast(0),
 													Description:  `Storage (GB) request and limit for a single Airflow scheduler replica.`,
 												},
 												"count": {
 													Type:         schema.TypeInt,
 													Optional:     true,
 													ForceNew:     false,
+													Computed:     true,
 													ValidateFunc: validation.IntAtLeast(0),
 													Description:  `The number of schedulers.`,
 												},
@@ -676,6 +681,7 @@ func ResourceComposerEnvironment() *schema.Resource {
 										Type:         schema.TypeList,
 										Optional:     true,
 										AtLeastOneOf: workloadsConfigKeys,
+										Computed:     true,
 										Description:  `Configuration for resources used by Airflow triggerers.`,
 										MaxItems:     1,
 										Elem: &schema.Resource{
@@ -706,6 +712,7 @@ func ResourceComposerEnvironment() *schema.Resource {
 										Optional:     true,
 										AtLeastOneOf: workloadsConfigKeys,
 										ForceNew:     false,
+										Computed:     true,
 										Description:  `Configuration for resources used by Airflow web server.`,
 										MaxItems:     1,
 										Elem: &schema.Resource{
@@ -714,20 +721,23 @@ func ResourceComposerEnvironment() *schema.Resource {
 													Type:         schema.TypeFloat,
 													Optional:     true,
 													ForceNew:     false,
+													Computed:     true,
 													ValidateFunc: validation.FloatAtLeast(0),
 													Description:  `CPU request and limit for Airflow web server.`,
 												},
 												"memory_gb": {
 													Type:         schema.TypeFloat,
 													Optional:     true,
 													ForceNew:     false,
+													Computed:     true,
 													ValidateFunc: validation.FloatAtLeast(0),
 													Description:  `Memory (GB) request and limit for Airflow web server.`,
 												},
 												"storage_gb": {
 													Type:         schema.TypeFloat,
 													Optional:     true,
 													ForceNew:     false,
+													Computed:     true,
 													ValidateFunc: validation.FloatAtLeast(0),
 													Description:  `Storage (GB) request and limit for Airflow web server.`,
 												},
@@ -739,6 +749,7 @@ func ResourceComposerEnvironment() *schema.Resource {
 										Optional:     true,
 										AtLeastOneOf: workloadsConfigKeys,
 										ForceNew:     false,
+										Computed:     true,
 										Description:  `Configuration for resources used by Airflow workers.`,
 										MaxItems:     1,
 										Elem: &schema.Resource{
@@ -747,34 +758,39 @@ func ResourceComposerEnvironment() *schema.Resource {
 													Type:         schema.TypeFloat,
 													Optional:     true,
 													ForceNew:     false,
+													Computed:     true,
 													ValidateFunc: validation.FloatAtLeast(0),
 													Description:  `CPU request and limit for a single Airflow worker replica.`,
 												},
 												"memory_gb": {
 													Type:         schema.TypeFloat,
 													Optional:     true,
 													ForceNew:     false,
+													Computed:     true,
 													ValidateFunc: validation.FloatAtLeast(0),
 													Description:  `Memory (GB) request and limit for a single Airflow worker replica.`,
 												},
 												"storage_gb": {
 													Type:         schema.TypeFloat,
 													Optional:     true,
 													ForceNew:     false,
+													Computed:     true,
 													ValidateFunc: validation.FloatAtLeast(0),
 													Description:  `Storage (GB) request and limit for a single Airflow worker replica.`,
 												},
 												"min_count": {
 													Type:         schema.TypeInt,
 													Optional:     true,
 													ForceNew:     false,
+													Computed:     true,
 													ValidateFunc: validation.IntAtLeast(0),
 													Description:  `Minimum number of workers for autoscaling.`,
 												},
 												"max_count": {
 													Type:         schema.TypeInt,
 													Optional:     true,
 													ForceNew:     false,
+													Computed:     true,
 													ValidateFunc: validation.IntAtLeast(0),
 													Description:  `Maximum number of workers for autoscaling.`,
 												},

website/docs/r/composer_environment.html.markdown

@@ -475,6 +475,11 @@ The following arguments are supported:
   (Optional, Cloud Composer 1 with Airflow 2 only)
   The number of schedulers for Airflow.
 
+* `web_server_plugins_mode` -
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html), Cloud Composer 3 only)
+  Web server plugins configuration. Should be either 'ENABLED' or 'DISABLED'. Defaults to 'ENABLED'.
+
+
 See [documentation](https://cloud.google.com/composer/docs/how-to/managing/configuring-private-ip) for setting up private environments. <a name="nested_private_environment_config"></a>The `private_environment_config` block supports:
 
 * `connection_type` -
@@ -979,6 +984,10 @@ The `workloads_config` block supports:
   (Optional)
   Configuration for resources used by Airflow workers.
 
+* `dag_processor` -
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html), Cloud Composer 3 only)
+  Configuration for resources used by DAG processor.
+
 The `scheduler` block supports:
 
 * `cpu` -
@@ -1050,6 +1059,20 @@ The `worker` block supports:
   environment does not go above this number, even if a higher number of workers is required to
   handle the load.
 
+The `dag_processor` block supports:
+
+* `cpu` -
+  (Optional)
+  CPU request and limit for DAG processor.
+
+* `memory_gb` -
+  (Optional)
+  Memory (GB) request and limit for DAG processor.
+
+* `float storage_gb`
+  (Optional)
+  Storage (GB) request and limit for DAG processor.
+
 ## Attributes Reference
 
 In addition to the arguments listed above, the following computed attributes are exported: