Event function: update testing to new approach

Added Region and Zone variable for test/setup/variables.tf required to run example terraform files during testing.

Fixes #26

Author: kopachevsky

CONTRIBUTING.md

@@ -1,35 +1,15 @@
-CONTRIBUTING# Contributing
+# Contributing
 
 This document provides guidelines for contributing to the module.
 
 ## Dependencies
 
 The following dependencies must be installed on the development system:
 
-- [Terraform][terraform-site] v0.12.Z
 - [Docker Engine][docker-engine]
 - [Google Cloud SDK][google-cloud-sdk]
 - [make]
 
-### IAM Roles
-
-The Service Account which will be used to invoke this module must have
-the following IAM roles:
-
-- Cloud Functions Developer: `roles/cloudfunctions.developer`
-- Storage Admin: `roles/storage.admin`
-
-### APIs
-
-The project against which this module will be invoked must have the
-following APIs enabled:
-
-- Cloud Functions API: `cloudfunctions.googleapis.com`
-- Cloud Storage API: `storage-component.googleapis.com`
-
-The [Project Factory module][project-factory-module-site] can be used to
-provision projects with specific APIs activated.
-
 ## Generating Documentation for Inputs and Outputs
 
 The Inputs and Outputs tables in the READMEs of the root module,

README.md

@@ -86,121 +86,4 @@ following APIs enabled:
 - Cloud Storage API: `storage-component.googleapis.com`
 
 The [Project Factory module][project-factory-module-site] can be used to
