From 29d3460b6fa26bc988d3131ac8bc5668a4111b2b Mon Sep 17 00:00:00 2001 From: Tim Gross Date: Mon, 8 Mar 2021 08:40:08 -0500 Subject: [PATCH] reduce string manipulation --- drivers/docker/driver.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/docker/driver.go b/drivers/docker/driver.go index 7459c619e1d4..2fa3cc24db75 100644 --- a/drivers/docker/driver.go +++ b/drivers/docker/driver.go @@ -1127,25 +1127,25 @@ func (d *Driver) createContainerConfig(task *drivers.TaskConfig, driverConfig *T //optional labels, as configured in plugin configuration for _, configurationExtraLabel := range d.config.ExtraLabels { - if glob.Glob(configurationExtraLabel, strings.Split(dockerLabelJobName, ".")[3]) { + if glob.Glob(configurationExtraLabel, "job_name") { labels[dockerLabelJobName] = task.JobName } - if glob.Glob(configurationExtraLabel, strings.Split(dockerLabelJobID, ".")[3]) { + if glob.Glob(configurationExtraLabel, "job_id") { labels[dockerLabelJobID] = task.JobID } - if glob.Glob(configurationExtraLabel, strings.Split(dockerLabelTaskGroupName, ".")[3]) { + if glob.Glob(configurationExtraLabel, "task_group_name") { labels[dockerLabelTaskGroupName] = task.TaskGroupName } - if glob.Glob(configurationExtraLabel, strings.Split(dockerLabelTaskName, ".")[3]) { + if glob.Glob(configurationExtraLabel, "task_name") { labels[dockerLabelTaskName] = task.Name } - if glob.Glob(configurationExtraLabel, strings.Split(dockerLabelNamespace, ".")[3]) { + if glob.Glob(configurationExtraLabel, "namespace") { labels[dockerLabelNamespace] = task.Namespace } - if glob.Glob(configurationExtraLabel, strings.Split(dockerLabelNodeName, ".")[3]) { + if glob.Glob(configurationExtraLabel, "node_name") { labels[dockerLabelNodeName] = task.NodeName } - if glob.Glob(configurationExtraLabel, strings.Split(dockerLabelNodeID, ".")[3]) { + if glob.Glob(configurationExtraLabel, "node_id") { labels[dockerLabelNodeID] = task.NodeID } }