From 8f4105463815cadb79af61562fd04cb08c31decc Mon Sep 17 00:00:00 2001
From: Manuel Vogel <mavogel@posteo.de>
Date: Tue, 17 Dec 2019 17:28:25 +0100
Subject: [PATCH] fix: label for network and volume after improt

---
 docker/resource_docker_network.go       | 4 +++-
 docker/resource_docker_network_funcs.go | 2 +-
 docker/resource_docker_volume.go        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docker/resource_docker_network.go b/docker/resource_docker_network.go
index c2f45502..2dc42633 100644
--- a/docker/resource_docker_network.go
+++ b/docker/resource_docker_network.go
@@ -81,12 +81,15 @@ func resourceDockerNetwork() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
+				Default:  "default",
 			},
 
 			"ipam_config": {
 				Type:     schema.TypeSet,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
+				// DiffSuppressFunc: suppressIfIPAMConfigWithIpv6Changes(),
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"subnet": {
@@ -114,7 +117,6 @@ func resourceDockerNetwork() *schema.Resource {
 						},
 					},
 				},
-				Set: resourceDockerIpamConfigHash,
 			},
 
 			"scope": {
diff --git a/docker/resource_docker_network_funcs.go b/docker/resource_docker_network_funcs.go
index 548e84cc..77818e8a 100644
--- a/docker/resource_docker_network_funcs.go
+++ b/docker/resource_docker_network_funcs.go
@@ -153,7 +153,7 @@ func resourceDockerNetworkReadRefreshFunc(
 		log.Printf("[DEBUG] Docker network inspect: %s", jsonObj)
 
 		d.Set("name", retNetwork.Name)
-		d.Set("labels", retNetwork.Labels)
+		d.Set("labels", mapToLabelSet(retNetwork.Labels))
 		d.Set("driver", retNetwork.Driver)
 		d.Set("internal", retNetwork.Internal)
 		d.Set("attachable", retNetwork.Attachable)
diff --git a/docker/resource_docker_volume.go b/docker/resource_docker_volume.go
index 0bf3e32e..9e529427 100644
--- a/docker/resource_docker_volume.go
+++ b/docker/resource_docker_volume.go
@@ -143,7 +143,7 @@ func resourceDockerVolumeRead(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	d.Set("name", retVolume.Name)
-	d.Set("labels", retVolume.Labels)
+	d.Set("labels", mapToLabelSet(retVolume.Labels))
 	d.Set("driver", retVolume.Driver)
 	d.Set("driver_opts", retVolume.Options)
 	d.Set("mountpoint", retVolume.Mountpoint)