containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix lint 

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon 2020-07-14 09:44:56 -04:00
parent 1fdfd52eeb
commit fbc1167c4d
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libpod/pod_api.go
View File

@ -494,33 +494,23 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) {
if len(p.config.InfraContainer.DNSServer) > 0 {
infraConfig.DNSServer = make([]string, 0, len(p.config.InfraContainer.DNSServer))
for _, i := range p.config.InfraContainer.DNSServer {
infraConfig.DNSServer = append(infraConfig.DNSServer, i)
}
infraConfig.DNSServer = append(infraConfig.DNSServer, p.config.InfraContainer.DNSServer...)
}
if len(p.config.InfraContainer.DNSSearch) > 0 {
infraConfig.DNSSearch = make([]string, 0, len(p.config.InfraContainer.DNSSearch))
for _, i := range p.config.InfraContainer.DNSSearch {
infraConfig.DNSSearch = append(infraConfig.DNSSearch, i)
}
infraConfig.DNSSearch = append(infraConfig.DNSSearch, p.config.InfraContainer.DNSSearch...)
}
if len(p.config.InfraContainer.DNSOption) > 0 {
infraConfig.DNSOption = make([]string, 0, len(p.config.InfraContainer.DNSOption))
for _, i := range p.config.InfraContainer.DNSOption {
infraConfig.DNSOption = append(infraConfig.DNSOption, i)
}
infraConfig.DNSOption = append(infraConfig.DNSOption, p.config.InfraContainer.DNSOption...)
}
if len(p.config.InfraContainer.HostAdd) > 0 {
infraConfig.HostAdd = make([]string, 0, len(p.config.InfraContainer.HostAdd))
for _, i := range p.config.InfraContainer.HostAdd {
infraConfig.HostAdd = append(infraConfig.HostAdd, i)
}
infraConfig.HostAdd = append(infraConfig.HostAdd, p.config.InfraContainer.HostAdd...)
}
if len(p.config.InfraContainer.Networks) > 0 {
infraConfig.Networks = make([]string, 0, len(p.config.InfraContainer.Networks))
for _, i := range p.config.InfraContainer.Networks {
infraConfig.Networks = append(infraConfig.Networks, i)
}
infraConfig.Networks = append(infraConfig.Networks, p.config.InfraContainer.Networks...)
}
infraConfig.PortBindings = makeInspectPortBindings(p.config.InfraContainer.PortBindings)

7
test/e2e/pod_inspect_test.go
View File

@ -1,6 +1,7 @@
package integration
import (
"encoding/json"
"os"
"github.com/containers/libpod/v2/libpod/define"
@ -84,7 +85,7 @@ var _ = Describe("Podman pod inspect", func() {
It("podman pod inspect outputs port bindings", func() {
podName := "testPod"
create := podmanTest.Podman([]string{"pod", "create", "--name", testPod, "-p", "8080:80"})
create := podmanTest.Podman([]string{"pod", "create", "--name", podName, "-p", "8080:80"})
create.WaitWithDefaultTimeout()
Expect(create.ExitCode()).To(Equal(0))
@ -96,7 +97,7 @@ var _ = Describe("Podman pod inspect", func() {
err := json.Unmarshal(inspectOut.Out.Contents(), inspectJSON)
Expect(err).To(BeNil())
Expect(inspectJSON.InfraConfig).To(Not(BeNil()))
Expect(len(inspectJSON.PortBindings["80/tcp"])).To(Equal(1))
Expect(inspectJSON.PortBindings["80/tcp"].HostPort).To(Equal("8080"))
Expect(len(inspectJSON.InfraConfig.PortBindings["80/tcp"])).To(Equal(1))
Expect(inspectJSON.InfraConfig.PortBindings["80/tcp"][0].HostPort).To(Equal("8080"))
})
})