-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into extract-bigtable-instance-type-from-instan…
…ceinfo
- Loading branch information
Showing
44 changed files
with
472 additions
and
747 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule ansible
updated
from e0d101 to 86c26c
Submodule terraform
updated
from f058c3 to e1b594
Submodule terraform-beta
updated
from 2e8d2b to dfa840
Submodule terraform-mapper
updated
3 files
| +98 −0 | google/appengine_application_url_dispatch_rules.go | |
| +15 −13 | google/image.go | |
| +33 −0 | google/utils.go |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
templates/inspec/examples/google_compute_router_nat/google_compute_router_nat.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <% gcp_project_id = "#{external_attribute('gcp_project_id', doc_generation)}" -%> | ||
| <% gcp_location = "#{external_attribute('gcp_location', doc_generation)}" -%> | ||
| <% router = grab_attributes['router'] -%> | ||
| <% router_nat = grab_attributes['router_nat'] -%> | ||
| describe google_compute_router_nat(project: <%= gcp_project_id -%>, region: <%= gcp_location -%>, router: <%= doc_generation ? "'#{router['name']}'" : "router['name']" -%>, name: <%= doc_generation ? "'#{router_nat['name']}'" : "router_nat['name']" -%>) do | ||
| it { should exist } | ||
| its('nat_ip_allocate_option') { should cmp <%= doc_generation ? "'#{router_nat['nat_ip_allocate_option']}'" : "router_nat['nat_ip_allocate_option']" -%> } | ||
| its('source_subnetwork_ip_ranges_to_nat') { should cmp <%= doc_generation ? "'#{router_nat['source_subnetwork_ip_ranges_to_nat']}'" : "router_nat['source_subnetwork_ip_ranges_to_nat']" -%> } | ||
| its('min_ports_per_vm') { should cmp <%= doc_generation ? "'#{router_nat['min_ports_per_vm']}'" : "router_nat['min_ports_per_vm']" -%> } | ||
| its('log_config.enable') { should cmp <%= doc_generation ? "'#{router_nat['log_config_enable']}'" : "router_nat['log_config_enable']" -%> } | ||
| its('log_config.filter') { should cmp <%= doc_generation ? "'#{router_nat['log_config_filter']}'" : "router_nat['log_config_filter']" -%> } | ||
| end | ||
|
|
||
| describe google_compute_router(project: <%= gcp_project_id -%>, region: <%= gcp_location -%>, router: 'nonexistent', name: 'nonexistent') do | ||
| it { should_not exist } | ||
| end |
4 changes: 4 additions & 0 deletions
4
templates/inspec/examples/google_compute_router_nat/google_compute_router_nat_attributes.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| gcp_project_id = attribute(:gcp_project_id, default: '<%= external_attribute('gcp_project_id') -%>', description: 'The GCP project identifier.') | ||
| gcp_location = attribute(:gcp_location, default: '<%= external_attribute('gcp_location') -%>', description: 'The GCP project region.') | ||
| router = attribute('router', default: <%= JSON.pretty_generate(grab_attributes['router']) -%>, description: 'Compute router description') | ||
| router_nat = attribute('router_nat', default: <%= JSON.pretty_generate(grab_attributes['router_nat']) -%>, description: 'Compute router NAT description') |
7 changes: 7 additions & 0 deletions
7
templates/inspec/examples/google_compute_router_nat/google_compute_router_nats.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <% gcp_project_id = "#{external_attribute('gcp_project_id', doc_generation)}" -%> | ||
| <% gcp_location = "#{external_attribute('gcp_location', doc_generation)}" -%> | ||
| <% router = grab_attributes['router'] -%> | ||
| <% router_nat = grab_attributes['router_nat'] -%> | ||
| describe google_compute_router_nats(project: <%= gcp_project_id -%>, region: <%= gcp_location -%>, router: <%= doc_generation ? "'#{router['name']}'" : "router['name']" -%>) do | ||
| its('names') { should include <%= doc_generation ? "'#{router_nat['name']}'" : "router_nat['name']" -%> } | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
43 changes: 43 additions & 0 deletions
43
templates/terraform/examples/app_engine_application_url_dispatch_rules_basic.tf.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| resource "google_storage_bucket" "bucket" { | ||
| name = "<%= ctx[:vars]['bucket_name'] %>" | ||
| } | ||
|
|
||
| resource "google_storage_bucket_object" "object" { | ||
| name = "hello-world.zip" | ||
| bucket = "${google_storage_bucket.bucket.name}" | ||
| source = "./test-fixtures/appengine/hello-world.zip" | ||
| } | ||
|
|
||
| resource "google_app_engine_standard_app_version" "myapp_v1" { | ||
| version_id = "v1" | ||
| service = "myapp" | ||
| runtime = "nodejs10" | ||
| noop_on_destroy = true | ||
| entrypoint { | ||
| shell = "node ./app.js" | ||
| } | ||
| deployment { | ||
| zip { | ||
| source_url = "https://storage.googleapis.com/${google_storage_bucket.bucket.name}/hello-world.zip" | ||
| } | ||
| } | ||
| env_variables = { | ||
| port = "8080" | ||
| } | ||
| depends_on = ["google_storage_bucket_object.object"] | ||
|
|
||
| } | ||
|
|
||
| resource "google_app_engine_application_url_dispatch_rules" "service_rules" { | ||
| # project = "my-project" | ||
| dispatch_rules { | ||
| domain = "*" | ||
| path = "/default/*" | ||
| service = "default" | ||
| } | ||
| dispatch_rules { | ||
| domain = "*" | ||
| path = "/myapp/*" | ||
| service = "${google_app_engine_standard_app_version.myapp_v1.service}" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.