ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix both Radek & Dana's comments. 

Style nits, but clean code is happy code.
This commit is contained in:
Paddy 2017-04-27 11:39:13 -07:00
parent 8aadf6ecdd
commit 9f3afb4ea7
1 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
builtin/providers/google/resource_compute_project_metadata_test.go
View File

@ -22,7 +22,7 @@ func TestAccComputeProjectMetadata_basic(t *testing.T) {
billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT") billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT")
var project compute.Project var project compute.Project
pid := "terrafom-test-" + acctest.RandString(10) projectID := "terrafom-test-" + acctest.RandString(10)
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -30,13 +30,13 @@ func TestAccComputeProjectMetadata_basic(t *testing.T) {
CheckDestroy: testAccCheckComputeProjectMetadataDestroy, CheckDestroy: testAccCheckComputeProjectMetadataDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccComputeProject_basic0_metadata(pid, pname, org, billingId), Config: testAccComputeProject_basic0_metadata(projectID, pname, org, billingId),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckComputeProjectExists( testAccCheckComputeProjectExists(
"google_compute_project_metadata.fizzbuzz", pid, &project), "google_compute_project_metadata.fizzbuzz", projectID, &project),
testAccCheckComputeProjectMetadataContains(pid, "banana", "orange"), testAccCheckComputeProjectMetadataContains(projectID, "banana", "orange"),
testAccCheckComputeProjectMetadataContains(pid, "sofa", "darwinism"), testAccCheckComputeProjectMetadataContains(projectID, "sofa", "darwinism"),
testAccCheckComputeProjectMetadataSize(pid, 2), testAccCheckComputeProjectMetadataSize(projectID, 2),
), ),
}, },
}, },
@ -54,7 +54,7 @@ func TestAccComputeProjectMetadata_modify_1(t *testing.T) {
billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT") billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT")
var project compute.Project var project compute.Project
pid := "terrafom-test-" + acctest.RandString(10) projectID := "terrafom-test-" + acctest.RandString(10)
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -62,26 +62,26 @@ func TestAccComputeProjectMetadata_modify_1(t *testing.T) {
CheckDestroy: testAccCheckComputeProjectMetadataDestroy, CheckDestroy: testAccCheckComputeProjectMetadataDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccComputeProject_modify0_metadata(pid, pname, org, billingId), Config: testAccComputeProject_modify0_metadata(projectID, pname, org, billingId),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckComputeProjectExists( testAccCheckComputeProjectExists(
"google_compute_project_metadata.fizzbuzz", pid, &project), "google_compute_project_metadata.fizzbuzz", projectID, &project),
testAccCheckComputeProjectMetadataContains(pid, "paper", "pen"), testAccCheckComputeProjectMetadataContains(projectID, "paper", "pen"),
testAccCheckComputeProjectMetadataContains(pid, "genghis_khan", "french bread"), testAccCheckComputeProjectMetadataContains(projectID, "genghis_khan", "french bread"),
testAccCheckComputeProjectMetadataContains(pid, "happy", "smiling"), testAccCheckComputeProjectMetadataContains(projectID, "happy", "smiling"),
testAccCheckComputeProjectMetadataSize(pid, 3), testAccCheckComputeProjectMetadataSize(projectID, 3),
), ),
}, },
resource.TestStep{ resource.TestStep{
Config: testAccComputeProject_modify1_metadata(pid, pname, org, billingId), Config: testAccComputeProject_modify1_metadata(projectID, pname, org, billingId),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckComputeProjectExists( testAccCheckComputeProjectExists(
"google_compute_project_metadata.fizzbuzz", pid, &project), "google_compute_project_metadata.fizzbuzz", projectID, &project),
testAccCheckComputeProjectMetadataContains(pid, "paper", "pen"), testAccCheckComputeProjectMetadataContains(projectID, "paper", "pen"),
testAccCheckComputeProjectMetadataContains(pid, "paris", "french bread"), testAccCheckComputeProjectMetadataContains(projectID, "paris", "french bread"),
testAccCheckComputeProjectMetadataContains(pid, "happy", "laughing"), testAccCheckComputeProjectMetadataContains(projectID, "happy", "laughing"),
testAccCheckComputeProjectMetadataSize(pid, 3), testAccCheckComputeProjectMetadataSize(projectID, 3),
), ),
}, },
}, },
@ -99,7 +99,7 @@ func TestAccComputeProjectMetadata_modify_2(t *testing.T) {
billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT") billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT")
var project compute.Project var project compute.Project
pid := "terraform-test-" + acctest.RandString(10) projectID := "terraform-test-" + acctest.RandString(10)
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -107,24 +107,24 @@ func TestAccComputeProjectMetadata_modify_2(t *testing.T) {
CheckDestroy: testAccCheckComputeProjectMetadataDestroy, CheckDestroy: testAccCheckComputeProjectMetadataDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccComputeProject_basic0_metadata(pid, pname, org, billingId), Config: testAccComputeProject_basic0_metadata(projectID, pname, org, billingId),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckComputeProjectExists( testAccCheckComputeProjectExists(
"google_compute_project_metadata.fizzbuzz", pid, &project), "google_compute_project_metadata.fizzbuzz", projectID, &project),
testAccCheckComputeProjectMetadataContains(pid, "banana", "orange"), testAccCheckComputeProjectMetadataContains(projectID, "banana", "orange"),
testAccCheckComputeProjectMetadataContains(pid, "sofa", "darwinism"), testAccCheckComputeProjectMetadataContains(projectID, "sofa", "darwinism"),
testAccCheckComputeProjectMetadataSize(pid, 2), testAccCheckComputeProjectMetadataSize(projectID, 2),
), ),
}, },
resource.TestStep{ resource.TestStep{
Config: testAccComputeProject_basic1_metadata(pid, pname, org, billingId), Config: testAccComputeProject_basic1_metadata(projectID, pname, org, billingId),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckComputeProjectExists( testAccCheckComputeProjectExists(
"google_compute_project_metadata.fizzbuzz", pid, &project), "google_compute_project_metadata.fizzbuzz", projectID, &project),
testAccCheckComputeProjectMetadataContains(pid, "kiwi", "papaya"), testAccCheckComputeProjectMetadataContains(projectID, "kiwi", "papaya"),
testAccCheckComputeProjectMetadataContains(pid, "finches", "darwinism"), testAccCheckComputeProjectMetadataContains(projectID, "finches", "darwinism"),
testAccCheckComputeProjectMetadataSize(pid, 2), testAccCheckComputeProjectMetadataSize(projectID, 2),
), ),
}, },
}, },
@ -148,7 +148,7 @@ func testAccCheckComputeProjectMetadataDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccCheckComputeProjectExists(n, pid string, project *compute.Project) resource.TestCheckFunc { func testAccCheckComputeProjectExists(n, projectID string, project *compute.Project) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {
@ -161,8 +161,7 @@ func testAccCheckComputeProjectExists(n, pid string, project *compute.Project) r
config := testAccProvider.Meta().(*Config) config := testAccProvider.Meta().(*Config)
found, err := config.clientCompute.Projects.Get( found, err := config.clientCompute.Projects.Get(projectID).Do()
pid).Do()
if err != nil { if err != nil {
return err return err
} }
@ -177,10 +176,10 @@ func testAccCheckComputeProjectExists(n, pid string, project *compute.Project) r
} }
} }
func testAccCheckComputeProjectMetadataContains(pid, key, value string) resource.TestCheckFunc { func testAccCheckComputeProjectMetadataContains(projectID, key, value string) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
config := testAccProvider.Meta().(*Config) config := testAccProvider.Meta().(*Config)
project, err := config.clientCompute.Projects.Get(pid).Do() project, err := config.clientCompute.Projects.Get(projectID).Do()
if err != nil { if err != nil {
return fmt.Errorf("Error, failed to load project service for %s: %s", config.Project, err) return fmt.Errorf("Error, failed to load project service for %s: %s", config.Project, err)
} }
@ -200,10 +199,10 @@ func testAccCheckComputeProjectMetadataContains(pid, key, value string) resource
} }
} }
func testAccCheckComputeProjectMetadataSize(pid string, size int) resource.TestCheckFunc { func testAccCheckComputeProjectMetadataSize(projectID string, size int) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
config := testAccProvider.Meta().(*Config) config := testAccProvider.Meta().(*Config)
project, err := config.clientCompute.Projects.Get(pid).Do() project, err := config.clientCompute.Projects.Get(projectID).Do()
if err != nil { if err != nil {
return fmt.Errorf("Error, failed to load project service for %s: %s", config.Project, err) return fmt.Errorf("Error, failed to load project service for %s: %s", config.Project, err)
} }
@ -217,7 +216,7 @@ func testAccCheckComputeProjectMetadataSize(pid string, size int) resource.TestC
} }
} }
func testAccComputeProject_basic0_metadata(pid, name, org, billing string) string { func testAccComputeProject_basic0_metadata(projectID, name, org, billing string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "google_project" "project" { resource "google_project" "project" {
project_id = "%s" project_id = "%s"
@ -238,10 +237,10 @@ resource "google_compute_project_metadata" "fizzbuzz" {
sofa = "darwinism" sofa = "darwinism"
} }
depends_on = ["google_project_services.services"] depends_on = ["google_project_services.services"]
}`, pid, name, org, billing) }`, projectID, name, org, billing)
} }
func testAccComputeProject_basic1_metadata(pid, name, org, billing string) string { func testAccComputeProject_basic1_metadata(projectID, name, org, billing string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "google_project" "project" { resource "google_project" "project" {
project_id = "%s" project_id = "%s"
@ -262,10 +261,10 @@ resource "google_compute_project_metadata" "fizzbuzz" {
finches = "darwinism" finches = "darwinism"
} }
depends_on = ["google_project_services.services"] depends_on = ["google_project_services.services"]
}`, pid, name, org, billing) }`, projectID, name, org, billing)
} }
func testAccComputeProject_modify0_metadata(pid, name, org, billing string) string { func testAccComputeProject_modify0_metadata(projectID, name, org, billing string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "google_project" "project" { resource "google_project" "project" {
project_id = "%s" project_id = "%s"
@ -287,10 +286,10 @@ resource "google_compute_project_metadata" "fizzbuzz" {
happy = "smiling" happy = "smiling"
} }
depends_on = ["google_project_services.services"] depends_on = ["google_project_services.services"]
}`, pid, name, org, billing) }`, projectID, name, org, billing)
} }
func testAccComputeProject_modify1_metadata(pid, name, org, billing string) string { func testAccComputeProject_modify1_metadata(projectID, name, org, billing string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "google_project" "project" { resource "google_project" "project" {
project_id = "%s" project_id = "%s"
@ -312,5 +311,5 @@ resource "google_compute_project_metadata" "fizzbuzz" {
happy = "laughing" happy = "laughing"
} }
depends_on = ["google_project_services.services"] depends_on = ["google_project_services.services"]
}`, pid, name, org, billing) }`, projectID, name, org, billing)
} }