mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-07-09 11:38:29 +00:00
Fix make test.
Because we were instantiating a client outside of resource.TestCase, it was being instantiated even for unit tests, which have no credentials, causing the unit tests to fail. Sadly, this is the only way I could figure out how to get a client inside resource.TestCase, which is very sad making, but works.
This commit is contained in:
parent
72114636da
commit
755edf6d79
|
@ -47,17 +47,13 @@ func testBucketName() string {
|
||||||
|
|
||||||
func TestAccGoogleStorageBucketAcl_basic(t *testing.T) {
|
func TestAccGoogleStorageBucketAcl_basic(t *testing.T) {
|
||||||
bucketName := testBucketName()
|
bucketName := testBucketName()
|
||||||
entities, err := defaultRoleEntities()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
resource.Test(t, resource.TestCase{
|
resource.Test(t, resource.TestCase{
|
||||||
PreCheck: func() { testAccPreCheck(t) },
|
PreCheck: func() { testAccPreCheck(t) },
|
||||||
Providers: testAccProviders,
|
Providers: testAccProviders,
|
||||||
CheckDestroy: testAccGoogleStorageBucketAclDestroy,
|
CheckDestroy: testAccGoogleStorageBucketAclDestroy,
|
||||||
Steps: []resource.TestStep{
|
Steps: []resource.TestStep{
|
||||||
resource.TestStep{
|
resource.TestStep{
|
||||||
Config: testGoogleStorageBucketsAclBasic1(bucketName, entities),
|
Config: testGoogleStorageBucketsAclBasic1(bucketName, t),
|
||||||
Check: resource.ComposeTestCheckFunc(
|
Check: resource.ComposeTestCheckFunc(
|
||||||
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic1),
|
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic1),
|
||||||
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
|
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
|
||||||
|
@ -69,17 +65,13 @@ func TestAccGoogleStorageBucketAcl_basic(t *testing.T) {
|
||||||
|
|
||||||
func TestAccGoogleStorageBucketAcl_upgrade(t *testing.T) {
|
func TestAccGoogleStorageBucketAcl_upgrade(t *testing.T) {
|
||||||
bucketName := testBucketName()
|
bucketName := testBucketName()
|
||||||
entities, err := defaultRoleEntities()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
resource.Test(t, resource.TestCase{
|
resource.Test(t, resource.TestCase{
|
||||||
PreCheck: func() { testAccPreCheck(t) },
|
PreCheck: func() { testAccPreCheck(t) },
|
||||||
Providers: testAccProviders,
|
Providers: testAccProviders,
|
||||||
CheckDestroy: testAccGoogleStorageBucketAclDestroy,
|
CheckDestroy: testAccGoogleStorageBucketAclDestroy,
|
||||||
Steps: []resource.TestStep{
|
Steps: []resource.TestStep{
|
||||||
resource.TestStep{
|
resource.TestStep{
|
||||||
Config: testGoogleStorageBucketsAclBasic1(bucketName, entities),
|
Config: testGoogleStorageBucketsAclBasic1(bucketName, t),
|
||||||
Check: resource.ComposeTestCheckFunc(
|
Check: resource.ComposeTestCheckFunc(
|
||||||
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic1),
|
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic1),
|
||||||
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
|
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
|
||||||
|
@ -87,7 +79,7 @@ func TestAccGoogleStorageBucketAcl_upgrade(t *testing.T) {
|
||||||
},
|
},
|
||||||
|
|
||||||
resource.TestStep{
|
resource.TestStep{
|
||||||
Config: testGoogleStorageBucketsAclBasic2(bucketName, entities),
|
Config: testGoogleStorageBucketsAclBasic2(bucketName, t),
|
||||||
Check: resource.ComposeTestCheckFunc(
|
Check: resource.ComposeTestCheckFunc(
|
||||||
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
|
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
|
||||||
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic3_owner),
|
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic3_owner),
|
||||||
|
@ -108,17 +100,13 @@ func TestAccGoogleStorageBucketAcl_upgrade(t *testing.T) {
|
||||||
|
|
||||||
func TestAccGoogleStorageBucketAcl_downgrade(t *testing.T) {
|
func TestAccGoogleStorageBucketAcl_downgrade(t *testing.T) {
|
||||||
bucketName := testBucketName()
|
bucketName := testBucketName()
|
||||||
entities, err := defaultRoleEntities()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
resource.Test(t, resource.TestCase{
|
resource.Test(t, resource.TestCase{
|
||||||
PreCheck: func() { testAccPreCheck(t) },
|
PreCheck: func() { testAccPreCheck(t) },
|
||||||
Providers: testAccProviders,
|
Providers: testAccProviders,
|
||||||
CheckDestroy: testAccGoogleStorageBucketAclDestroy,
|
CheckDestroy: testAccGoogleStorageBucketAclDestroy,
|
||||||
Steps: []resource.TestStep{
|
Steps: []resource.TestStep{
|
||||||
resource.TestStep{
|
resource.TestStep{
|
||||||
Config: testGoogleStorageBucketsAclBasic2(bucketName, entities),
|
Config: testGoogleStorageBucketsAclBasic2(bucketName, t),
|
||||||
Check: resource.ComposeTestCheckFunc(
|
Check: resource.ComposeTestCheckFunc(
|
||||||
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
|
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
|
||||||
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic3_owner),
|
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic3_owner),
|
||||||
|
@ -126,7 +114,7 @@ func TestAccGoogleStorageBucketAcl_downgrade(t *testing.T) {
|
||||||
},
|
},
|
||||||
|
|
||||||
resource.TestStep{
|
resource.TestStep{
|
||||||
Config: testGoogleStorageBucketsAclBasic3(bucketName, entities),
|
Config: testGoogleStorageBucketsAclBasic3(bucketName, t),
|
||||||
Check: resource.ComposeTestCheckFunc(
|
Check: resource.ComposeTestCheckFunc(
|
||||||
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
|
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
|
||||||
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic3_reader),
|
testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic3_reader),
|
||||||
|
@ -213,7 +201,11 @@ func testAccGoogleStorageBucketAclDestroy(s *terraform.State) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func testGoogleStorageBucketsAclBasic1(bucketName string, entities []string) string {
|
func testGoogleStorageBucketsAclBasic1(bucketName string, t *testing.T) string {
|
||||||
|
entities, err := defaultRoleEntities()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
return fmt.Sprintf(`
|
return fmt.Sprintf(`
|
||||||
resource "google_storage_bucket" "bucket" {
|
resource "google_storage_bucket" "bucket" {
|
||||||
name = "%s"
|
name = "%s"
|
||||||
|
@ -226,7 +218,11 @@ resource "google_storage_bucket_acl" "acl" {
|
||||||
`, bucketName, entities[0], entities[1], entities[2], roleEntityBasic1, roleEntityBasic2)
|
`, bucketName, entities[0], entities[1], entities[2], roleEntityBasic1, roleEntityBasic2)
|
||||||
}
|
}
|
||||||
|
|
||||||
func testGoogleStorageBucketsAclBasic2(bucketName string, entities []string) string {
|
func testGoogleStorageBucketsAclBasic2(bucketName string, t *testing.T) string {
|
||||||
|
entities, err := defaultRoleEntities()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
return fmt.Sprintf(`
|
return fmt.Sprintf(`
|
||||||
resource "google_storage_bucket" "bucket" {
|
resource "google_storage_bucket" "bucket" {
|
||||||
name = "%s"
|
name = "%s"
|
||||||
|
@ -252,7 +248,11 @@ resource "google_storage_bucket_acl" "acl" {
|
||||||
`, bucketName)
|
`, bucketName)
|
||||||
}
|
}
|
||||||
|
|
||||||
func testGoogleStorageBucketsAclBasic3(bucketName string, entities []string) string {
|
func testGoogleStorageBucketsAclBasic3(bucketName string, t *testing.T) string {
|
||||||
|
entities, err := defaultRoleEntities()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
return fmt.Sprintf(`
|
return fmt.Sprintf(`
|
||||||
resource "google_storage_bucket" "bucket" {
|
resource "google_storage_bucket" "bucket" {
|
||||||
name = "%s"
|
name = "%s"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user