Address unhandled deadcode issues
- Fix `make deadcode` to properly fail GitHub checks - Resolve "dead" code by refactoring other code to use it Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
2
Makefile
2
Makefile
@@ -96,7 +96,7 @@ staticcheck: $(GOLANG_STATICCHECK) $(config) ## Run static code check
|
||||
|
||||
.PHONY: deadcode
|
||||
deadcode: $(config) ## Check for unused code
|
||||
$(GOLANG_DEADCODE) -test ./...
|
||||
test $$($(GOLANG_DEADCODE) -test ./... | tee /dev/stderr | wc -l) = 0
|
||||
|
||||
.PHONY: vet
|
||||
vet: $(config) ## Check for invalid code
|
||||
|
||||
1
go.mod
1
go.mod
@@ -17,7 +17,6 @@ require (
|
||||
github.com/creasty/defaults v1.8.0
|
||||
github.com/fatih/color v1.18.0
|
||||
github.com/go-chi/chi/v5 v5.2.1
|
||||
github.com/golang/glog v1.2.4
|
||||
github.com/google/uuid v1.6.0
|
||||
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1
|
||||
github.com/hashicorp/go-version v1.7.0
|
||||
|
||||
2
go.sum
2
go.sum
@@ -160,8 +160,6 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
|
||||
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
||||
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||
github.com/golang/glog v1.2.4 h1:CNNw5U8lSiiBk7druxtSHHTsRWcxKoac6kZKm2peBBc=
|
||||
github.com/golang/glog v1.2.4/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
|
||||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
|
||||
@@ -230,14 +230,8 @@ func ImageList() (imageInfo []*wwapiv1.ImageInfo, err error) {
|
||||
if err == nil {
|
||||
modTime = uint64(imageStat.ModTime().Unix())
|
||||
}
|
||||
imgSize := 0
|
||||
if imgF, err := os.Stat(image.ImageFile(source)); err == nil {
|
||||
imgSize = int(imgF.Size())
|
||||
}
|
||||
imgCSize := 0
|
||||
if imgFC, err := os.Stat(image.ImageFile(source) + ".gz"); err == nil {
|
||||
imgCSize = int(imgFC.Size())
|
||||
}
|
||||
imgSize := image.ImageSize(source)
|
||||
imgCSize := image.CompressedImageSize(source)
|
||||
imageInfo = append(imageInfo, &wwapiv1.ImageInfo{
|
||||
Name: source,
|
||||
NodeCount: uint32(nodemap[source]),
|
||||
|
||||
Reference in New Issue
Block a user