Skip to content

Commit

Permalink
Fix the project metadata test in CI + fix new linter errors (#3267)
Browse files Browse the repository at this point in the history
<!-- This change is generated by MagicModules. -->
/cc @rileykarson
  • Loading branch information
modular-magician authored and rileykarson committed Mar 18, 2019
1 parent 6ff19d3 commit 0d6b100
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
3 changes: 0 additions & 3 deletions google/resource_bigtable_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,6 @@ func resourceBigtableInstanceCreate(d *schema.ResourceData, meta interface{}) er
}

conf.Clusters = expandBigtableClusters(d.Get("cluster").(*schema.Set).List(), conf.InstanceID)
if err != nil {
return fmt.Errorf("error expanding clusters: %s", err.Error())
}

c, err := config.bigtableClientFactory.NewInstanceAdminClient(project)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion google/resource_compute_project_metadata_item_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func testAccCheckProjectMetadataItemDestroy(s *terraform.State) error {
}

func testAccProjectMetadataItem_basic(key, val string) string {
return testAccProjectMetadataItem_basicWithResourceName(acctest.RandString(10), key, val)
return testAccProjectMetadataItem_basicWithResourceName(fmt.Sprintf("test_%s", acctest.RandString(10)), key, val)
}

func testAccProjectMetadataItem_basicWithResourceName(resourceName, key, val string) string {
Expand Down
7 changes: 2 additions & 5 deletions google/resource_storage_transfer_job.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"google.golang.org/api/googleapi"
"google.golang.org/api/storagetransfer/v1"
"log"
"strings"
Expand Down Expand Up @@ -365,7 +364,7 @@ func resourceStorageTransferJobRead(d *schema.ResourceData, meta interface{}) er
return err
}

d.Set("transfer_spec", flattenTransferSpec(res.TransferSpec, d))
err = d.Set("transfer_spec", flattenTransferSpec(res.TransferSpec, d))
if err != nil {
return err
}
Expand Down Expand Up @@ -458,9 +457,7 @@ func resourceStorageTransferJobDelete(d *schema.ResourceData, meta interface{})
if err != nil {
return resource.RetryableError(err)
}
if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 429 {
return resource.RetryableError(gerr)
}

return nil
})

Expand Down

0 comments on commit 0d6b100

Please sign in to comment.