Skip to content

Commit

Permalink
Bump image timeout, add service to binauth basic (#4649)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored and rileykarson committed Oct 10, 2019
1 parent 897e609 commit fd24aed
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
12 changes: 12 additions & 0 deletions google/resource_binaryauthorization_policy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,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)
}

Expand All @@ -81,6 +86,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}"
Expand All @@ -92,6 +102,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)
}
6 changes: 3 additions & 3 deletions google/resource_compute_image.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ func resourceComputeImage() *schema.Resource {
},

Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(4 * time.Minute),
Update: schema.DefaultTimeout(4 * time.Minute),
Delete: schema.DefaultTimeout(4 * time.Minute),
Create: schema.DefaultTimeout(6 * time.Minute),
Update: schema.DefaultTimeout(6 * time.Minute),
Delete: schema.DefaultTimeout(6 * time.Minute),
},

Schema: map[string]*schema.Schema{
Expand Down
6 changes: 3 additions & 3 deletions website/docs/r/compute_image.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ In addition to the arguments listed above, the following computed attributes are
This resource provides the following
[Timeouts](/docs/configuration/resources.html#timeouts) configuration options:

- `create` - Default is 4 minutes.
- `update` - Default is 4 minutes.
- `delete` - Default is 4 minutes.
- `create` - Default is 6 minutes.
- `update` - Default is 6 minutes.
- `delete` - Default is 6 minutes.

## Import

Expand Down

0 comments on commit fd24aed

Please sign in to comment.