From 62827ae478dbb09ddbb4e3ff86dbe75ca5988bb9 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Tue, 30 Nov 2021 23:30:45 +0900 Subject: [PATCH] fix: add nil check of DriverConfig (#315) --- .../resource_docker_container_structures.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/provider/resource_docker_container_structures.go b/internal/provider/resource_docker_container_structures.go index 916af191..f8678f55 100644 --- a/internal/provider/resource_docker_container_structures.go +++ b/internal/provider/resource_docker_container_structures.go @@ -269,13 +269,16 @@ func getDockerContainerMounts(container types.ContainerJSON) []map[string]interf "volume": v, }) } + opt := map[string]interface{}{ + "no_copy": mount.VolumeOptions.NoCopy, + "labels": labels, + } + if mount.VolumeOptions.DriverConfig != nil { + opt["driver_name"] = mount.VolumeOptions.DriverConfig.Name + opt["driver_options"] = mount.VolumeOptions.DriverConfig.Options + } m["volume_options"] = []map[string]interface{}{ - { - "no_copy": mount.VolumeOptions.NoCopy, - "labels": labels, - "driver_name": mount.VolumeOptions.DriverConfig.Name, - "driver_options": mount.VolumeOptions.DriverConfig.Options, - }, + opt, } } if mount.TmpfsOptions != nil {