Merge cloud function v1 and v2 tests
This commit is contained in:
parent
4d4bcb23a9
commit
ed84bcb631
|
@ -19,6 +19,7 @@ module "test" {
|
||||||
project_id = "my-project"
|
project_id = "my-project"
|
||||||
name = "test"
|
name = "test"
|
||||||
bucket_name = var.bucket_name
|
bucket_name = var.bucket_name
|
||||||
|
v2 = var.v2
|
||||||
bundle_config = {
|
bundle_config = {
|
||||||
source_dir = "bundle"
|
source_dir = "bundle"
|
||||||
output_path = "bundle.zip"
|
output_path = "bundle.zip"
|
||||||
|
|
|
@ -15,6 +15,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
variable "bucket_name" {
|
variable "bucket_name" {
|
||||||
type = string
|
type = any
|
||||||
default = "test"
|
default = "test"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "v2" {
|
||||||
|
type = any
|
||||||
|
default = false
|
||||||
|
}
|
||||||
|
|
|
@ -16,19 +16,29 @@ import pytest
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def resources(plan_runner):
|
def resources(plan_runner, version):
|
||||||
_, resources = plan_runner()
|
# convert `version` to a boolean suitable for the `v2` variable
|
||||||
|
v2 = {'v1': 'false', 'v2': 'true'}[version]
|
||||||
|
_, resources = plan_runner(v2=v2)
|
||||||
return resources
|
return resources
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('version', ['v1', 'v2'])
|
||||||
def test_resource_count(resources):
|
def test_resource_count(resources):
|
||||||
"Test number of resources created."
|
"Test number of resources created."
|
||||||
assert len(resources) == 3
|
assert len(resources) == 3
|
||||||
|
|
||||||
|
|
||||||
def test_iam(resources):
|
@pytest.mark.parametrize('version', ['v1', 'v2'])
|
||||||
|
def test_iam(resources, version):
|
||||||
"Test IAM binding resources."
|
"Test IAM binding resources."
|
||||||
bindings = [r['values'] for r in resources if r['type']
|
|
||||||
== 'google_cloudfunctions_function_iam_binding']
|
types = {
|
||||||
|
'v1': 'google_cloudfunctions_function_iam_binding',
|
||||||
|
'v2': 'google_cloudfunctions2_function_iam_binding'
|
||||||
|
}
|
||||||
|
|
||||||
|
bindings = [r['values'] for r in resources if r['type'] == types[version]]
|
||||||
assert len(bindings) == 1
|
assert len(bindings) == 1
|
||||||
assert bindings[0]['role'] == 'roles/cloudfunctions.invoker'
|
assert bindings[0]['role'] == 'roles/cloudfunctions.invoker'
|
||||||
|
assert bindings[0]['members'] == ['allUsers']
|
||||||
|
|
|
@ -1,13 +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.
|
|
|
@ -1,13 +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.
|
|
|
@ -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 = true
|
|
||||||
bundle_config = {
|
|
||||||
source_dir = "bundle"
|
|
||||||
output_path = "bundle.zip"
|
|
||||||
excludes = null
|
|
||||||
}
|
|
||||||
iam = {
|
|
||||||
"roles/cloudfunctions.invoker" = ["allUsers"]
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,20 +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 = string
|
|
||||||
default = "test"
|
|
||||||
}
|
|
|
@ -1,34 +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.
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def resources(plan_runner):
|
|
||||||
_, resources = plan_runner()
|
|
||||||
return resources
|
|
||||||
|
|
||||||
|
|
||||||
def test_resource_count(resources):
|
|
||||||
"Test number of resources created."
|
|
||||||
assert len(resources) == 3
|
|
||||||
|
|
||||||
|
|
||||||
def test_iam(resources):
|
|
||||||
"Test IAM binding resources."
|
|
||||||
bindings = [r['values'] for r in resources if r['type']
|
|
||||||
== 'google_cloudfunctions2_function_iam_binding']
|
|
||||||
assert len(bindings) == 1
|
|
||||||
assert bindings[0]['role'] == 'roles/cloudfunctions.invoker'
|
|
Loading…
Reference in New Issue