-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: clean up s3 initialization for env var compatibility
- Loading branch information
Showing
15 changed files
with
251 additions
and
188 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| COMPOSE_PROJECT_NAME=moar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package s3 | ||
|
|
||
| import ( | ||
| "os" | ||
|
|
||
| "github.com/minio/minio-go/v7" | ||
| "github.com/minio/minio-go/v7/pkg/credentials" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| const defaultBucket = "modules" | ||
| const defaultEndpoint = "localhost:9000" | ||
|
|
||
| func New(endpoint string) *Storage { | ||
| logger := logrus.WithField("op", "storage") | ||
| endpoint = validateEndpoint(endpoint) | ||
| creds := collectCredentials() | ||
| useSSL := false | ||
| if os.Getenv("S3_USE_SSL") != "" { | ||
| useSSL = true | ||
| } | ||
| minioClient, err := minio.New(endpoint, | ||
| &minio.Options{ | ||
| Creds: creds, | ||
| Secure: useSSL, | ||
| }, | ||
| ) | ||
| if err != nil { | ||
| logger.Fatalln(err) | ||
| } | ||
|
|
||
| s := &Storage{ | ||
| minioClient: minioClient, | ||
| logger: logger, | ||
| bucket: bucket(), | ||
| } | ||
| s.setup() | ||
| return s | ||
| } | ||
|
|
||
| func collectCredentials() *credentials.Credentials { | ||
| accessKeyID := os.Getenv("S3_ACCESS_KEY_ID") | ||
| secretAccessKey := os.Getenv("S3_SECRET_ACCESS_KEY") | ||
| sessionToken := os.Getenv("AWS_SESSION_TOKEN") | ||
| return credentials.NewStaticV4(accessKeyID, secretAccessKey, sessionToken) | ||
| } | ||
|
|
||
| func bucket() string { | ||
| bucket := os.Getenv("S3_BUCKET") | ||
| if bucket == "" { | ||
| bucket = defaultBucket | ||
| } | ||
| return bucket | ||
| } | ||
|
|
||
| func validateEndpoint(endpoint string) string { | ||
| if endpoint == "" { | ||
| endpoint = os.Getenv("S3_ENDPOINT_URL") | ||
| if endpoint == "" { | ||
| endpoint = defaultEndpoint | ||
| } | ||
| } | ||
| logrus.Infof("Using S3 at %s", endpoint) | ||
| return endpoint | ||
| } |
Oops, something went wrong.