lint fixes

GoogleCloudPlatform · Oct 28, 2019 · 2ceff33 · 2ceff33
1 parent 427388a
commit 2ceff33
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/third_party/terraform/tests/resource_google_service_account_iam_test.go.erb b/third_party/terraform/tests/resource_google_service_account_iam_test.go.erb
@@ -206,7 +206,7 @@ func TestAccServiceAccountIamPolicy_withCondition(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccServiceAccountIamPolicy_basic(account),
+				Config: testAccServiceAccountIamPolicy_withCondition(account),
 			},
 			{
 				ResourceName:      "google_service_account_iam_policy.foo",

diff --git a/third_party/terraform/utils/iam.go.erb b/third_party/terraform/utils/iam.go.erb
@@ -16,7 +16,9 @@ import (
 )
 
 const maxBackoffSeconds = 30
+<% unless version == 'ga' -%>
 const iamPolicyVersion = 3
+<% end -%>
 
 // These types are implemented per GCP resource type and specify how to do per-resource IAM operations.
 // They are used in the generic Terraform IAM resource definitions