Enhancing documentation for composer v1 and v2 (beta) (#10284) (#5303) (#10372)

* fixing zone, work in progress

* Desired version

* added private_ip_google_access=true to subnetwork configuration in composer_v2 test

* test fix

* remove old commented code

* updated docs

* fixed use_ip_aliases

* added atLeastOneOf to ip_allocation_policy

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

Author: modular-magician

.changelog/5303.txt

@@ -0,0 +1,2 @@
+```release-note:none
+```

google/resource_composer_environment.go

@@ -51,6 +51,14 @@ var (
 		"config.0.software_config",
 		"config.0.private_environment_config",
 	}
+
+	composerIpAllocationPolicyKeys = []string{
+		"config.0.node_config.0.ip_allocation_policy.0.use_ip_aliases",
+		"config.0.node_config.0.ip_allocation_policy.0.cluster_secondary_range_name",
+		"config.0.node_config.0.ip_allocation_policy.0.services_secondary_range_name",
+		"config.0.node_config.0.ip_allocation_policy.0.cluster_ipv4_cidr_block",
+		"config.0.node_config.0.ip_allocation_policy.0.services_ipv4_cidr_block",
+	}
 )
 
 func resourceComposerEnvironment() *schema.Resource {
@@ -196,29 +204,33 @@ func resourceComposerEnvironment() *schema.Resource {
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
 												"use_ip_aliases": {
-													Type:        schema.TypeBool,
-													Required:    true,
-													ForceNew:    true,
-													Description: `Whether or not to enable Alias IPs in the GKE cluster. If true, a VPC-native cluster is created. Defaults to true if the ip_allocation_policy block is present in config. This field is only supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*. Environments in newer versions always use VPC-native GKE clusters.`,
+													Type:         schema.TypeBool,
+													Optional:     true,
+													ForceNew:     true,
+													AtLeastOneOf: composerIpAllocationPolicyKeys,
+													Description:  `Whether or not to enable Alias IPs in the GKE cluster. If true, a VPC-native cluster is created. Defaults to true if the ip_allocation_policy block is present in config. This field is only supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*. Environments in newer versions always use VPC-native GKE clusters.`,
 												},
 												"cluster_secondary_range_name": {
 													Type:          schema.TypeString,
 													Optional:      true,
 													ForceNew:      true,
+													AtLeastOneOf:  composerIpAllocationPolicyKeys,
 													Description:   `The name of the cluster's secondary range used to allocate IP addresses to pods. Specify either cluster_secondary_range_name or cluster_ipv4_cidr_block but not both. For Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*, this field is applicable only when use_ip_aliases is true.`,
 													ConflictsWith: []string{"config.0.node_config.0.ip_allocation_policy.0.cluster_ipv4_cidr_block"},
 												},
 												"services_secondary_range_name": {
 													Type:          schema.TypeString,
 													Optional:      true,
 													ForceNew:      true,
+													AtLeastOneOf:  composerIpAllocationPolicyKeys,
 													Description:   `The name of the services' secondary range used to allocate IP addresses to the cluster. Specify either services_secondary_range_name or services_ipv4_cidr_block but not both. For Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*, this field is applicable only when use_ip_aliases is true.`,
 													ConflictsWith: []string{"config.0.node_config.0.ip_allocation_policy.0.services_ipv4_cidr_block"},
 												},
 												"cluster_ipv4_cidr_block": {
 													Type:             schema.TypeString,
 													Optional:         true,
 													ForceNew:         true,
+													AtLeastOneOf:     composerIpAllocationPolicyKeys,
 													Description:      `The IP address range used to allocate IP addresses to pods in the cluster. For Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*, this field is applicable only when use_ip_aliases is true. Set to blank to have GKE choose a range with the default size. Set to /netmask (e.g. /14) to have GKE choose a range with a specific netmask. Set to a CIDR notation (e.g. 10.96.0.0/14) from the RFC-1918 private networks (e.g. 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16) to pick a specific range to use. Specify either cluster_secondary_range_name or cluster_ipv4_cidr_block but not both.`,
 													DiffSuppressFunc: cidrOrSizeDiffSuppress,
 													ConflictsWith:    []string{"config.0.node_config.0.ip_allocation_policy.0.cluster_secondary_range_name"},
@@ -227,6 +239,7 @@ func resourceComposerEnvironment() *schema.Resource {
 													Type:             schema.TypeString,
 													Optional:         true,
 													ForceNew:         true,
+													AtLeastOneOf:     composerIpAllocationPolicyKeys,
 													Description:      `The IP address range used to allocate IP addresses in this cluster. For Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*, this field is applicable only when use_ip_aliases is true. Set to blank to have GKE choose a range with the default size. Set to /netmask (e.g. /14) to have GKE choose a range with a specific netmask. Set to a CIDR notation (e.g. 10.96.0.0/14) from the RFC-1918 private networks (e.g. 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16) to pick a specific range to use. Specify either services_secondary_range_name or services_ipv4_cidr_block but not both.`,
 													DiffSuppressFunc: cidrOrSizeDiffSuppress,
 													ConflictsWith:    []string{"config.0.node_config.0.ip_allocation_policy.0.services_secondary_range_name"},

google/resource_composer_environment_test.go

@@ -346,6 +346,10 @@ resource "google_composer_environment" "test" {
 			subnetwork 		= google_compute_subnetwork.test.self_link
 			zone       		= "us-central1-a"
 			machine_type  = "n1-standard-1"
+			ip_allocation_policy {
+				use_ip_aliases          = true
+				cluster_ipv4_cidr_block = "10.0.0.0/16"
+			}
 		}
 	}
 }