upstream/terraform-provider-docker
1
0
Fork 0
mirror of https://github.com/kreuzwerker/terraform-provider-docker.git synced 2025-12-24 00:29:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: label for network and volume after improt

Browse source
This commit is contained in:
Manuel Vogel 2019-12-17 17:28:25 +01:00
parent 2c8e63b44d
commit 8f41054638
No known key found for this signature in database
GPG key ID: 24E54F214569A8A5
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/resource_docker_network.go
View file

@ -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": {

2
docker/resource_docker_network_funcs.go
View file

@ -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)

2
docker/resource_docker_volume.go
View file

@ -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)