Merge pull request #15 from paulpalamarchuk/add_message_storage_policy

Add message_storage_policy block

README.md

@@ -40,6 +40,7 @@ module "pubsub" {
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
+| message\_storage\_policy | A map of storage policies. Default - inherit from organization's Resource Location Restriction policy. | map | `<map>` | no |
 | project\_id | The project ID to manage the Pub/Sub resources | string | n/a | yes |
 | pull\_subscriptions | The list of the pull subscriptions | list(map(string)) | `<list>` | no |
 | push\_subscriptions | The list of the push subscriptions | list(map(string)) | `<list>` | no |
@@ -64,7 +65,7 @@ module "pubsub" {
 ### Installation Dependencies
 
 - [terraform](https://www.terraform.io/downloads.html) 0.12.x
-- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) plugin v2.7.x
+- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) plugin >= v2.13
 
 ### Configure a Service Account
 

examples/simple/main.tf

@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 2.7"
+  version = "~> 2.13"
   region  = "us-central1"
 }
 

main.tf

@@ -22,6 +22,13 @@ resource "google_pubsub_topic" "topic" {
   project = var.project_id
   name    = var.topic
   labels  = var.topic_labels
+
+  dynamic "message_storage_policy" {
+    for_each = var.message_storage_policy
+    content {
+      allowed_persistence_regions = message_storage_policy.key == "allowed_persistence_regions" ? message_storage_policy.value : null
+    }
+  }
 }
 
 resource "google_pubsub_subscription" "push_subscriptions" {

test/integration/default/controls/pubsub.rb

@@ -18,7 +18,7 @@
 describe command("gcloud --project='#{project_id}' pubsub topics describe #{topic}") do
   its(:exit_status) { should be_zero }
   it { expect(subject.stdout).to match(%r{name: projects/#{project_id}/topics/#{topic}}) }
-  it { expect(subject.stdout).to match(%r{labels:\n  bar_label: bar_value\n  foo_label: foo_value\nname}) }
+  it { expect(subject.stdout).to match(/labels:\n  bar_label: bar_value\n  foo_label: foo_value\n.*name/m) }
 end
 
 describe command("gcloud --project='#{project_id}' pubsub subscriptions describe pull --format=json") do

variables.tf

@@ -42,3 +42,8 @@ variable "pull_subscriptions" {
   default     = []
 }
 
+variable "message_storage_policy" {
+  type        = map
+  description = "A map of storage policies. Default - inherit from organization's Resource Location Restriction policy."
+  default     = {}
+}