From 766a71aaf682f855b64f55d80ef37fdc787bcdb1 Mon Sep 17 00:00:00 2001 From: The Magician Date: Wed, 9 Jan 2019 16:02:11 -0800 Subject: [PATCH] Rename (unreleased) google_appengine_firewall_rule to google_app_engine_firewall_rule (#2849) /cc @rileykarson --- google/provider_appengine_gen.go | 2 +- ...rce_appengine_firewall_rule_generated_test.go | 12 ++++++------ .../docs/r/appengine_firewall_rule.html.markdown | 16 ++++++++-------- website/google.erb | 3 +++ 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/google/provider_appengine_gen.go b/google/provider_appengine_gen.go index 5dbce1ed..19cc25e0 100644 --- a/google/provider_appengine_gen.go +++ b/google/provider_appengine_gen.go @@ -17,5 +17,5 @@ package google import "github.com/hashicorp/terraform/helper/schema" var GeneratedAppEngineResourcesMap = map[string]*schema.Resource{ - "google_appengine_firewall_rule": resourceAppEngineFirewallRule(), + "google_app_engine_firewall_rule": resourceAppEngineFirewallRule(), } diff --git a/google/resource_appengine_firewall_rule_generated_test.go b/google/resource_appengine_firewall_rule_generated_test.go index 2d464dc5..595b949d 100644 --- a/google/resource_appengine_firewall_rule_generated_test.go +++ b/google/resource_appengine_firewall_rule_generated_test.go @@ -24,7 +24,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAppEngineFirewallRule_appengineFirewallRuleBasicExample(t *testing.T) { +func TestAccAppEngineFirewallRule_appEngineFirewallRuleBasicExample(t *testing.T) { t.Parallel() context := map[string]interface{}{ @@ -38,10 +38,10 @@ func TestAccAppEngineFirewallRule_appengineFirewallRuleBasicExample(t *testing.T CheckDestroy: testAccCheckAppEngineFirewallRuleDestroy, Steps: []resource.TestStep{ { - Config: testAccAppEngineFirewallRule_appengineFirewallRuleBasicExample(context), + Config: testAccAppEngineFirewallRule_appEngineFirewallRuleBasicExample(context), }, { - ResourceName: "google_appengine_firewall_rule.rule", + ResourceName: "google_app_engine_firewall_rule.rule", ImportState: true, ImportStateVerify: true, }, @@ -49,7 +49,7 @@ func TestAccAppEngineFirewallRule_appengineFirewallRuleBasicExample(t *testing.T }) } -func testAccAppEngineFirewallRule_appengineFirewallRuleBasicExample(context map[string]interface{}) string { +func testAccAppEngineFirewallRule_appEngineFirewallRuleBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_project" "my_project" { name = "tf-test-project" @@ -62,7 +62,7 @@ resource "google_app_engine_application" "app" { location_id = "us-central" } -resource "google_appengine_firewall_rule" "rule" { +resource "google_app_engine_firewall_rule" "rule" { project = "${google_app_engine_application.app.project}" priority = 1000 action = "ALLOW" @@ -73,7 +73,7 @@ resource "google_appengine_firewall_rule" "rule" { func testAccCheckAppEngineFirewallRuleDestroy(s *terraform.State) error { for name, rs := range s.RootModule().Resources { - if rs.Type != "google_appengine_firewall_rule" { + if rs.Type != "google_app_engine_firewall_rule" { continue } if strings.HasPrefix(name, "data.") { diff --git a/website/docs/r/appengine_firewall_rule.html.markdown b/website/docs/r/appengine_firewall_rule.html.markdown index 21b34d96..ae83ba36 100644 --- a/website/docs/r/appengine_firewall_rule.html.markdown +++ b/website/docs/r/appengine_firewall_rule.html.markdown @@ -13,14 +13,14 @@ # # ---------------------------------------------------------------------------- layout: "google" -page_title: "Google: google_appengine_firewall_rule" -sidebar_current: "docs-google-appengine-firewall-rule" +page_title: "Google: google_app_engine_firewall_rule" +sidebar_current: "docs-google-app-engine-firewall-rule" description: |- A single firewall rule that is evaluated against incoming traffic and provides an action to take on matched requests. --- -# google\_appengine\_firewall\_rule +# google\_app\_engine\_firewall\_rule A single firewall rule that is evaluated against incoming traffic and provides an action to take on matched requests. @@ -33,11 +33,11 @@ To get more information about FirewallRule, see: * [Official Documentation](https://cloud.google.com/appengine/docs/standard/python/creating-firewalls#creating_firewall_rules)
- + Open in Cloud Shell
-## Example Usage - Appengine Firewall Rule Basic +## Example Usage - App Engine Firewall Rule Basic ```hcl @@ -52,7 +52,7 @@ resource "google_app_engine_application" "app" { location_id = "us-central" } -resource "google_appengine_firewall_rule" "rule" { +resource "google_app_engine_firewall_rule" "rule" { project = "${google_app_engine_application.app.project}" priority = 1000 action = "ALLOW" @@ -107,8 +107,8 @@ This resource provides the following FirewallRule can be imported using any of these accepted formats: ``` -$ terraform import google_appengine_firewall_rule.default {{project}}/{{priority}} -$ terraform import google_appengine_firewall_rule.default {{priority}} +$ terraform import google_app_engine_firewall_rule.default {{project}}/{{priority}} +$ terraform import google_app_engine_firewall_rule.default {{priority}} ``` -> If you're importing a resource with beta features, make sure to include `-provider=google-beta` diff --git a/website/google.erb b/website/google.erb index 7e114d15..87f7000c 100644 --- a/website/google.erb +++ b/website/google.erb @@ -153,6 +153,9 @@ > google_app_engine_application + > + google_app_engine_firewall_rule +