add at_least_one_of to budget filter, add filter test

GoogleCloudPlatform · Nov 27, 2019 · e6a48ef · e6a48ef
1 parent 3a0f8a3
commit e6a48ef
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/products/billingbudget/api.yaml b/products/billingbudget/api.yaml
@@ -71,6 +71,10 @@ objects:
             description: |
               Filters that define which resources are used to compute the actual
               spend against the budget.
+            at_least_one_of:
+              - budget_filter.0.projects
+              - budget_filter.0.credit_types_treatment
+              - budget_filter.0.services
             properties:
               - !ruby/object:Api::Type::Array
                 name: projects

diff --git a/products/billingbudget/terraform.yaml b/products/billingbudget/terraform.yaml
@@ -25,6 +25,14 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           display_name: 'Example Billing Budget'
         test_env_vars:
           billing_acct: :BILLING_ACCT
+      - !ruby/object:Provider::Terraform::Examples
+        name: 'billing_budget_filter'
+        min_version: beta
+        primary_resource_id: 'budget'
+        vars:
+          display_name: 'Example Billing Budget'
+        test_env_vars:
+          billing_acct: :BILLING_ACCT
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       custom_import: templates/terraform/custom_import/self_link_as_name.erb
       post_create: templates/terraform/post_create/set_computed_name.erb

diff --git a/templates/terraform/examples/billing_budget_filter.tf.erb b/templates/terraform/examples/billing_budget_filter.tf.erb
@@ -1,6 +1,5 @@
 data "google_billing_account" "account" {
-  display_name = "My Billing Account"
-  open         = true
+  billing_account = "<%= ctx[:test_env_vars]['billing_acct'] -%>"
 }
 
 resource "google_billing_budget" "<%= ctx[:primary_resource_id] %>" {