From 626817388cf926494e8defb6767241ac8c5ebc68 Mon Sep 17 00:00:00 2001
From: pat <pat@22acacia.com>
Date: Wed, 28 Oct 2015 10:55:50 -0700
Subject: [PATCH] golang pubsub SDK has been released.  moved
 topics/subscriptions to use that

Conflicts:
	builtin/providers/google/provider.go
	builtin/providers/google/resource_subscription.go
	builtin/providers/google/resource_subscription_test.go

golang pubsub SDK has been released.  moved topics/subscriptions to use that

Conflicts:
	builtin/providers/google/provider.go
	builtin/providers/google/resource_subscription.go
	builtin/providers/google/resource_subscription_test.go

file renames and add documentation files

remove typo'd merge and type file move

add to index page as well

only need to define that once

remove topic_computed schema value

I think this was used at one point but is no longer. away.

cleanup typo

adds a couple more config values

- ackDeadlineSeconds: number of seconds to wait for an ack
- pushAttributes: attributes of a push subscription
- pushEndpoint: target for a push subscription

rearrange to better match current conventions

respond to all of the comments
---
 r/pubsub_subscription.html.markdown | 39 +++++++++++++++++++++++++++++
 r/pubsub_topic.html.markdown        | 35 ++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 r/pubsub_subscription.html.markdown
 create mode 100644 r/pubsub_topic.html.markdown

diff --git a/r/pubsub_subscription.html.markdown b/r/pubsub_subscription.html.markdown
new file mode 100644
index 00000000..d1f43ef4
--- /dev/null
+++ b/r/pubsub_subscription.html.markdown
@@ -0,0 +1,39 @@
+---
+layout: "google"
+page_title: "Google: google_pubsub_subscription"
+sidebar_current: "docs-google-pubsub-subscription"
+description: |-
+  Creates a subscription in Google's pubsub  queueing system
+---
+
+# google\_pubsub\_subscripion
+
+Creates a subscription in Google's pubsub queueing system.  For more information see
+[the official documentation](https://cloud.google.com/pubsub/docs) and
+[API](https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions).
+
+
+## Example Usage
+
+```
+resource "google_pubsub_subscription" "default" {
+	name = "default-subscription"
+	topic = "default-topic"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `name` - (Required) A unique name for the resource, required by pubsub.
+    Changing this forces a new resource to be created.
+* `topic` - (Required) A topic to bind this subscription to, required by pubsub.
+    Changing this forces a new resource to be created.
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `name` - The name of the resource.
+* `topic` - The topic to bind this resource to.
diff --git a/r/pubsub_topic.html.markdown b/r/pubsub_topic.html.markdown
new file mode 100644
index 00000000..e371ddef
--- /dev/null
+++ b/r/pubsub_topic.html.markdown
@@ -0,0 +1,35 @@
+---
+layout: "google"
+page_title: "Google: google_pubsub_topic"
+sidebar_current: "docs-google-pubsub-topic"
+description: |-
+  Creates a topic in Google's pubsub  queueing system
+---
+
+# google\_pubsub\_topic
+
+Creates a topic in Google's pubsub queueing system.  For more information see
+[the official documentation](https://cloud.google.com/pubsub/docs) and
+[API](https://cloud.google.com/pubsub/reference/rest/v1/projects.topics).
+
+
+## Example Usage
+
+```
+resource "google_pubsub_topic" "default" {
+	name = "default-topic"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `name` - (Required) A unique name for the resource, required by pubsub.
+    Changing this forces a new resource to be created.
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `name` - The name of the resource.