Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

provider/google: Fix project metadata sshkeys from showing up #4512

Merged
merged 1 commit into from
Jan 5, 2016
Merged

provider/google: Fix project metadata sshkeys from showing up #4512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions builtin/providers/google/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ func MetadataUpdate(oldMDMap map[string]interface{}, newMDMap map[string]interfa
}

// Format metadata from the server data format -> schema data format
func MetadataFormatSchema(md *compute.Metadata) map[string]interface{} {
func MetadataFormatSchema(curMDMap map[string]interface{}, md *compute.Metadata) map[string]interface{} {
newMD := make(map[string]interface{})

for _, kv := range md.Items {
newMD[kv.Key] = *kv.Value
if _, ok := curMDMap[kv.Key]; ok {
newMD[kv.Key] = *kv.Value
}
}

return newMD
Expand Down
2 changes: 1 addition & 1 deletion builtin/providers/google/resource_compute_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
// Synch metadata
md := instance.Metadata

_md := MetadataFormatSchema(md)
_md := MetadataFormatSchema(d.Get("metadata").(map[string]interface{}), md)
delete(_md, "startup-script")

if script, scriptExists := d.GetOk("metadata_startup_script"); scriptExists {
Expand Down
2 changes: 1 addition & 1 deletion builtin/providers/google/resource_compute_project_metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func resourceComputeProjectMetadataRead(d *schema.ResourceData, meta interface{}

md := project.CommonInstanceMetadata

if err = d.Set("metadata", MetadataFormatSchema(md)); err != nil {
if err = d.Set("metadata", MetadataFormatSchema(d.Get("metadata").(map[string]interface{}), md)); err != nil {
return fmt.Errorf("Error setting metadata: %s", err)
}

Expand Down
6 changes: 0 additions & 6 deletions builtin/providers/google/resource_compute_project_metadata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import (
func TestAccComputeProjectMetadata_basic(t *testing.T) {
var project compute.Project

t.Skip("See https://github.com/hashicorp/terraform/issues/4504")

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Expand All @@ -38,8 +36,6 @@ func TestAccComputeProjectMetadata_basic(t *testing.T) {
func TestAccComputeProjectMetadata_modify_1(t *testing.T) {
var project compute.Project

t.Skip("See https://github.com/hashicorp/terraform/issues/4504")

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Expand Down Expand Up @@ -76,8 +72,6 @@ func TestAccComputeProjectMetadata_modify_1(t *testing.T) {
func TestAccComputeProjectMetadata_modify_2(t *testing.T) {
var project compute.Project

t.Skip("See https://github.com/hashicorp/terraform/issues/4504")

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Expand Down