micropelago/isle
4
1
Fork 0
Code Issues 1 Pull Requests Projects Releases 5 Activity

Fix garage mc not getting default secret key set correctly

Browse Source
This commit is contained in:
Brian Picciano 2022-11-13 20:14:16 +01:00
parent 739e88d6c9
commit b1fa3be970
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
entrypoint/src/cmd/entrypoint/garage.go
View File

@ -36,15 +36,12 @@ var subCmdGarageMC = subCmd{
s3APIAddr := hostBootstrap.ChooseGaragePeer().S3APIAddr() s3APIAddr := hostBootstrap.ChooseGaragePeer().S3APIAddr()
if *keyID == "" || *keySecret == "" { if *keyID == "" {
*keyID = hostBootstrap.Garage.GlobalBucketS3APICredentials.ID
}
if *keyID == "" { if *keySecret == "" {
*keyID = hostBootstrap.Garage.GlobalBucketS3APICredentials.ID *keySecret = hostBootstrap.Garage.GlobalBucketS3APICredentials.Secret
}
if *keySecret == "" {
*keyID = hostBootstrap.Garage.GlobalBucketS3APICredentials.Secret
}
} }
args := flags.Args() args := flags.Args()
@ -56,13 +53,15 @@ var subCmdGarageMC = subCmd{
args = append([]string{"mc"}, args...) args = append([]string{"mc"}, args...)
var ( var (
mcHostVar = fmt.Sprintf(
"MC_HOST_garage=http://%s:%s@%s",
*keyID, *keySecret, s3APIAddr,
)
binPath = filepath.Join(envAppDirPath, "bin/mc") binPath = filepath.Join(envAppDirPath, "bin/mc")
cliEnv = append( cliEnv = append(
os.Environ(), os.Environ(),
fmt.Sprintf( mcHostVar,
"MC_HOST_garage=http://%s:%s@%s",
*keyID, *keySecret, s3APIAddr,
),
// The garage docs say this is necessary, though nothing bad // The garage docs say this is necessary, though nothing bad
// seems to happen if we leave it out *shrug* // seems to happen if we leave it out *shrug*