46cd3c3f55
This ensures that `port_map` along with other block like attribute declarations (e.g. ulimit, labels, etc) can handle various hcl and json syntax that was supported in 0.8. In 0.8.7, the following declarations are effectively equivalent: ``` // hcl block port_map { http = 80 https = 443 } // hcl assignment port_map = { http = 80 https = 443 } // json single element array of map (default in API response) {"port_map": [{"http": 80, "https": 443}]} // json array of individual maps (supported accidentally iiuc) {"port_map: [{"http": 80}, {"https": 443}]} ``` We achieve compatbility by using `NewAttr("...", "list(map(string))", false)` to be serialized to a `map[string]string` wrapper, instead of using `BlockAttrs` declaration. The wrapper merges the list of maps automatically, to ease driver development. This approach is closer to how v0.8.7 implemented the fields [1][2], and despite its verbosity, seems to perserve 0.8.7 behavior in hcl2. This is only required for built-in types that have backward compatibility constraints. External drivers should use `BlockAttrs` instead, as they see fit. [1] https://github.com/hashicorp/nomad/blob/v0.8.7/client/driver/docker.go#L216 [2] https://github.com/hashicorp/nomad/blob/v0.8.7/client/driver/docker.go#L698-L700
397 lines
8.5 KiB
Go
397 lines
8.5 KiB
Go
package docker
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/hashicorp/nomad/helper/pluginutils/hclutils"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestConfig_ParseHCL(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
|
|
input string
|
|
expected *TaskConfig
|
|
}{
|
|
{
|
|
"basic image",
|
|
`config {
|
|
image = "redis:3.2"
|
|
}`,
|
|
&TaskConfig{
|
|
Image: "redis:3.2",
|
|
Devices: []DockerDevice{},
|
|
Mounts: []DockerMount{},
|
|
},
|
|
},
|
|
}
|
|
|
|
parser := hclutils.NewConfigParser(taskConfigSpec)
|
|
for _, c := range cases {
|
|
c := c
|
|
t.Run(c.name, func(t *testing.T) {
|
|
var tc *TaskConfig
|
|
|
|
parser.ParseHCL(t, c.input, &tc)
|
|
|
|
require.EqualValues(t, c.expected, tc)
|
|
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestConfig_ParseJSON(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
input string
|
|
expected TaskConfig
|
|
}{
|
|
{
|
|
name: "nil values for blocks are safe",
|
|
input: `{"Config": {"image": "bash:3", "mounts": null}}`,
|
|
expected: TaskConfig{
|
|
Image: "bash:3",
|
|
Mounts: []DockerMount{},
|
|
Devices: []DockerDevice{},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
c := c
|
|
t.Run(c.name, func(t *testing.T) {
|
|
var tc TaskConfig
|
|
hclutils.NewConfigParser(taskConfigSpec).ParseJson(t, c.input, &tc)
|
|
|
|
require.Equal(t, c.expected, tc)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestConfig_PortMap_Deserialization(t *testing.T) {
|
|
parser := hclutils.NewConfigParser(taskConfigSpec)
|
|
|
|
expectedMap := map[string]int{
|
|
"ssh": 25,
|
|
"http": 80,
|
|
"https": 443,
|
|
}
|
|
|
|
t.Run("parsing hcl block case", func(t *testing.T) {
|
|
validHCL := `
|
|
config {
|
|
image = "redis"
|
|
port_map {
|
|
ssh = 25
|
|
http = 80
|
|
https = 443
|
|
}
|
|
}`
|
|
|
|
var tc *TaskConfig
|
|
parser.ParseHCL(t, validHCL, &tc)
|
|
|
|
require.EqualValues(t, expectedMap, tc.PortMap)
|
|
})
|
|
|
|
t.Run("parsing hcl assignment case", func(t *testing.T) {
|
|
validHCL := `
|
|
config {
|
|
image = "redis"
|
|
port_map = {
|
|
ssh = 25
|
|
http = 80
|
|
https = 443
|
|
}
|
|
}`
|
|
|
|
var tc *TaskConfig
|
|
parser.ParseHCL(t, validHCL, &tc)
|
|
|
|
require.EqualValues(t, expectedMap, tc.PortMap)
|
|
})
|
|
|
|
validJsons := []struct {
|
|
name string
|
|
json string
|
|
}{
|
|
{
|
|
"single map in an array",
|
|
`{"Config": {"image": "redis", "port_map": [{"ssh": 25, "http": 80, "https": 443}]}}`,
|
|
},
|
|
{
|
|
"array of single map entries",
|
|
`{"Config": {"image": "redis", "port_map": [{"ssh": 25}, {"http": 80}, {"https": 443}]}}`,
|
|
},
|
|
{
|
|
"array of maps",
|
|
`{"Config": {"image": "redis", "port_map": [{"ssh": 25, "http": 80}, {"https": 443}]}}`,
|
|
},
|
|
}
|
|
|
|
for _, c := range validJsons {
|
|
t.Run("json:"+c.name, func(t *testing.T) {
|
|
var tc *TaskConfig
|
|
parser.ParseJson(t, c.json, &tc)
|
|
|
|
require.EqualValues(t, expectedMap, tc.PortMap)
|
|
})
|
|
}
|
|
|
|
}
|
|
|
|
func TestConfig_ParseAllHCL(t *testing.T) {
|
|
cfgStr := `
|
|
config {
|
|
image = "redis:3.2"
|
|
advertise_ipv6_address = true
|
|
args = ["command_arg1", "command_arg2"]
|
|
auth {
|
|
username = "myusername"
|
|
password = "mypassword"
|
|
email = "myemail@example.com"
|
|
server_address = "https://example.com"
|
|
}
|
|
|
|
auth_soft_fail = true
|
|
cap_add = ["CAP_SYS_NICE"]
|
|
cap_drop = ["CAP_SYS_ADMIN", "CAP_SYS_TIME"]
|
|
command = "/bin/bash"
|
|
cpu_hard_limit = true
|
|
cpu_cfs_period = 20
|
|
devices = [
|
|
{"host_path"="/dev/null", "container_path"="/tmp/container-null", cgroup_permissions="rwm"},
|
|
{"host_path"="/dev/random", "container_path"="/tmp/container-random"},
|
|
]
|
|
dns_search_domains = ["sub.example.com", "sub2.example.com"]
|
|
dns_options = ["debug", "attempts:10"]
|
|
dns_servers = ["8.8.8.8", "1.1.1.1"]
|
|
entrypoint = ["/bin/bash", "-c"]
|
|
extra_hosts = ["127.0.0.1 localhost.example.com"]
|
|
force_pull = true
|
|
hostname = "self.example.com"
|
|
interactive = true
|
|
ipc_mode = "host"
|
|
ipv4_address = "10.0.2.1"
|
|
ipv6_address = "2601:184:407f:b37c:d834:412e:1f86:7699"
|
|
labels {
|
|
owner = "hashicorp-nomad"
|
|
key = "val"
|
|
}
|
|
load = "/tmp/image.tar.gz"
|
|
logging {
|
|
type = "json-file"
|
|
config {
|
|
"max-file" = "3"
|
|
"max-size" = "10m"
|
|
}
|
|
}
|
|
mac_address = "02:42:ac:11:00:02"
|
|
mounts = [
|
|
{
|
|
type = "bind"
|
|
target = "/bind-target",
|
|
source = "/bind-source"
|
|
readonly = true
|
|
bind_options {
|
|
propagation = "rshared"
|
|
}
|
|
},
|
|
{
|
|
type = "tmpfs"
|
|
target = "/tmpfs-target",
|
|
readonly = true
|
|
tmpfs_options {
|
|
size = 30000
|
|
mode = 0777
|
|
}
|
|
},
|
|
{
|
|
type = "volume"
|
|
target = "/volume-target"
|
|
source = "/volume-source"
|
|
readonly = true
|
|
volume_options {
|
|
no_copy = true
|
|
labels {
|
|
label_key = "label_value"
|
|
}
|
|
driver_config {
|
|
name = "nfs"
|
|
options {
|
|
option_key = "option_value"
|
|
}
|
|
}
|
|
}
|
|
},
|
|
]
|
|
network_aliases = ["redis"]
|
|
network_mode = "host"
|
|
pids_limit = 2000
|
|
pid_mode = "host"
|
|
port_map {
|
|
http = 80
|
|
redis = 6379
|
|
}
|
|
privileged = true
|
|
readonly_rootfs = true
|
|
security_opt = [
|
|
"credentialspec=file://gmsaUser.json"
|
|
],
|
|
shm_size = 30000
|
|
storage_opt {
|
|
dm.thinpooldev = "dev/mapper/thin-pool"
|
|
dm.use_deferred_deletion = "true"
|
|
dm.use_deferred_removal = "true"
|
|
|
|
}
|
|
sysctl {
|
|
net.core.somaxconn = "16384"
|
|
}
|
|
tty = true
|
|
ulimit {
|
|
nproc = "4242"
|
|
nofile = "2048:4096"
|
|
}
|
|
uts_mode = "host"
|
|
userns_mode = "host"
|
|
volumes = [
|
|
"/host-path:/container-path:rw",
|
|
]
|
|
volume_driver = "host"
|
|
work_dir = "/tmp/workdir"
|
|
}`
|
|
|
|
expected := &TaskConfig{
|
|
Image: "redis:3.2",
|
|
AdvertiseIPv6Addr: true,
|
|
Args: []string{"command_arg1", "command_arg2"},
|
|
Auth: DockerAuth{
|
|
Username: "myusername",
|
|
Password: "mypassword",
|
|
Email: "myemail@example.com",
|
|
ServerAddr: "https://example.com",
|
|
},
|
|
AuthSoftFail: true,
|
|
CapAdd: []string{"CAP_SYS_NICE"},
|
|
CapDrop: []string{"CAP_SYS_ADMIN", "CAP_SYS_TIME"},
|
|
Command: "/bin/bash",
|
|
CPUHardLimit: true,
|
|
CPUCFSPeriod: 20,
|
|
Devices: []DockerDevice{
|
|
{
|
|
HostPath: "/dev/null",
|
|
ContainerPath: "/tmp/container-null",
|
|
CgroupPermissions: "rwm",
|
|
},
|
|
{
|
|
HostPath: "/dev/random",
|
|
ContainerPath: "/tmp/container-random",
|
|
CgroupPermissions: "",
|
|
},
|
|
},
|
|
DNSSearchDomains: []string{"sub.example.com", "sub2.example.com"},
|
|
DNSOptions: []string{"debug", "attempts:10"},
|
|
DNSServers: []string{"8.8.8.8", "1.1.1.1"},
|
|
Entrypoint: []string{"/bin/bash", "-c"},
|
|
ExtraHosts: []string{"127.0.0.1 localhost.example.com"},
|
|
ForcePull: true,
|
|
Hostname: "self.example.com",
|
|
Interactive: true,
|
|
IPCMode: "host",
|
|
IPv4Address: "10.0.2.1",
|
|
IPv6Address: "2601:184:407f:b37c:d834:412e:1f86:7699",
|
|
Labels: map[string]string{
|
|
"owner": "hashicorp-nomad",
|
|
"key": "val",
|
|
},
|
|
LoadImage: "/tmp/image.tar.gz",
|
|
Logging: DockerLogging{
|
|
Type: "json-file",
|
|
Config: map[string]string{
|
|
"max-file": "3",
|
|
"max-size": "10m",
|
|
}},
|
|
MacAddress: "02:42:ac:11:00:02",
|
|
Mounts: []DockerMount{
|
|
{
|
|
Type: "bind",
|
|
Target: "/bind-target",
|
|
Source: "/bind-source",
|
|
ReadOnly: true,
|
|
BindOptions: DockerBindOptions{
|
|
Propagation: "rshared",
|
|
},
|
|
},
|
|
{
|
|
Type: "tmpfs",
|
|
Target: "/tmpfs-target",
|
|
Source: "",
|
|
ReadOnly: true,
|
|
TmpfsOptions: DockerTmpfsOptions{
|
|
SizeBytes: 30000,
|
|
Mode: 511,
|
|
},
|
|
},
|
|
{
|
|
Type: "volume",
|
|
Target: "/volume-target",
|
|
Source: "/volume-source",
|
|
ReadOnly: true,
|
|
VolumeOptions: DockerVolumeOptions{
|
|
NoCopy: true,
|
|
Labels: map[string]string{
|
|
"label_key": "label_value",
|
|
},
|
|
DriverConfig: DockerVolumeDriverConfig{
|
|
Name: "nfs",
|
|
Options: map[string]string{
|
|
"option_key": "option_value",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
NetworkAliases: []string{"redis"},
|
|
NetworkMode: "host",
|
|
PidsLimit: 2000,
|
|
PidMode: "host",
|
|
PortMap: map[string]int{
|
|
"http": 80,
|
|
"redis": 6379,
|
|
},
|
|
Privileged: true,
|
|
ReadonlyRootfs: true,
|
|
SecurityOpt: []string{
|
|
"credentialspec=file://gmsaUser.json",
|
|
},
|
|
ShmSize: 30000,
|
|
StorageOpt: map[string]string{
|
|
"dm.thinpooldev": "dev/mapper/thin-pool",
|
|
"dm.use_deferred_deletion": "true",
|
|
"dm.use_deferred_removal": "true",
|
|
},
|
|
Sysctl: map[string]string{
|
|
"net.core.somaxconn": "16384",
|
|
},
|
|
TTY: true,
|
|
Ulimit: map[string]string{
|
|
"nofile": "2048:4096",
|
|
"nproc": "4242",
|
|
},
|
|
UTSMode: "host",
|
|
UsernsMode: "host",
|
|
Volumes: []string{
|
|
"/host-path:/container-path:rw",
|
|
},
|
|
VolumeDriver: "host",
|
|
WorkDir: "/tmp/workdir",
|
|
}
|
|
|
|
var tc *TaskConfig
|
|
hclutils.NewConfigParser(taskConfigSpec).ParseHCL(t, cfgStr, &tc)
|
|
|
|
require.EqualValues(t, expected, tc)
|
|
}
|