github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9017 from Juneezee/refactor/redundant-nil-check

Browse Source 
Remove redundant nil check
This commit is contained in:
Derek McGowan 2023-08-28 06:55:10 -07:00 committed by GitHub
commit 2a806c710a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
container.go
View File

@ -275,15 +275,13 @@ func (c *container) NewTask(ctx context.Context, ioCreate cio.Creator, opts ...N
return nil, err return nil, err
} }
} }
if info.RootFS != nil { for _, m := range info.RootFS {
for _, m := range info.RootFS { request.Rootfs = append(request.Rootfs, &types.Mount{
request.Rootfs = append(request.Rootfs, &types.Mount{ Type: m.Type,
Type: m.Type, Source: m.Source,
Source: m.Source, Target: m.Target,
Target: m.Target, Options: m.Options,
Options: m.Options, })
})
}
} }
request.RuntimePath = info.RuntimePath request.RuntimePath = info.RuntimePath
if info.Options != nil { if info.Options != nil {

42
remotes/docker/config/hosts.go
View File

@ -193,29 +193,27 @@ func ConfigureHosts(ctx context.Context, options HostOptions) docker.RegistryHos
} }
} }
if host.clientPairs != nil { for _, pair := range host.clientPairs {
for _, pair := range host.clientPairs { certPEMBlock, err := os.ReadFile(pair[0])
certPEMBlock, err := os.ReadFile(pair[0]) if err != nil {
if err != nil { return nil, fmt.Errorf("unable to read CERT file %q: %w", pair[0], err)
return nil, fmt.Errorf("unable to read CERT file %q: %w", pair[0], err)
}
var keyPEMBlock []byte
if pair[1] != "" {
keyPEMBlock, err = os.ReadFile(pair[1])
if err != nil {
return nil, fmt.Errorf("unable to read CERT file %q: %w", pair[1], err)
}
} else {
// Load key block from same PEM file
keyPEMBlock = certPEMBlock
}
cert, err := tls.X509KeyPair(certPEMBlock, keyPEMBlock)
if err != nil {
return nil, fmt.Errorf("failed to load X509 key pair: %w", err)
}
tlsConfig.Certificates = append(tlsConfig.Certificates, cert)
} }
var keyPEMBlock []byte
if pair[1] != "" {
keyPEMBlock, err = os.ReadFile(pair[1])
if err != nil {
return nil, fmt.Errorf("unable to read CERT file %q: %w", pair[1], err)
}
} else {
// Load key block from same PEM file
keyPEMBlock = certPEMBlock
}
cert, err := tls.X509KeyPair(certPEMBlock, keyPEMBlock)
if err != nil {
return nil, fmt.Errorf("failed to load X509 key pair: %w", err)
}
tlsConfig.Certificates = append(tlsConfig.Certificates, cert)
} }
c := *client c := *client