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

Fix global bucket key path in bootstrap having accidentally changed

Browse Source
This commit is contained in:
Brian Picciano 2022-10-15 18:55:24 +02:00
parent af7c8dde32
commit 30584973be
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go-workspace/src/bootstrap/bootstrap.go
View File

@ -57,7 +57,7 @@ func FromFS(bootstrapFS fs.FS) (Bootstrap, error) {
bootstrapFS, bootstrapFS,
garageGlobalBucketKeyYmlPath, garageGlobalBucketKeyYmlPath,
); err != nil { ); err != nil {
return Bootstrap{}, fmt.Errorf("loading %q from fs: %w", b.GarageGlobalBucketS3APICredentials, err) return Bootstrap{}, fmt.Errorf("loading %q from fs: %w", garageGlobalBucketKeyYmlPath, err)
} }
filesToLoadAsString := []struct { filesToLoadAsString := []struct {

2
go-workspace/src/bootstrap/garage.go
View File

@ -6,7 +6,7 @@ import (
// Paths within the bootstrap FS related to garage. // Paths within the bootstrap FS related to garage.
const ( const (
garageGlobalBucketKeyYmlPath = "garage/global-bucket-key.yml" garageGlobalBucketKeyYmlPath = "garage/cryptic-net-global-bucket-key.yml"
garageRPCSecretPath = "garage/rpc-secret.txt" garageRPCSecretPath = "garage/rpc-secret.txt"
) )

2
go-workspace/src/garage.go
View File

@ -10,6 +10,8 @@ import (
// will otherwise return a random endpoint. // will otherwise return a random endpoint.
func (env *Env) ChooseGaragePeer() garage.Peer { func (env *Env) ChooseGaragePeer() garage.Peer {
// TODO this only works well within the daemon process, otherwise daemon.yml
// isn't available.
if allocs := env.ThisDaemon().Storage.Allocations; len(allocs) > 0 { if allocs := env.ThisDaemon().Storage.Allocations; len(allocs) > 0 {
return garage.Peer{ return garage.Peer{