b8bf504e94
`gosec` linter is able to identify issues described in #6584
e.g.
$ git revert 54e95e6b88
[gosec dfc8ca1ec] Revert "fix Implicit memory aliasing in for loop"
2 files changed, 2 deletions(-)
$ make check
+ proto-fmt
+ check
GOGC=75 golangci-lint run
containerstore.go:192:54: G601: Implicit memory aliasing in for loop. (gosec)
containers = append(containers, containerFromProto(&container))
^
image_store.go:132:42: G601: Implicit memory aliasing in for loop. (gosec)
images = append(images, imageFromProto(&image))
^
make: *** [check] Error 1
I also disabled following two settings which prevent the linter to show a complete list of issues.
* max-issues-per-linter (default 50)
* max-same-issues (default 3)
Furthermore enabling gosec revealed many other issues. For now I blacklisted the ones except G601.
Will create separate tasks to address them one by one moving next.
Signed-off-by: Henry Wang <henwang@amazon.com>
74 lines
1.9 KiB
Go
74 lines
1.9 KiB
Go
/*
|
|
Copyright The containerd Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package images
|
|
|
|
import (
|
|
imagesapi "github.com/containerd/containerd/api/services/images/v1"
|
|
"github.com/containerd/containerd/api/types"
|
|
"github.com/containerd/containerd/images"
|
|
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
|
|
)
|
|
|
|
func imagesToProto(images []images.Image) []imagesapi.Image {
|
|
var imagespb []imagesapi.Image
|
|
|
|
for _, image := range images {
|
|
image := image
|
|
imagespb = append(imagespb, imageToProto(&image))
|
|
}
|
|
|
|
return imagespb
|
|
}
|
|
|
|
func imageToProto(image *images.Image) imagesapi.Image {
|
|
return imagesapi.Image{
|
|
Name: image.Name,
|
|
Labels: image.Labels,
|
|
Target: descToProto(&image.Target),
|
|
CreatedAt: image.CreatedAt,
|
|
UpdatedAt: image.UpdatedAt,
|
|
}
|
|
}
|
|
|
|
func imageFromProto(imagepb *imagesapi.Image) images.Image {
|
|
return images.Image{
|
|
Name: imagepb.Name,
|
|
Labels: imagepb.Labels,
|
|
Target: descFromProto(&imagepb.Target),
|
|
CreatedAt: imagepb.CreatedAt,
|
|
UpdatedAt: imagepb.UpdatedAt,
|
|
}
|
|
}
|
|
|
|
func descFromProto(desc *types.Descriptor) ocispec.Descriptor {
|
|
return ocispec.Descriptor{
|
|
MediaType: desc.MediaType,
|
|
Size: desc.Size_,
|
|
Digest: desc.Digest,
|
|
Annotations: desc.Annotations,
|
|
}
|
|
}
|
|
|
|
func descToProto(desc *ocispec.Descriptor) types.Descriptor {
|
|
return types.Descriptor{
|
|
MediaType: desc.MediaType,
|
|
Size_: desc.Size,
|
|
Digest: desc.Digest,
|
|
Annotations: desc.Annotations,
|
|
}
|
|
}
|