Merge remote-tracking branch 'origin/staging': Release v0.7.1

Author: iolave

.gitignore

@@ -3,8 +3,8 @@ bin
 **/*/.DS_Store
 .DS_Store
 **/*.swp
-cover*
 site/
 docs/go-client/pkg/*
 docs/**/swag*
 docs/**/docs.go
+.coverage

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v0.7.1]
+### PVE API client
+#### Fixed
+- Removed unused imports.
+
 ## [v0.7.0]
 ### PVE API wrapper
 #### Added
@@ -142,7 +147,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Proxmox api token credentials support.
 - Proxmox api version endpoint.
 
-[unreleased]: https://github.com/iolave/go-proxmox/compare/v0.7.0...staging
+[unreleased]: https://github.com/iolave/go-proxmox/compare/v0.7.1...staging
+[v0.7.1]: https://github.com/iolave/go-proxmox/releases/tag/v0.7.1
 [v0.7.0]: https://github.com/iolave/go-proxmox/releases/tag/v0.7.0
 [v0.6.1]: https://github.com/iolave/go-proxmox/releases/tag/v0.6.1
 [v0.6.0]: https://github.com/iolave/go-proxmox/releases/tag/v0.6.0

Makefile

@@ -1,36 +1,30 @@
 GOBIN ?= $$(go env GOPATH)/bin
 
-.PHONY: install-go-test-coverage install-docs-dependencies
-
-install-go-test-coverage:
-go install github.com/vladopajic/go-test-coverage/v2@latest
-
+.PHONY: install-docs-dependencies
 install-docs-dependencies:
 ./scripts/install-docs-deps.sh
 
+.phony: install-dependencies
 install-dependencies: install-docs-dependencies
 go mod tidy
 
+.PHONY: test
+test:
+go test -v ./...
 
-.PHONY: coverage-check
-coverage-check: install-go-test-coverage
-go test -v ./... -coverprofile=./cover.out -covermode=atomic -coverpkg=./...
-${GOBIN}/go-test-coverage --config=./.testcoverage.yml
-
-coverage-report: 
-go tool cover -html=cover.out -o=cover.html
-
+.PHONY: coverage
 coverage:
-$(MAKE) $(MAKEFLAGS) coverage-check; rc=$$? \
- ; $(MAKE) $(MAKEFLAGS) coverage-report \
- ; exit $$rc
+./scripts/coverage.sh
 
+.PHONY: generate-docs
 generate-docs: install-docs-dependencies
 bash ./scripts/generate-docs.sh
 
+.PHONY: preview-docs
 preview-docs: install-docs-dependencies generate-docs
 bash ./scripts/preview-docs.sh
 
+.PHONY: build
 build: install-dependencies
 $(eval $@GOOS = linux)
 $(eval $@GOARCH = amd64)
@@ -55,6 +49,4 @@ build: install-dependencies
 $(eval $@GOOS = darwin)
 $(eval $@GOARCH = amd64)
 CGO_ENABLED=0 GOOS=$($@GOOS) GOARCH=$($@GOARCH) go build -ldflags="-extldflags=-static" -o "bin/pve-api-wrapper-$($@GOOS)-$($@GOARCH)" ./cmd/pve_api_wrapper/pve_api_wrapper.go
-test:
-go test -v ./...
 

pkg/pve/pve_lxc.go

@@ -5,7 +5,6 @@ import (
 "net/http"
 "net/url"
 "path"
-"slices"
 "strconv"
 
 "github.com/iolave/go-proxmox/internal/api_def"

pkg/pve/pve_test.go

@@ -157,7 +157,7 @@ func TestBuildHttpRequestUrl(t *testing.T) {
 }
 
 for i := 0; i < len(testCases); i++ {
-result := api.httpClient.buildRequestUrl(testCases[i])
+result := api.client.buildRequestUrl(testCases[i])
 
 if result != expected {
 t.Fatalf(`buildRequestUrl("%s"), expected "%s", got "%s"`, testCases[i], expected, result)

scripts/coverage.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# checks/install uncover
+which uncover &> /dev/null
+if [ "$?" -ne "0" ]; then
+set -e
+	go install github.com/gregoryv/uncover/cmd/uncover@v0.9.0
+set +e
+fi
+
+# Test and create a .coverage file
+PKG_LIST=$(go list ./... | grep -v /vendor/ | xargs) 
+go test -covermode=count -coverprofile .coverage $PKG_LIST
+if [ "$?" -ne "0" ]; then
+rm -rf .coverage
+exit 1
+fi
+
+# Do the coverage
+uncover -min 85 .coverage
+if [ "$?" -ne "0" ]; then
+rm -rf .coverage
+exit 1
+fi
+