Bump image timeout, add service to binauth basic (#2455)

Merged PR #2455.
GoogleCloudPlatform · Oct 10, 2019 · be81b7d · be81b7d
1 parent f10392b
commit be81b7d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/build/inspec b/build/inspec
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/products/compute/api.yaml b/products/compute/api.yaml
@@ -4021,6 +4021,10 @@ objects:
         path: 'name'
         base_url: 'projects/{{project}}/global/operations/{{op_id}}'
         wait_ms: 1000
+        timeouts: !ruby/object:Api::Timeouts
+          insert_minutes: 6
+          update_minutes: 6
+          delete_minutes: 6
       result: !ruby/object:Api::Async::Result
         path: 'targetLink'
       status: !ruby/object:Api::Async::Status

diff --git a/third_party/terraform/tests/resource_binaryauthorization_policy_test.go.erb b/third_party/terraform/tests/resource_binaryauthorization_policy_test.go.erb
@@ -190,6 +190,11 @@ resource "google_project" "project" {
   org_id          = "%s"
   billing_account = "%s"
 }
+
+resource "google_project_service" "binauthz" {
+  project = "${google_project.project.project_id}"
+  service = "binaryauthorization.googleapis.com"
+}
 `, pid, pname, org, billing)
 }
 
@@ -203,6 +208,11 @@ resource "google_project" "project" {
   billing_account = "%s"
 }
 
+resource "google_project_service" "binauthz" {
+  project = "${google_project.project.project_id}"
+  service = "binaryauthorization.googleapis.com"
+}
+
 resource "google_binary_authorization_policy" "policy" {
   project = "${google_project.project.project_id}"
 
@@ -214,6 +224,8 @@ resource "google_binary_authorization_policy" "policy" {
     evaluation_mode = "ALWAYS_DENY"
     enforcement_mode = "ENFORCED_BLOCK_AND_AUDIT_LOG"
   }
+
+  depends_on = ["google_project_service.binauthz"]
 }
 `, pid, pname, org, billing)
 }