chore: variables corrected

Author: prabhu34

examples/simple_composer_env_v3/README.md

@@ -10,11 +10,9 @@ This example also creates a Cloud Storage Bucket for scheduled snapshots and ass
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | composer\_env\_name | Name of Cloud Composer Environment. | `string` | `"ci-composer"` | no |
-| composer\_service\_account | Service Account to be used for running Cloud Composer Environment. | `string` | n/a | yes |
-| network | Network where Cloud Composer is created. | `string` | n/a | yes |
+| composer\_sa | Service Account to be used for running Cloud Composer Environment. | `string` | n/a | yes |
 | project\_id | Project ID where Cloud Composer Environment is created. | `string` | n/a | yes |
-| region | Region where Cloud Composer Environment is created. | `string` | n/a | yes |
-| subnetwork | Name of the Subetwork where Cloud Composer is created. | `string` | n/a | yes |
+| region | Region where Cloud Composer Environment is created. | `string` | `"us-central1"` | no |
 
 ## Outputs
 

examples/simple_composer_env_v3/main.tf

@@ -42,9 +42,9 @@ module "simple-composer-environment" {
   project_id                = var.project_id
   composer_env_name         = var.composer_env_name
   region                    = var.region
-  composer_service_account  = var.composer_service_account
-  network                   = var.network
-  subnetwork                = var.subnetwork
+  composer_service_account  = var.composer_sa
+  network                   = google_compute_network.main.id
+  subnetwork                = google_compute_subnetwork.main.id
   create_network_attachment = true
 
   grant_sa_agent_permission = false

examples/simple_composer_env_v3/network.tf

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+resource "google_compute_network" "main" {
+  project                 = var.project_id
+  name                    = "ci-composer-test-${random_string.suffix.result}"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_subnetwork" "main" {
+  project                  = var.project_id
+  name                     = "ci-composer-test-${random_string.suffix.result}"
+  ip_cidr_range            = "10.0.0.0/17"
+  region                   = var.region
+  network                  = google_compute_network.main.self_link
+  private_ip_google_access = true
+}
+
+resource "random_string" "suffix" {
+  length  = 4
+  special = false
+  upper   = false
+}

examples/simple_composer_env_v3/variables.tf

@@ -28,19 +28,10 @@ variable "composer_env_name" {
 variable "region" {
   description = "Region where Cloud Composer Environment is created."
   type        = string
+  default     = "us-central1"
 }
 
-variable "composer_service_account" {
+variable "composer_sa" {
   description = "Service Account to be used for running Cloud Composer Environment."
   type        = string
 }
-
-variable "network" {
-  description = "Network where Cloud Composer is created."
-  type        = string
-}
-
-variable "subnetwork" {
-  description = "Name of the Subetwork where Cloud Composer is created."
-  type        = string
-}