Jules PR

.github/workflows/request-reviewer.yml

@@ -38,4 +38,3 @@ jobs:
           go build .
       - name: Request reviewer
         run: .ci/magician/magician request-reviewer ${{ github.event.pull_request.number || github.event.issue.number }}
-

docs/content/develop/generate-providers.md

@@ -38,7 +38,7 @@ provider changes to the `google` and `google-beta` Terraform providers.
    ```
     Where `[PRODUCT_NAME]` is one of the folder names in
     https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/products.
-  
+
     For example, if your product is `bigqueryanalyticshub`, the command would be
     the following:
 
@@ -52,13 +52,13 @@ provider changes to the `google` and `google-beta` Terraform providers.
    ```
 
     Where `[PRODUCT_NAME]` is one of the folder names in https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/products.
-   
+
     For example, if your product name is `bigqueryanalyticshub`, the command would be the following:
 
      ```bash
      make provider VERSION=beta OUTPUT_PATH="$GOPATH/src/github.com/hashicorp/terraform-provider-google-beta" PRODUCT=bigqueryanalyticshub
      ```
- 
+
 1. Confirm that the expected changes were generated:
    ```bash
    cd $GOPATH/src/github.com/hashicorp/terraform-provider-google

mmv1/products/compute/CrossSiteNetwork.yaml

@@ -0,0 +1,64 @@
+# Copyright 2024 Google Inc.
+# 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.
+
+---
+name: 'CrossSiteNetwork'
+description: |
+  Represents a cross-site-network resource. A CrossSiteNetwork is used to establish L2 connectivity between groups of Interconnects.
+min_version: beta
+references:
+  guides:
+    'Create a Cross-Site Interconnect': 'https://cloud.google.com/network-connectivity/docs/interconnect/how-to/cross-site/create-network'
+  api: 'https://cloud.google.com/compute/docs/reference/rest/beta/crossSiteNetworks'
+docs:
+base_url: 'projects/{{project}}/global/crossSiteNetworks'
+self_link: 'projects/{{project}}/global/crossSiteNetworks/{{name}}'
+update_verb: 'PATCH'
+timeouts:
+  insert_minutes: 20
+  update_minutes: 20
+  delete_minutes: 20
+async:
+  actions: ['create', 'delete', 'update']
+  type: 'OpAsync'
+  operation:
+    base_url: '{{op_id}}'
+  result:
+    resource_inside_response: false
+examples:
+  - name: 'compute_cross_site_network_basic'
+    primary_resource_id: 'example-cross-site-network'
+    vars:
+      name: 'test-cross-site-network'
+      description: 'Example cross site network'
+    min_version: 'beta'
+    test_env_vars:
+      project: 'PROJECT_NAME'
+parameters:
+properties:
+  - name: 'name'
+    type: String
+    description: |
+      Name of the resource. Provided by the client when the resource is created. The name must be
+      1-63 characters long, and comply with RFC1035. Specifically, the name must be 1-63 characters
+      long and match the regular expression `[a-z]([-a-z0-9]*[a-z0-9])?` which means the first
+      character must be a lowercase letter, and all following characters must be a dash,
+      lowercase letter, or digit, except the last character, which cannot be a dash.
+    required: true
+    immutable: true
+    validation:
+      regex: '^[a-z]([-a-z0-9]*[a-z0-9])?$'
+  - name: 'description'
+    type: String
+    description: |
+      An optional description of this resource.

mmv1/templates/terraform/custom_expand/secret_version_enable.go.tmpl

@@ -15,7 +15,7 @@ func expand{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d tpgresource.T
 	if name == "" {
 		return "", nil
 	}
-	
+
 	url, err := tpgresource.ReplaceVars(d, config, "{{"{{"}}SecretManagerBasePath{{"}}"}}{{"{{"}}name{{"}}"}}")
 	if err != nil {
 		return nil, err

mmv1/templates/terraform/custom_expand/service_attachment_target_service.go.tmpl

@@ -5,11 +5,11 @@ func expand{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d tpgresource.T
     if len(resource) < 4 {
 		return nil, fmt.Errorf("invalid value for target_service")
 	}
-    
+
     _, err := tpgresource.ParseRegionalFieldValue(resourceKind, v.(string), "project", resourceBound, "zone", d, config, true)
 	if err != nil {
 		return nil, fmt.Errorf("invalid value for target_service: %w", err)
 	}
-    
+
     return v, nil
 }

mmv1/templates/terraform/examples/cloudrunv2_service_sql.tf.tmpl

@@ -8,7 +8,7 @@ resource "google_cloud_run_v2_service" "{{$.PrimaryResourceId}}" {
     scaling {
       max_instance_count = 2
     }
-  
+
     volumes {
       name = "cloudsql"
       cloud_sql_instance {

mmv1/templates/terraform/examples/compute_cross_site_network_basic.tf.tmpl

@@ -0,0 +1,9 @@
+data "google_project" "project" {
+  provider = google-beta
+}
+
+resource "google_compute_cross_site_network" "{{$.PrimaryResourceId}}" {
+  name                 = "{{index $.Vars "name"}}"
+  description         = "{{index $.Vars "description"}}"
+  provider = google-beta
+}

mmv1/templates/terraform/examples/compute_region_network_firewall_policy_with_rules_full.tf.tmpl

@@ -100,7 +100,7 @@ resource "google_compute_region_network_firewall_policy_with_rules" "{{$.Primary
 }
 
 resource "google_network_security_address_group" "address_group_1" {
-  provider    = google-beta 
+  provider    = google-beta
   name        = "{{index $.Vars "address_group"}}"
   parent      = data.google_project.project.id
   description = "Regional address group"

mmv1/templates/terraform/examples/dialogflowcx_flow_full.tf.tmpl

@@ -294,4 +294,4 @@ resource "google_dialogflow_cx_flow" "{{$.PrimaryResourceId}}" {
       enable_consent_based_redaction = true
     }
   }
-} 
+}

mmv1/templates/terraform/examples/network_connectivity_hub_basic.tf.tmpl

@@ -1,7 +1,7 @@
-resource "google_network_connectivity_hub" "{{$.PrimaryResourceId}}"  {
- name        = "{{index $.Vars "resource_name"}}"
- description = "A sample hub"
- labels = {
-    label-one = "value-one"
-  }
-}
+resource "google_network_connectivity_hub" "{{$.PrimaryResourceId}}"  {
+ name        = "{{index $.Vars "resource_name"}}"
+ description = "A sample hub"
+ labels = {
+    label-one = "value-one"
+  }
+}

mmv1/templates/terraform/examples/network_connectivity_hub_with_export_psc.tf.tmpl

@@ -1,5 +1,5 @@
-resource "google_network_connectivity_hub" "{{$.PrimaryResourceId}}"  {
- name        = "{{index $.Vars "resource_name"}}"
- description = "A sample hub with Private Service Connect transitivity is enabled"
- export_psc = true
-}
+resource "google_network_connectivity_hub" "{{$.PrimaryResourceId}}"  {
+ name        = "{{index $.Vars "resource_name"}}"
+ description = "A sample hub with Private Service Connect transitivity is enabled"
+ export_psc = true
+}

mmv1/templates/terraform/examples/network_management_vpc_flow_logs_config_interconnect_full.tf.tmpl

@@ -31,5 +31,3 @@ resource "google_compute_interconnect_attachment" "attachment" {
   router                   = google_compute_router.router.id
   mtu                      = 1500
 }
-
-

mmv1/templates/terraform/examples/network_management_vpc_flow_logs_config_vpn_full.tf.tmpl

@@ -68,4 +68,3 @@ resource "google_compute_route" "route" {
   priority            = 1000
   next_hop_vpn_tunnel = google_compute_vpn_tunnel.tunnel.id
 }
-

mmv1/templates/terraform/examples/region_network_endpoint_group_appengine.tf.tmpl

@@ -1,75 +1,75 @@
-// App Engine Example
-resource "google_compute_region_network_endpoint_group" "{{$.PrimaryResourceId}}" {
-  name                  = "{{index $.Vars "neg_name"}}"
-  network_endpoint_type = "SERVERLESS"
-  region                = "us-central1"
-  app_engine {
-    service = google_app_engine_flexible_app_version.{{$.PrimaryResourceId}}.service
-    version = google_app_engine_flexible_app_version.{{$.PrimaryResourceId}}.version_id
-  }
-}
-
-resource "google_app_engine_flexible_app_version" "{{$.PrimaryResourceId}}" {
-  version_id = "v1"
-  service    = "{{index $.Vars "neg_name"}}"
-  runtime    = "nodejs"
-  flexible_runtime_settings {
-    operating_system = "ubuntu22"
-    runtime_version = "20"
-  }
-
-  entrypoint {
-    shell = "node ./app.js"
-  }
-
-  deployment {
-    zip {
-      source_url = "https://storage.googleapis.com/${google_storage_bucket.{{$.PrimaryResourceId}}.name}/${google_storage_bucket_object.{{$.PrimaryResourceId}}.name}"
-    }
-  }
-
-  liveness_check {
-    path = "/"
-  }
-
-  readiness_check {
-    path = "/"
-  }
-
-  env_variables = {
-    port = "8080"
-  }
-
-  handlers {
-    url_regex        = ".*\\/my-path\\/*"
-    security_level   = "SECURE_ALWAYS"
-    login            = "LOGIN_REQUIRED"
-    auth_fail_action = "AUTH_FAIL_ACTION_REDIRECT"
-
-    static_files {
-      path = "my-other-path"
-      upload_path_regex = ".*\\/my-path\\/*"
-    }
-  }
-
-  automatic_scaling {
-    cool_down_period = "120s"
-    cpu_utilization {
-      target_utilization = 0.5
-    }
-  }
-
-  delete_service_on_destroy = true
-}
-
-resource "google_storage_bucket" "{{$.PrimaryResourceId}}" {
-  name     = "{{index $.Vars "neg_name"}}"
-  location = "US"
-  uniform_bucket_level_access = true
-}
-
-resource "google_storage_bucket_object" "{{$.PrimaryResourceId}}" {
-  name   = "hello-world.zip"
-  bucket = google_storage_bucket.{{$.PrimaryResourceId}}.name
-  source = "./test-fixtures/hello-world.zip"
+// App Engine Example
+resource "google_compute_region_network_endpoint_group" "{{$.PrimaryResourceId}}" {
+  name                  = "{{index $.Vars "neg_name"}}"
+  network_endpoint_type = "SERVERLESS"
+  region                = "us-central1"
+  app_engine {
+    service = google_app_engine_flexible_app_version.{{$.PrimaryResourceId}}.service
+    version = google_app_engine_flexible_app_version.{{$.PrimaryResourceId}}.version_id
+  }
+}
+
+resource "google_app_engine_flexible_app_version" "{{$.PrimaryResourceId}}" {
+  version_id = "v1"
+  service    = "{{index $.Vars "neg_name"}}"
+  runtime    = "nodejs"
+  flexible_runtime_settings {
+    operating_system = "ubuntu22"
+    runtime_version = "20"
+  }
+
+  entrypoint {
+    shell = "node ./app.js"
+  }
+
+  deployment {
+    zip {
+      source_url = "https://storage.googleapis.com/${google_storage_bucket.{{$.PrimaryResourceId}}.name}/${google_storage_bucket_object.{{$.PrimaryResourceId}}.name}"
+    }
+  }
+
+  liveness_check {
+    path = "/"
+  }
+
+  readiness_check {
+    path = "/"
+  }
+
+  env_variables = {
+    port = "8080"
+  }
+
+  handlers {
+    url_regex        = ".*\\/my-path\\/*"
+    security_level   = "SECURE_ALWAYS"
+    login            = "LOGIN_REQUIRED"
+    auth_fail_action = "AUTH_FAIL_ACTION_REDIRECT"
+
+    static_files {
+      path = "my-other-path"
+      upload_path_regex = ".*\\/my-path\\/*"
+    }
+  }
+
+  automatic_scaling {
+    cool_down_period = "120s"
+    cpu_utilization {
+      target_utilization = 0.5
+    }
+  }
+
+  delete_service_on_destroy = true
+}
+
+resource "google_storage_bucket" "{{$.PrimaryResourceId}}" {
+  name     = "{{index $.Vars "neg_name"}}"
+  location = "US"
+  uniform_bucket_level_access = true
+}
+
+resource "google_storage_bucket_object" "{{$.PrimaryResourceId}}" {
+  name   = "hello-world.zip"
+  bucket = google_storage_bucket.{{$.PrimaryResourceId}}.name
+  source = "./test-fixtures/hello-world.zip"
 }

mmv1/templates/terraform/examples/region_network_endpoint_group_appengine_empty.tf.tmpl

@@ -1,8 +1,8 @@
-// App Engine Example
-resource "google_compute_region_network_endpoint_group" "{{$.PrimaryResourceId}}" {
-  name                  = "{{index $.Vars "neg_name"}}"
-  network_endpoint_type = "SERVERLESS"
-  region                = "us-central1"
-  app_engine {
-  }
+// App Engine Example
+resource "google_compute_region_network_endpoint_group" "{{$.PrimaryResourceId}}" {
+  name                  = "{{index $.Vars "neg_name"}}"
+  network_endpoint_type = "SERVERLESS"
+  region                = "us-central1"
+  app_engine {
+  }
 }