Reverted a few changes

Author: terricain

chef/resource_environment.go

@@ -34,11 +34,13 @@ func resourceChefEnvironment() *schema.Resource {
 			"default_attributes_json": {
 				Type:      schema.TypeString,
 				Optional:  true,
+				Default:   "{}",
 				StateFunc: jsonStateFunc,
 			},
 			"override_attributes_json": {
 				Type:      schema.TypeString,
 				Optional:  true,
+				Default:   "{}",
 				StateFunc: jsonStateFunc,
 			},
 			"cookbook_constraints": {

chef/resource_environment_test.go

@@ -59,6 +59,12 @@ func TestAccEnvironment_basic(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				Config:            testAccEnvironmentConfig_basic2,
+				ResourceName:      "chef_environment.test",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -123,3 +129,12 @@ EOT
   }
 }
 `
+const testAccEnvironmentConfig_basic2 = `
+resource "chef_environment" "test" {
+  name = "terraform-acc-test-basic"
+  description = "Terraform Acceptance Tests"
+  cookbook_constraints = {
+    "terraform" = "= 1.0.0"
+  }
+}
+`

chef/resource_node.go

@@ -35,21 +35,25 @@ func resourceChefNode() *schema.Resource {
 				Type:      schema.TypeString,
 				Optional:  true,
 				StateFunc: jsonStateFunc,
+				Default:   "{}",
 			},
 			"normal_attributes_json": {
 				Type:      schema.TypeString,
 				Optional:  true,
 				StateFunc: jsonStateFunc,
+				Default:   "{}",
 			},
 			"default_attributes_json": {
 				Type:      schema.TypeString,
 				Optional:  true,
 				StateFunc: jsonStateFunc,
+				Default:   "{}",
 			},
 			"override_attributes_json": {
 				Type:      schema.TypeString,
 				Optional:  true,
 				StateFunc: jsonStateFunc,
+				Default:   "{}",
 			},
 			"run_list": {
 				Type:     schema.TypeList,

chef/resource_node_test.go

@@ -118,7 +118,7 @@ resource "chef_environment" "test" {
 }
 resource "chef_node" "test" {
   name = "terraform-acc-test-basic"
-  environment_name = "terraform-acc-test-node-basic"
+  environment_name = chef_environment.test.name
   automatic_attributes_json = <<EOT
 {
      "terraform_acc_test": true

chef/resource_role.go

@@ -34,11 +34,13 @@ func resourceChefRole() *schema.Resource {
 			"default_attributes_json": {
 				Type:      schema.TypeString,
 				Optional:  true,
+				Default:   "{}",
 				StateFunc: jsonStateFunc,
 			},
 			"override_attributes_json": {
 				Type:      schema.TypeString,
 				Optional:  true,
+				Default:   "{}",
 				StateFunc: jsonStateFunc,
 			},
 			"run_list": {