🐛 Update BurntSushi/toml and emicklei/go-restful (#203)

* Update BurntSushi/toml and emicklei/go-restful
* Also update in vendor/modules.txt
* Fix error: unknown flag: --out-format
* Remove old files from toml, go-restful/v3
* Pull in the vendored updates.
* More updates from `go mod vendor`.
* Remove old mods from go.sum.

Signed-off-by: Kurt Garloff <[email protected]>

Author: garloff

.golangci.yml

@@ -84,7 +84,7 @@ ifeq ($(BUILD_IN_CONTAINER),true)
 else
 	go version
 	golangci-lint version
-	golangci-lint run -v --out-format=github-actions
+	golangci-lint run -v # --out-format=github-actions
 endif
 
 .PHONY: lint-yaml

Makefile

@@ -69,5 +69,5 @@ func main() {
 	fmt.Printf("releaseDir: %s\n", releaseDir)
 	fmt.Printf("nodeImageRegistry: %s\n", nodeImageRegistry)
 	fmt.Printf("..... pretending to read config: %s\n", config.Config.Provider.Config["dummyKey"])
-	fmt.Printf("..... pretending to do heavy work (creating node images) ...\n")
+	fmt.Print("..... pretending to do heavy work (creating node images) ...\n")
 }

csctldocker/csctldocker_main.go

@@ -22,7 +22,7 @@ require (
 	dario.cat/mergo v1.0.1 // indirect
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/BurntSushi/toml v1.4.0 // indirect
+	github.com/BurntSushi/toml v1.6.0 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.3.0 // indirect
@@ -46,7 +46,7 @@ require (
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect

go.mod

@@ -8,8 +8,8 @@ github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
-github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
+github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
 github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
 github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
@@ -106,8 +106,8 @@ github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQ
 github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
 github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4=
 github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
-github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
-github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes=
+github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=

go.sum

@@ -20,11 +20,11 @@ import (
 	"fmt"
 
 	"github.com/SovereignCloudStack/cluster-stack-operator/pkg/version"
-	"github.com/SovereignCloudStack/csctl/pkg/hash"
+	"github.com/SovereignCloudStack/csctl/pkg/cshash"
 )
 
 // HandleStableMode returns metadata for the stable mode.
-func HandleStableMode(gitHubReleasePath string, currentReleaseHash, latestReleaseHash hash.ReleaseHash) (*MetaData, error) {
+func HandleStableMode(gitHubReleasePath string, currentReleaseHash, latestReleaseHash cshash.ReleaseHash) (*MetaData, error) {
 	metadata, err := ParseMetaData(gitHubReleasePath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse metadata: %w", err)
@@ -63,7 +63,7 @@ func HandleStableMode(gitHubReleasePath string, currentReleaseHash, latestReleas
 }
 
 // HandleHashMode handles the hash mode with the cluster stack hash.
-func HandleHashMode(currentRelease hash.ReleaseHash, kubernetesVersion string) *MetaData {
+func HandleHashMode(currentRelease cshash.ReleaseHash, kubernetesVersion string) *MetaData {
 	clusterStackHash := currentRelease.GetClusterStackHash()
 	clusterStackHash = fmt.Sprintf("v0-sha.%s", clusterStackHash)
 

pkg/clusterstack/mode.go

@@ -28,7 +28,7 @@ import (
 	"github.com/SovereignCloudStack/csctl/pkg/assetsclient/github"
 	"github.com/SovereignCloudStack/csctl/pkg/assetsclient/oci"
 	"github.com/SovereignCloudStack/csctl/pkg/clusterstack"
-	"github.com/SovereignCloudStack/csctl/pkg/hash"
+	"github.com/SovereignCloudStack/csctl/pkg/cshash"
 	"github.com/SovereignCloudStack/csctl/pkg/providerplugin"
 	"github.com/SovereignCloudStack/csctl/pkg/template"
 	"github.com/spf13/cobra"
@@ -73,8 +73,8 @@ type CreateOptions struct {
 	ClusterStackReleaseDir    string
 	Config                    *clusterstack.CsctlConfig
 	Metadata                  *clusterstack.MetaData
-	CurrentReleaseHash        hash.ReleaseHash
-	LatestReleaseHash         hash.ReleaseHash
+	CurrentReleaseHash        cshash.ReleaseHash
+	LatestReleaseHash         cshash.ReleaseHash
 	NodeImageRegistry         string
 	releaseName               string
 }
@@ -127,7 +127,7 @@ func GetCreateOptions(ctx context.Context, clusterStackPath string) (*CreateOpti
 		return createOption, fmt.Errorf("providerplugin.GetProviderExecutable(&config) failed: %w", err)
 	}
 
-	currentHash, err := hash.GetHash(clusterStackPath)
+	currentHash, err := cshash.GetHash(clusterStackPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get hash: %w", err)
 	}
@@ -147,6 +147,8 @@ func GetCreateOptions(ctx context.Context, clusterStackPath string) (*CreateOpti
 			remoteFactory = github.NewFactory()
 		case "oci":
 			remoteFactory = oci.NewFactory()
+		default:
+			return nil, errors.New("please provide a valied remote repo")
 		}
 
 		ac, err := remoteFactory.NewClient(ctx)
@@ -171,7 +173,7 @@ func GetCreateOptions(ctx context.Context, clusterStackPath string) (*CreateOpti
 				return nil, fmt.Errorf("failed to download release asset: %w", err)
 			}
 
-			createOption.LatestReleaseHash, err = hash.ParseReleaseHash("./.tmp/release/hashes.json")
+			createOption.LatestReleaseHash, err = cshash.ParseReleaseHash("./.tmp/release/hashes.json")
 			if err != nil {
 				return nil, fmt.Errorf("failed to read hash from the github: %w", err)
 			}
@@ -199,6 +201,8 @@ func GetCreateOptions(ctx context.Context, clusterStackPath string) (*CreateOpti
 		if err != nil {
 			return nil, fmt.Errorf("failed to handle custom mode: %w", err)
 		}
+	default:
+		return nil, errors.New("please use a valid mode")
 	}
 
 	releaseDirName, err := clusterstack.GetClusterStackReleaseDirectoryName(createOption.Metadata, createOption.Config)

pkg/cmd/create.go

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package hash contains important functions of hash.
-package hash
+// Package cshash contains important functions of hash.
+package cshash
 
 import (
 	"crypto/sha256"
@@ -92,6 +92,9 @@ func GetHash(path string) (ReleaseHash, error) {
 				releaseHash.ClusterAddonDir = hash
 			case nodeImageDirName:
 				releaseHash.NodeImageDir = hash
+			default:
+				// Should not happen
+				return ReleaseHash{}, fmt.Errorf("unknown name type %s", entryPath)
 			}
 		} else if !entry.IsDir() && entry.Name() == clusterAddonValuesFileName {
 			file, _ := os.Open(filepath.Clean(entryPath))