mirror of
https://github.com/nabbar/golib.git
synced 2025-12-24 11:51:02 +08:00
Package Status:
- Rework for the management of mandatory components to qualify the global status. - Added qualification to components: "should", "must", "one of". - These qualifications will influence the overall state but not the unitary state of each component. Package Socket: - Creation package to open and listen local unix file socket - Allow to specify a handler who's needing a conn instance as entry - Create a client sub package to allow negociate with the local unix file socket Package Shell: - adding sub package for command and command collection Package Monitor: - add function to expose monitor command for shell Package Config: - add function to expose monitor command for shell Package Network: - Add "IP" protocol Pakcage Httpcli: - Rework the construction of the client - Add capability to specify proxy url Package Cobra: - add function to add flag to global command like verbose or config Package Log: - fix seg fault when calling a nil instance - remove println in hookfile / hooksyslog
This commit is contained in:
@@ -43,19 +43,19 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/hashicorp/go-uuid"
|
||||
"github.com/nabbar/golib/aws"
|
||||
"github.com/nabbar/golib/aws/configCustom"
|
||||
"github.com/nabbar/golib/httpcli"
|
||||
"github.com/nabbar/golib/password"
|
||||
lbuuid "github.com/hashicorp/go-uuid"
|
||||
libaws "github.com/nabbar/golib/aws"
|
||||
awscfg "github.com/nabbar/golib/aws/configCustom"
|
||||
libhtc "github.com/nabbar/golib/httpcli"
|
||||
libpwd "github.com/nabbar/golib/password"
|
||||
libsiz "github.com/nabbar/golib/size"
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
)
|
||||
|
||||
var (
|
||||
cli aws.AWS
|
||||
cfg aws.Config
|
||||
cli libaws.AWS
|
||||
cfg libaws.Config
|
||||
ctx context.Context
|
||||
cnl context.CancelFunc
|
||||
filename = "./config.json"
|
||||
@@ -88,14 +88,15 @@ var _ = BeforeSuite(func() {
|
||||
Host: "localhost:" + strconv.Itoa(GetFreePort()),
|
||||
}
|
||||
|
||||
accessKey = password.Generate(20)
|
||||
secretKey = password.Generate(64)
|
||||
accessKey = libpwd.Generate(20)
|
||||
secretKey = libpwd.Generate(64)
|
||||
)
|
||||
|
||||
htp = httpcli.GetClient(uri.Hostname())
|
||||
htp, err = libhtc.GetClient(libhtc.GetTransport(false, false, false), true, libhtc.ClientTimeout30Sec)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
Expect(htp).NotTo(BeNil())
|
||||
|
||||
cfg = configCustom.NewConfig("", accessKey, secretKey, uri, "us-east-1")
|
||||
cfg = awscfg.NewConfig("", accessKey, secretKey, uri, "us-east-1")
|
||||
Expect(cfg).NotTo(BeNil())
|
||||
|
||||
cfg.SetRegion("us-east-1")
|
||||
@@ -114,13 +115,13 @@ var _ = BeforeSuite(func() {
|
||||
println("Minio is waiting on : " + uri.Host)
|
||||
}
|
||||
|
||||
cli, err = aws.New(ctx, cfg, htp)
|
||||
cli, err = libaws.New(ctx, cfg, htp)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
Expect(cli).NotTo(BeNil())
|
||||
|
||||
cli.ForcePathStyle(ctx, true)
|
||||
|
||||
name, err = uuid.GenerateUUID()
|
||||
name, err = lbuuid.GenerateUUID()
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(name).ToNot(BeEmpty())
|
||||
cli.Config().SetBucketName(name)
|
||||
@@ -144,7 +145,7 @@ func loadConfig() error {
|
||||
return err
|
||||
}
|
||||
|
||||
if cfg, err = configCustom.NewConfigJsonUnmashal(cnfByt); err != nil {
|
||||
if cfg, err = awscfg.NewConfigJsonUnmashal(cnfByt); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user