kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Address unhandled deadcode issues

Browse Source 
- 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:
Jonathon Anderson
2025-05-10 11:26:11 -06:00
parent 29dc9da041
commit b5d72fb393
4 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -96,7 +96,7 @@ staticcheck: $(GOLANG_STATICCHECK) $(config) ## Run static code check
.PHONY: deadcode .PHONY: deadcode
deadcode: $(config) ## Check for unused code deadcode: $(config) ## Check for unused code
$(GOLANG_DEADCODE) -test ./... test $$($(GOLANG_DEADCODE) -test ./... | tee /dev/stderr | wc -l) = 0
.PHONY: vet .PHONY: vet
vet: $(config) ## Check for invalid code vet: $(config) ## Check for invalid code

1
go.mod
View File

@@ -17,7 +17,6 @@ require (
github.com/creasty/defaults v1.8.0 github.com/creasty/defaults v1.8.0
github.com/fatih/color v1.18.0 github.com/fatih/color v1.18.0
github.com/go-chi/chi/v5 v5.2.1 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/google/uuid v1.6.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1
github.com/hashicorp/go-version v1.7.0 github.com/hashicorp/go-version v1.7.0

2
go.sum
View File

@@ -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 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= 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 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/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.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

10
internal/pkg/api/image/image.go
View File

@@ -230,14 +230,8 @@ func ImageList() (imageInfo []*wwapiv1.ImageInfo, err error) {
if err == nil { if err == nil {
modTime = uint64(imageStat.ModTime().Unix()) modTime = uint64(imageStat.ModTime().Unix())
} }
imgSize := 0 imgSize := image.ImageSize(source)
if imgF, err := os.Stat(image.ImageFile(source)); err == nil { imgCSize := image.CompressedImageSize(source)
imgSize = int(imgF.Size())
}
imgCSize := 0
if imgFC, err := os.Stat(image.ImageFile(source) + ".gz"); err == nil {
imgCSize = int(imgFC.Size())
}
imageInfo = append(imageInfo, &wwapiv1.ImageInfo{ imageInfo = append(imageInfo, &wwapiv1.ImageInfo{
Name: source, Name: source,
NodeCount: uint32(nodemap[source]), NodeCount: uint32(nodemap[source]),