Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename (unreleased) google_appengine_firewall_rule to google_app_engine_firewall_rule #336

Merged
merged 1 commit into from
Jan 10, 2019
Merged

Rename (unreleased) google_appengine_firewall_rule to google_app_engine_firewall_rule #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion google-beta/provider_appengine_gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
}
12 changes: 6 additions & 6 deletions google-beta/resource_appengine_firewall_rule_generated_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}{
Expand All @@ -38,18 +38,18 @@ 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,
},
},
})
}

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"
Expand All @@ -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"
Expand All @@ -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.") {
Expand Down
16 changes: 8 additions & 8 deletions website/docs/r/appengine_firewall_rule.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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)

<div class = "oics-button" style="float: right; margin: 0 0 -15px">
<a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgit.luolix.top%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_working_dir=appengine_firewall_rule_basic&cloudshell_image=gcr.io%2Fgraphite-cloud-shell-images%2Fterraform%3Alatest&open_in_editor=main.tf&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md" target="_blank">
<a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgit.luolix.top%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_working_dir=app_engine_firewall_rule_basic&cloudshell_image=gcr.io%2Fgraphite-cloud-shell-images%2Fterraform%3Alatest&open_in_editor=main.tf&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md" target="_blank">
<img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
</a>
</div>
## Example Usage - Appengine Firewall Rule Basic
## Example Usage - App Engine Firewall Rule Basic


```hcl
Expand All @@ -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"
Expand Down Expand Up @@ -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`
Expand Down
3 changes: 3 additions & 0 deletions website/google.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@
<li<%= sidebar_current("docs-google-app-engine-application") %>>
<a href="/docs/providers/google/r/app_engine_application.html">google_app_engine_application</a>
</li>
<li<%= sidebar_current("docs-google-app-engine-firewall-rule") %>>
<a href="/docs/providers/google/r/appengine_firewall_rule.html">google_app_engine_firewall_rule</a>
</li>
</ul>
</li>

Expand Down