jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-03-03 15:02:35 +02:00
Code Issues Releases Activity

fixed findings

Browse Source
This commit is contained in:
Sascha Vornheder 2019-11-18 07:53:32 +01:00
parent c7f3e5c4f0
commit 4c747c05ca
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/config/stepmeta.go
View File

@ -80,22 +80,22 @@ type StepSecrets struct {
// Container defines an execution container
type Container struct {
//ToDo: check dockerOptions, dockerVolumeBind, containerPortMappings, sidecarOptions, sidecarVolumeBind
Command []string `json:"command"`
EnvVars []EnvVar `json:"env"`
Image string `json:"image"`
ImagePullPolicy string `json:"imagePullPolicy"`
Name string `json:"name"`
ReadyCommand string `json:"readyCommand"`
Shell string `json:"shell"`
WorkingDir string `json:"workingDir"`
Conditions []Condition `json:"conditions,omitempty"`
VolumeBind []VolumeBind `json:"volumeBind,omitempty"`
Command []string `json:"command"`
EnvVars []EnvVar `json:"env"`
Image string `json:"image"`
ImagePullPolicy string `json:"imagePullPolicy"`
Name string `json:"name"`
ReadyCommand string `json:"readyCommand"`
Shell string `json:"shell"`
WorkingDir string `json:"workingDir"`
Conditions []Condition `json:"conditions,omitempty"`
VolumeMounts []VolumeMount `json:"volumeMounts,omitempty"`
}
// VolumeBind defines an environment variable
type VolumeBind struct {
Name string `json:"name"`
Value string `json:"value"`
// VolumeMount defines an mount path
type VolumeMount struct {
MountPath string `json:"mountPath"`
Name string `json:"name"`
}
// EnvVar defines an environment variable
@ -236,7 +236,7 @@ func (m *StepData) GetContextDefaults(stepName string) (io.ReadCloser, error) {
p["dockerName"] = container.Name
p["dockerPullImage"] = container.ImagePullPolicy != "Never"
p["dockerWorkspace"] = container.WorkingDir
p["dockerVolumeBind"] = volumeBindAsStringSlice(container.VolumeBind)
p["dockerVolumeBind"] = volumeMountsAsStringSlice(container.VolumeMounts)
// Ready command not relevant for main runtime container so far
//p[] = container.ReadyCommand
@ -254,7 +254,7 @@ func (m *StepData) GetContextDefaults(stepName string) (io.ReadCloser, error) {
root["sidecarPullImage"] = m.Spec.Sidecars[0].ImagePullPolicy != "Never"
root["sidecarReadyCommand"] = m.Spec.Sidecars[0].ReadyCommand
root["sidecarWorkspace"] = m.Spec.Sidecars[0].WorkingDir
root["sidecarVolumeBind"] = volumeBindAsStringSlice(m.Spec.Sidecars[0].VolumeBind)
root["sidecarVolumeBind"] = volumeMountsAsStringSlice(m.Spec.Sidecars[0].VolumeMounts)
}
// not filled for now since this is not relevant in Kubernetes case
@ -318,10 +318,10 @@ func envVarsAsStringSlice(envVars []EnvVar) []string {
return e
}
func volumeBindAsStringSlice(volumeBind []VolumeBind) []string {
func volumeMountsAsStringSlice(volumeMounts []VolumeMount) []string {
e := []string{}
for _, v := range volumeBind {
e = append(e, fmt.Sprintf("%v:%v", v.Name, v.Value))
for _, v := range volumeMounts {
e = append(e, fmt.Sprintf("%v:%v", v.MountPath, v.Name))
}
return e
}

12
pkg/config/stepmeta_test.go
View File

@ -338,9 +338,9 @@ func TestGetContextDefaults(t *testing.T) {
Image: "testImage:tag",
Shell: "/bin/bash",
WorkingDir: "/test/dir",
VolumeBind: []VolumeBind{
{Name: "vbn1", Value: "vbv1"},
{Name: "vbn2", Value: "vbv2"},
VolumeMounts: []VolumeMount{
{MountPath: "vbn1", Name: "vbv1"},
{MountPath: "vbn2", Name: "vbv2"},
},
},
},
@ -356,9 +356,9 @@ func TestGetContextDefaults(t *testing.T) {
ImagePullPolicy: "Never",
ReadyCommand: "/sidecar/command",
WorkingDir: "/sidecar/dir",
VolumeBind: []VolumeBind{
{Name: "vbn3", Value: "vbv3"},
{Name: "vbn4", Value: "vbv4"},
VolumeMounts: []VolumeMount{
{MountPath: "vbn3", Name: "vbv3"},
{MountPath: "vbn4", Name: "vbv4"},
},
},
},