Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added --s3.enable-tls flag #148

Merged
merged 2 commits into from
Oct 2, 2024
Merged

Added --s3.enable-tls flag #148

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e44e1a7
Added --s3.enable-tls flag
jcortejoso Oct 1, 2024
496114b
Update S3 env vars
jcortejoso Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ In order to disperse to the EigenDA network in production, or at high throughput
| `--s3.bucket` | | `$EIGENDA_PROXY_S3_BUCKET` | Bucket name for S3 storage. |
| `--s3.path` | | `$EIGENDA_PROXY_S3_PATH` | Bucket path for S3 storage. |
| `--s3.endpoint` | | `$EIGENDA_PROXY_S3_ENDPOINT` | Endpoint for S3 storage. |
| `--s3.enable-tls` | | `$EIGENDA_PROXY_S3_ENABLE_TLS` | Enable TLS connection to S3 endpoint. |
| `--routing.fallback-targets` | `[]` | `$EIGENDA_PROXY_FALLBACK_TARGETS` | Fall back backend targets. Supports S3. | Backup storage locations to read from in the event of eigenda retrieval failure. |
| `--routing.cache-targets` | `[]` | `$EIGENDA_PROXY_CACHE_TARGETS` | Caching targets. Supports S3. | Caches data to backend targets after dispersing to DA, retrieved from before trying read from EigenDA. |
| `--s3.timeout` | `5s` | `$EIGENDA_PROXY_S3_TIMEOUT` | timeout for S3 storage operations (e.g. get, put) |
Expand Down
1 change: 1 addition & 0 deletions e2e/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ func createS3Config(eigendaCfg server.Config) server.CLIConfig {
Bucket: bucketName,
Path: "",
Endpoint: "localhost:4566",
EnableTLS: false,
AccessKeySecret: "minioadmin",
AccessKeyID: "minioadmin",
CredentialType: s3.CredentialTypeStatic,
Expand Down
1 change: 1 addition & 0 deletions server/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func validCfg() *Config {
Bucket: "test-bucket",
Path: "",
Endpoint: "http://localhost:9000",
EnableTLS: false,
AccessKeyID: "access-key-id",
AccessKeySecret: "access-key-secret",
},
Expand Down
11 changes: 10 additions & 1 deletion store/precomputed_key/s3/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

var (
EndpointFlagName = withFlagPrefix("endpoint")
EnableTLSFlagName = withFlagPrefix("enable-tls")
CredentialTypeFlagName = withFlagPrefix("credential-type")
AccessKeyIDFlagName = withFlagPrefix("access-key-id") // #nosec G101
AccessKeySecretFlagName = withFlagPrefix("access-key-secret") // #nosec G101
Expand Down Expand Up @@ -35,9 +36,16 @@ func CLIFlags(envPrefix, category string) []cli.Flag {
EnvVars: withEnvPrefix(envPrefix, "S3_ENDPOINT"),
Category: category,
},
&cli.BoolFlag{
Name: EnableTLSFlagName,
Usage: "enable TLS connection to S3 endpoint",
Value: false,
EnvVars: withEnvPrefix(envPrefix, "S3_ENABLE_TLS"),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WithEnvPrwrix adds the S3 prefix. Should be removed. Seems like we forgot to remove it on some other flags as well. Do you mind changing those as well?

Category: category,
},
&cli.StringFlag{
Name: CredentialTypeFlagName,
Usage: "The way to authenticate to S3, options are [iam, static]",
Usage: "the way to authenticate to S3, options are [iam, static]",
EnvVars: withEnvPrefix(envPrefix, "CREDENTIAL_TYPE"),
Category: category,
},
Expand Down Expand Up @@ -86,6 +94,7 @@ func ReadConfig(ctx *cli.Context) Config {
return Config{
CredentialType: StringToCredentialType(ctx.String(CredentialTypeFlagName)),
Endpoint: ctx.String(EndpointFlagName),
EnableTLS: ctx.Bool(EnableTLSFlagName),
AccessKeyID: ctx.String(AccessKeyIDFlagName),
AccessKeySecret: ctx.String(AccessKeySecretFlagName),
Bucket: ctx.String(BucketFlagName),
Expand Down
3 changes: 2 additions & 1 deletion store/precomputed_key/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ type CredentialType string
type Config struct {
CredentialType CredentialType
Endpoint string
EnableTLS bool
AccessKeyID string
AccessKeySecret string
Bucket string
Expand All @@ -57,7 +58,7 @@ type Store struct {
func NewS3(cfg Config) (*Store, error) {
client, err := minio.New(cfg.Endpoint, &minio.Options{
Creds: creds(cfg),
Secure: false,
Secure: cfg.EnableTLS,
})
if err != nil {
return nil, err
Expand Down
Loading