mirror of
https://github.com/minio/minio.git
synced 2024-12-24 22:25:54 -05:00
Move go version check into main() (#3734)
Previously the check was done in init(). This patch moves into main for unit testable friendly function.
This commit is contained in:
parent
25b936c369
commit
440866d26c
1
Makefile
1
Makefile
@ -107,6 +107,7 @@ spelling:
|
|||||||
|
|
||||||
test: build
|
test: build
|
||||||
@echo "Running all minio testing:"
|
@echo "Running all minio testing:"
|
||||||
|
@go test $(GOFLAGS) .
|
||||||
@go test $(GOFLAGS) github.com/minio/minio/cmd...
|
@go test $(GOFLAGS) github.com/minio/minio/cmd...
|
||||||
@go test $(GOFLAGS) github.com/minio/minio/pkg...
|
@go test $(GOFLAGS) github.com/minio/minio/pkg...
|
||||||
|
|
||||||
|
@ -31,11 +31,6 @@ import (
|
|||||||
"github.com/minio/minio/pkg/objcache"
|
"github.com/minio/minio/pkg/objcache"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Global constants for Minio.
|
|
||||||
const (
|
|
||||||
minGoVersion = ">= 1.7" // Minio requires at least Go v1.7
|
|
||||||
)
|
|
||||||
|
|
||||||
// minio configuration related constants.
|
// minio configuration related constants.
|
||||||
const (
|
const (
|
||||||
globalMinioConfigVersion = "13"
|
globalMinioConfigVersion = "13"
|
||||||
|
@ -65,12 +65,6 @@ VERSION:
|
|||||||
` + Version +
|
` + Version +
|
||||||
`{{ "\n"}}`
|
`{{ "\n"}}`
|
||||||
|
|
||||||
// init - check the environment before main starts
|
|
||||||
func init() {
|
|
||||||
// Check if minio was compiled using a supported version of Golang.
|
|
||||||
checkGoVersion()
|
|
||||||
}
|
|
||||||
|
|
||||||
func migrate() {
|
func migrate() {
|
||||||
// Migrate config file
|
// Migrate config file
|
||||||
err := migrateConfig()
|
err := migrateConfig()
|
||||||
|
@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* Minio Cloud Storage, (C) 2015, 2016 Minio, Inc.
|
|
||||||
*
|
|
||||||
* 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 cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"runtime"
|
|
||||||
|
|
||||||
"github.com/hashicorp/go-version"
|
|
||||||
"github.com/minio/mc/pkg/console"
|
|
||||||
)
|
|
||||||
|
|
||||||
// check if minimum Go version is met.
|
|
||||||
func checkGoVersion() {
|
|
||||||
// Current version.
|
|
||||||
curVersion, e := version.NewVersion(runtime.Version()[2:])
|
|
||||||
if e != nil {
|
|
||||||
console.Fatalln("Unable to determine current go version.", e)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prepare version constraint.
|
|
||||||
constraints, e := version.NewConstraint(minGoVersion)
|
|
||||||
if e != nil {
|
|
||||||
console.Fatalln("Unable to check go version.")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for minimum version.
|
|
||||||
if !constraints.Check(curVersion) {
|
|
||||||
console.Fatalln(fmt.Sprintf("Please recompile Minio with Golang version %s.", minGoVersion))
|
|
||||||
}
|
|
||||||
}
|
|
38
main.go
38
main.go
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Minio Cloud Storage, (C) 2016 Minio, Inc.
|
* Minio Cloud Storage, (C) 2016,2017 Minio, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -23,11 +23,47 @@
|
|||||||
package main // import "github.com/minio/minio"
|
package main // import "github.com/minio/minio"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"runtime"
|
||||||
|
|
||||||
|
version "github.com/hashicorp/go-version"
|
||||||
|
"github.com/minio/mc/pkg/console"
|
||||||
minio "github.com/minio/minio/cmd"
|
minio "github.com/minio/minio/cmd"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// Minio requires at least Go v1.7
|
||||||
|
minGoVersion = "1.7"
|
||||||
|
goVersionConstraint = ">= " + minGoVersion
|
||||||
|
)
|
||||||
|
|
||||||
|
// Check if this binary is compiled with at least minimum Go version.
|
||||||
|
func checkGoVersion(goVersionStr string) error {
|
||||||
|
constraint, err := version.NewConstraint(goVersionConstraint)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("'%s': %s", goVersionConstraint, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
goVersion, err := version.NewVersion(goVersionStr)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !constraint.Check(goVersion) {
|
||||||
|
return fmt.Errorf("Minio is not compiled by Go %s. Please recompile accordingly.",
|
||||||
|
goVersionConstraint)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
// When `go get` is used minimum Go version check is not triggered but it would have compiled it successfully.
|
||||||
|
// However such binary will fail at runtime, hence we also check Go version at runtime.
|
||||||
|
if err := checkGoVersion(runtime.Version()[2:]); err != nil {
|
||||||
|
console.Fatalln("Go runtime version check failed.", err)
|
||||||
|
}
|
||||||
|
|
||||||
minio.Main(os.Args, os.Exit)
|
minio.Main(os.Args, os.Exit)
|
||||||
}
|
}
|
||||||
|
50
main_test.go
Normal file
50
main_test.go
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
* Minio Cloud Storage, (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* 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 main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestCheckGoVersion(t *testing.T) {
|
||||||
|
// Test success cases.
|
||||||
|
testCases := []struct {
|
||||||
|
version string
|
||||||
|
expectedErr error
|
||||||
|
}{
|
||||||
|
{minGoVersion, nil},
|
||||||
|
{minGoVersion + ".10", nil},
|
||||||
|
{"1.6.8", fmt.Errorf("Minio is not compiled by Go >= 1.7. Please recompile accordingly.")},
|
||||||
|
{"0.1", fmt.Errorf("Minio is not compiled by Go >= 1.7. Please recompile accordingly.")},
|
||||||
|
{".1", fmt.Errorf("Malformed version: .1")},
|
||||||
|
{"somejunk", fmt.Errorf("Malformed version: somejunk")},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, testCase := range testCases {
|
||||||
|
err := checkGoVersion(testCase.version)
|
||||||
|
if testCase.expectedErr == nil {
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("expected: %v, got: %v", testCase.expectedErr, err)
|
||||||
|
}
|
||||||
|
} else if err == nil {
|
||||||
|
t.Fatalf("expected: %v, got: %v", testCase.expectedErr, err)
|
||||||
|
} else if testCase.expectedErr.Error() != err.Error() {
|
||||||
|
t.Fatalf("expected: %v, got: %v", testCase.expectedErr, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user