Split Cloud Function module in separate v1 and v2 modules (#1450)

* split v1

* v2

* blueprints

* remove _http

tests/modules/cloud_function/common.tfvars

@@ -1,11 +0,0 @@
-project_id  = "my-project"
-name        = "test"
-bucket_name = "mybucket"
-bundle_config = {
-  source_dir  = "../../tests/modules/cloud_function/bundle"
-  output_path = "bundle.zip"
-  excludes    = null
-}
-iam = {
-  "roles/cloudfunctions.invoker" = ["allUsers"]
-}

tests/modules/cloud_function/fixture/common.tfvars

@@ -1,12 +0,0 @@
-project_id  = "my-project"
-name        = "test"
-bucket_name = var.bucket_name
-v2          = var.v2
-bundle_config = {
-  source_dir  = "bundle"
-  output_path = "bundle.zip"
-  excludes    = null
-}
-iam = {
-  "roles/cloudfunctions.invoker" = ["allUsers"]
-}

tests/modules/cloud_function/fixture/main.tf

@@ -1,31 +0,0 @@
-/**
- * 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.
- */
-
-module "test" {
-  source      = "../../../../modules/cloud-function"
-  project_id  = "my-project"
-  name        = "test"
-  bucket_name = var.bucket_name
-  v2          = var.v2
-  bundle_config = {
-    source_dir  = "bundle"
-    output_path = "bundle.zip"
-    excludes    = null
-  }
-  iam = {
-    "roles/cloudfunctions.invoker" = ["allUsers"]
-  }
-}

tests/modules/cloud_function/fixture/variables.tf

@@ -1,25 +0,0 @@
-/**
- * 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.
- */
-
-variable "bucket_name" {
-  type    = any
-  default = "test"
-}
-
-variable "v2" {
-  type    = any
-  default = false
-}

tests/modules/cloud_function/test_plan.py

@@ -1,43 +0,0 @@
-# Copyright 2023 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.
-
-import pytest
-
-
-@pytest.fixture
-def resources(plan_summary, version):
-  # convert `version` to a boolean suitable for the `v2` variable
-  v2 = {'v1': 'false', 'v2': 'true'}[version]
-  summary = plan_summary('modules/cloud-function',
-                         tf_var_files=['common.tfvars'], v2=v2)
-  return summary
-
-
-@pytest.mark.parametrize('version', ['v1', 'v2'])
-def test_resource_count(resources):
-  "Test number of resources created."
-  assert resources.counts['resources'] == 3
-
-
-@pytest.mark.parametrize('version', ['v1', 'v2'])
-def test_iam(resources, version):
-  "Test IAM binding resources."
-  type = {
-      'v1': 'google_cloudfunctions_function_iam_binding',
-      'v2': 'google_cloudfunctions2_function_iam_binding'
-  }[version]
-  key = f'{type}.default["roles/cloudfunctions.invoker"]'
-  binding = resources.values[key]
-  assert binding['role'] == 'roles/cloudfunctions.invoker'
-  assert binding['members'] == ['allUsers']

tests/modules/cloud_function_v1/examples/iam.yaml

@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2023 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,3 +11,18 @@
 # 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.
+
+values:
+  module.cf-http.google_cloudfunctions_function_iam_binding.default["roles/cloudfunctions.invoker"]:
+    condition: []
+    members:
+    - allUsers
+    project: my-project
+    region: europe-west1
+    role: roles/cloudfunctions.invoker
+
+counts:
+  google_cloudfunctions_function: 1
+  google_storage_bucket_object: 1
+  modules: 1
+  resources: 3

tests/modules/cloud_function_v2/examples/iam.yaml

@@ -0,0 +1,29 @@
+# Copyright 2023 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.
+
+values:
+  module.cf-http.google_cloudfunctions2_function_iam_binding.default["roles/cloudfunctions.invoker"]:
+    cloud_function: test-cf-http
+    condition: []
+    location: europe-west1
+    members:
+    - allUsers
+    project: my-project
+    role: roles/cloudfunctions.invoker
+
+counts:
+  google_cloudfunctions2_function: 1
+  google_storage_bucket_object: 1
+  modules: 1
+  resources: 3

tests/modules/cloud_function_v2/examples/multiple_functions.yaml

@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2023 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,3 +11,15 @@
 # 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.
+
+values:
+  module.cf-http-one.google_storage_bucket_object.bundle:
+    source: /tmp/bundle-my-project-test-cf-http-one.zip
+  module.cf-http-two.google_storage_bucket_object.bundle:
+    source: /tmp/bundle-my-project-test-cf-http-two.zip
+
+counts:
+  google_cloudfunctions2_function: 2
+  google_storage_bucket_object: 2
+  modules: 2
+  resources: 4