-provision projects with specific APIs activated.
-
-## Testing
-
-The [fixtures directory](test/fixtures) and
-[integration directory](test/integration) comprise Terraform
-modules and InSpec tests used to verify the behaviour of this module.
-
-### Testing Software Dependencies
-
-The following software dependencies must be installed on the system
-from which the tests will be invoked:
-
-- [Ruby][ruby-site] v2.5
-- [Bundler][bundler-site] v1.17
-
-### Integration Tests
-
-Integration tests are invoked using [Kitchen][kitchen-site],
-[Kitchen-Terraform][kitchen-terraform-site], and [InSpec][inspec-site].
-
-Kitchen instances are configured in the
-[Kitchen configuration file](kitchen.yml). The instances use the modules
-in [fixtures directory](test/fixtures) to invoke identically named
-modules in the [examples directory](examples) and test this module.
-
-#### Integration Tests Configuration
-
-Each Kitchen instance requires a variable file named `terraform.tfvars`
-to be created and populated in the associated test fixture. For
-convenience, a [sample variable file][sameple-variable-file] is
-available.
-
-A key file for a Service Account with the required
-[IAM roles](#iam-roles) must be downloaded from the GCP console and
-placed in the root directory of this repository. The key file must be
-renamed to `credentials.json`.
-
-#### Integration Tests Execution
-
-Run `make test_integration_docker` to execute all of the Kitchen
-instances in a non-interactive manner within a Docker container.
-
-Alternatively, the Kitchen instances can be invoked interactively:
-
-1. Run `make docker_run` to start the Docker container. The root
-   directory of this repository will be mounted in the Docker container
-   at `/cft/workdir/`.
-1. Run `kitchen create` to initialize all Kitchen instances, or run
-   `kitchen create <INSTANCE_NAME>` to initialize a specific Kitchen
-   instance.
-1. Run `kitchen converge` to apply all Kitchen instances, or run
-   `kitchen converge <INSTANCE_NAME>` to apply a specific Kitchen
-   instance.
-1. Run `kitchen verify` to test all Kitchen instances, or run
-   `kitchen verify <INSTANCE_NAME>` to test a specific Kitchen instance.
-1. Run `kitchen destroy` to destroy all Kitchen instances, or run
-   `kitchen destroy <INSTANCE_NAME>` to destroy a specific Kitchen
-   instance.
-
-## Linting
-
-Linters are available for most of the filetypes in this repository.
-
-### Linting Software Dependencies
-
-The following software dependencies must be installed on the system
-from which the linting will be invoked:
-
-- [flake8][flake8-site].
-- [ShellCheck][shellcheck-site].
-- [terrafom validate][terraform-validate-site].
-
-### Linting Execution
-
-Run `make check --silent` to execute all of the linters.
-
-Alternatively, the linters  can be invoked individually.
-
-- Run `make check_python` to lint Python files.
-- Run `make check_shell` to lint Shell files.
-- Run `make check_terraform` to lint Terraform files.
-
-## Documentation
-
-The documentation of inputs and outputs for modules in this repository
-is automatically generated in each module's `README.md` based on the
-contents of the relevant `.tf` files.
-
-### Documentation Software Dependencies
-
-The following software dependencies must be installed on the system
-from which the documentation will be generated:
-
-- [terraform-docs][terraform-docs-site] v0.6.0
-
-### Generation
-
-Run `make generate_docs` to update the documentation.
-
-[automatic-labelling-from-localhost-example]: examples/automatic-labelling-from-localhost
-[bundler-site]: https://bundler.io/
-[event-project-log-entry-submodule]: modules/event-project-log-entry
-[repository-function-submodule]: modules/repository-function
-[flake8-site]: https://pypi.org/project/flake8/
-[gofmt-site]: https://golang.org/cmd/gofmt/
-[hadolint-site]: https://github.com/hadolint/hadolint/
-[inspec-site]: https://inspec.io/
-[kitchen-site]: https://kitchen.ci/
-[kitchen-terraform-site]: https://github.com/newcontext-oss/kitchen-terraform/
-[project-factory-module-site]: https://github.com/terraform-google-modules/terraform-google-project-factory/
-[ruby-site]: https://ruby-lang.org/
-[sample-variable-file]: test/fixtures/shared/terraform.tfvars.sample
-[shellcheck-site]: https://www.shellcheck.net/
-[terraform-docs-site]: https://github.com/segmentio/terraform-docs/releases/
-[terraform-provider-gcp-site]: https://github.com/terraform-providers/terraform-provider-google/
-[terraform-site]: https://www.terraform.io/
-[terraform-validate-site]: https://www.terraform.io/docs/commands/validate.html
+provision projects with specific APIs activated.

test/setup/iam.tf

@@ -16,8 +16,13 @@
 
 locals {
   int_required_roles = [
-    "roles/owner",
-    "roles/compute.admin"
+    "roles/cloudfunctions.developer",
+    "roles/storage.admin",
+    "roles/compute.admin",
+    "roles/pubsub.admin",
+    "roles/logging.configWriter",
+    "roles/source.admin",
+    "roles/iam.serviceAccountUser"
   ]
 }
 

test/setup/main.tf

@@ -14,14 +14,8 @@
  * limitations under the License.
  */
 
-resource "random_id" "project" {
-  byte_length = 4
-}
-
 locals {
-  project_name = "ci-event-function-${random_id.project.hex}"
-  region       = random_shuffle.available_regions.result[0]
-  zone         = random_shuffle.available_zones.result[0]
+  project_name = "ci-event-function"
 }
 
 
@@ -30,7 +24,7 @@ module "project" {
   version = "~> 3.0"
 
   name                = local.project_name
-  random_project_id   = false
+  random_project_id   = true
   auto_create_network = true
   org_id              = var.org_id
   folder_id           = var.folder_id
@@ -47,22 +41,3 @@ module "project" {
   ]
 }
 
-data "google_compute_regions" "available" {
-  project = module.project.project_id
-}
-
-resource "random_shuffle" "available_regions" {
-  input        = data.google_compute_regions.available.names
-  result_count = 1
-}
-
-data "google_compute_zones" "available" {
-  project = module.project.project_id
-  region  = local.region
-}
-
-resource "random_shuffle" "available_zones" {
-  input        = data.google_compute_zones.available.names
-  result_count = 3
-}
-

test/setup/outputs.tf

@@ -24,10 +24,10 @@ output "sa_key" {
 }
 
 output "region" {
-  value = local.region
+  value = var.region
 }
 
 output "zone" {
-  value = local.zone
+  value = var.zone
 }
 

test/setup/variables.tf

@@ -24,3 +24,13 @@ variable "folder_id" {
 variable "billing_account" {
   description = "The billing account id associated with the project, e.g. XXXXXX-YYYYYY-ZZZZZZ"
 }
+
+variable "region" {
+  description = "Compute region to create test resources"
+  default     = "us-east4"
+}
+
+variable "zone" {
+  description = "Compute region zone to create test resources"
+  default     = "us-east4-a"
+}