mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-07 03:01:06 +00:00
Merge pull request #1217 from terraform-providers/paddy_invalid_d_sets
Fix our calls to d.Set that returned errors.
This commit is contained in:
commit
ca0bdec840
@ -3,6 +3,7 @@ package google
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/hashicorp/terraform/helper/schema"
|
"github.com/hashicorp/terraform/helper/schema"
|
||||||
@ -149,7 +150,7 @@ func dataSourceGoogleComputeImageRead(d *schema.ResourceData, meta interface{})
|
|||||||
d.Set("creation_timestamp", image.CreationTimestamp)
|
d.Set("creation_timestamp", image.CreationTimestamp)
|
||||||
d.Set("description", image.Description)
|
d.Set("description", image.Description)
|
||||||
d.Set("disk_size_gb", image.DiskSizeGb)
|
d.Set("disk_size_gb", image.DiskSizeGb)
|
||||||
d.Set("image_id", image.Id)
|
d.Set("image_id", strconv.FormatUint(image.Id, 10))
|
||||||
d.Set("image_encryption_key_sha256", ieks256)
|
d.Set("image_encryption_key_sha256", ieks256)
|
||||||
d.Set("label_fingerprint", image.LabelFingerprint)
|
d.Set("label_fingerprint", image.LabelFingerprint)
|
||||||
d.Set("labels", image.Labels)
|
d.Set("labels", image.Labels)
|
||||||
|
@ -3,13 +3,14 @@ package google
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/hashicorp/terraform/helper/schema"
|
|
||||||
compute "google.golang.org/api/compute/v1"
|
|
||||||
"google.golang.org/api/googleapi"
|
|
||||||
"log"
|
"log"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/hashicorp/terraform/helper/schema"
|
||||||
|
compute "google.golang.org/api/compute/v1"
|
||||||
|
"google.golang.org/api/googleapi"
|
||||||
)
|
)
|
||||||
|
|
||||||
func dataSourceGoogleComputeRegionInstanceGroup() *schema.Resource {
|
func dataSourceGoogleComputeRegionInstanceGroup() *schema.Resource {
|
||||||
@ -137,7 +138,6 @@ func dataSourceComputeRegionInstanceGroupRead(d *schema.ResourceData, meta inter
|
|||||||
} else {
|
} else {
|
||||||
d.Set("instances", flattenInstancesWithNamedPorts(members.Items))
|
d.Set("instances", flattenInstancesWithNamedPorts(members.Items))
|
||||||
}
|
}
|
||||||
d.Set("kind", instanceGroup.Kind)
|
|
||||||
d.SetId(strconv.FormatUint(instanceGroup.Id, 16))
|
d.SetId(strconv.FormatUint(instanceGroup.Id, 16))
|
||||||
d.Set("self_link", instanceGroup.SelfLink)
|
d.Set("self_link", instanceGroup.SelfLink)
|
||||||
d.Set("name", name)
|
d.Set("name", name)
|
||||||
|
@ -2,21 +2,23 @@ package google
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"testing"
|
||||||
|
|
||||||
"github.com/hashicorp/terraform/helper/acctest"
|
"github.com/hashicorp/terraform/helper/acctest"
|
||||||
"github.com/hashicorp/terraform/helper/resource"
|
"github.com/hashicorp/terraform/helper/resource"
|
||||||
"testing"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestAccDataSourceRegionInstanceGroup(t *testing.T) {
|
func TestAccDataSourceRegionInstanceGroup(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
name := "acctest-" + acctest.RandString(6)
|
||||||
resource.Test(t, resource.TestCase{
|
resource.Test(t, resource.TestCase{
|
||||||
PreCheck: func() { testAccPreCheck(t) },
|
PreCheck: func() { testAccPreCheck(t) },
|
||||||
Providers: testAccProviders,
|
Providers: testAccProviders,
|
||||||
Steps: []resource.TestStep{
|
Steps: []resource.TestStep{
|
||||||
{
|
{
|
||||||
Config: testAccDataSourceRegionInstanceGroup_basic("foobarbaz"),
|
Config: testAccDataSourceRegionInstanceGroup_basic(name),
|
||||||
Check: resource.ComposeTestCheckFunc(
|
Check: resource.ComposeTestCheckFunc(
|
||||||
resource.TestCheckResourceAttr("data.google_compute_region_instance_group.data_source", "name", "foobarbaz"),
|
resource.TestCheckResourceAttr("data.google_compute_region_instance_group.data_source", "name", name),
|
||||||
resource.TestCheckResourceAttr("data.google_compute_region_instance_group.data_source", "project", getTestProjectFromEnv()),
|
resource.TestCheckResourceAttr("data.google_compute_region_instance_group.data_source", "project", getTestProjectFromEnv()),
|
||||||
resource.TestCheckResourceAttr("data.google_compute_region_instance_group.data_source", "instances.#", "10")),
|
resource.TestCheckResourceAttr("data.google_compute_region_instance_group.data_source", "instances.#", "10")),
|
||||||
},
|
},
|
||||||
|
@ -417,8 +417,8 @@ func expandBackends(configured []interface{}) ([]*compute.Backend, error) {
|
|||||||
return backends, nil
|
return backends, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func flattenBackends(backends []*compute.Backend) []map[string]interface{} {
|
func flattenBackends(backends []*compute.Backend) *schema.Set {
|
||||||
result := make([]map[string]interface{}, 0, len(backends))
|
result := make([]interface{}, 0, len(backends))
|
||||||
|
|
||||||
for _, b := range backends {
|
for _, b := range backends {
|
||||||
data := make(map[string]interface{})
|
data := make(map[string]interface{})
|
||||||
@ -433,7 +433,7 @@ func flattenBackends(backends []*compute.Backend) []map[string]interface{} {
|
|||||||
result = append(result, data)
|
result = append(result, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
return result
|
return schema.NewSet(resourceGoogleComputeBackendServiceBackendHash, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
func expandBackendService(d *schema.ResourceData) (*compute.BackendService, error) {
|
func expandBackendService(d *schema.ResourceData) (*compute.BackendService, error) {
|
||||||
|
@ -119,7 +119,7 @@ func resourceComputeProjectMetadataRead(d *schema.ResourceData, meta interface{}
|
|||||||
return fmt.Errorf("Error setting metadata: %s", err)
|
return fmt.Errorf("Error setting metadata: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
d.Set("project", project)
|
d.Set("project", projectID)
|
||||||
d.SetId("common_metadata")
|
d.SetId("common_metadata")
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
@ -211,7 +211,10 @@ func resourceComputeRegionBackendServiceRead(d *schema.ResourceData, meta interf
|
|||||||
d.Set("connection_draining_timeout_sec", service.ConnectionDraining.DrainingTimeoutSec)
|
d.Set("connection_draining_timeout_sec", service.ConnectionDraining.DrainingTimeoutSec)
|
||||||
d.Set("fingerprint", service.Fingerprint)
|
d.Set("fingerprint", service.Fingerprint)
|
||||||
d.Set("self_link", service.SelfLink)
|
d.Set("self_link", service.SelfLink)
|
||||||
d.Set("backend", flattenBackends(service.Backends))
|
err = d.Set("backend", flattenRegionBackends(service.Backends))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
d.Set("health_checks", service.HealthChecks)
|
d.Set("health_checks", service.HealthChecks)
|
||||||
d.Set("project", project)
|
d.Set("project", project)
|
||||||
d.Set("region", region)
|
d.Set("region", region)
|
||||||
@ -335,3 +338,17 @@ func resourceGoogleComputeRegionBackendServiceBackendHash(v interface{}) int {
|
|||||||
|
|
||||||
return hashcode.String(buf.String())
|
return hashcode.String(buf.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func flattenRegionBackends(backends []*compute.Backend) *schema.Set {
|
||||||
|
result := make([]interface{}, 0, len(backends))
|
||||||
|
|
||||||
|
for _, b := range backends {
|
||||||
|
data := make(map[string]interface{})
|
||||||
|
|
||||||
|
data["description"] = b.Description
|
||||||
|
data["group"] = b.Group
|
||||||
|
result = append(result, data)
|
||||||
|
}
|
||||||
|
|
||||||
|
return schema.NewSet(resourceGoogleComputeRegionBackendServiceBackendHash, result)
|
||||||
|
}
|
||||||
|
@ -701,7 +701,10 @@ func resourceDataprocClusterRead(d *schema.ResourceData, meta interface{}) error
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
d.Set("cluster_config", cfg)
|
err = d.Set("cluster_config", cfg)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -724,7 +727,7 @@ func flattenClusterConfig(d *schema.ResourceData, cfg *dataproc.ClusterConfig) (
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
data["intialization_action"] = val
|
data["initialization_action"] = val
|
||||||
}
|
}
|
||||||
return []map[string]interface{}{data}, nil
|
return []map[string]interface{}{data}, nil
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user