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

Jump to bottom

chore: rename SSL to TLS #18

Merged
merged 1 commit into from
Aug 2, 2022
Merged

chore: rename SSL to TLS #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/archivist/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func initObjectStore(ctx context.Context, cfg *config.Config) (server.ObjectStor
cfg.BlobStoreAccessKeyId,
cfg.BlobStoreSecretAccessKeyId,
cfg.BlobStoreBucketName,
cfg.BlobStoreUseSSL,
cfg.BlobStoreUseTLS,
)

case "":
Expand Down
2 changes: 1 addition & 1 deletion compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
ARCHIVIST_STORAGE_BACKEND: BLOB
ARCHIVIST_FILE_DIR: /tmp/archivist/
ARCHIVIST_FILE_SERVE_ON: :8081
ARCHIVIST_BLOB_STORE_USE_SSL: "false"
ARCHIVIST_BLOB_STORE_USE_TLS: "false"
ARCHIVIST_BLOB_STORE_ACCESS_KEY_ID: testifytestifytestify
ARCHIVIST_BLOB_STORE_SECRET_ACCESS_KEY_ID: exampleexampleexample
ARCHIVIST_BLOB_STORE_BUCKET_NAME: attestations
Expand Down
2 changes: 1 addition & 1 deletion internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type Config struct {
BlobStoreEndpoint string `default:"127.0.0.1:9000" desc:"URL endpoint for blob storage. Only valid when using BLOB storage backend." split_words:"true"`
BlobStoreAccessKeyId string `default:"" desc:"Blob store access key id. Only valid when using BLOB storage backend." split_words:"true"`
BlobStoreSecretAccessKeyId string `default:"" desc:"Blob store secret access key id. Only valid when using BLOB storage backend." split_words:"true"`
BlobStoreUseSSL bool `default:"TRUE" desc:"Use SSL for BLOB storage backend. Only valid when using BLOB storage backend." split_words:"true"`
BlobStoreUseTLS bool `default:"TRUE" desc:"Use TLS for BLOB storage backend. Only valid when using BLOB storage backend." split_words:"true"`
BlobStoreBucketName string `default:"" desc:"Bucket to use for storage. Only valid when using BLOB storage backend." split_words:"true"`
}

Expand Down
4 changes: 2 additions & 2 deletions internal/objectstorage/blobstore/minio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (store *Store) PutBlob(idx string, obj []byte) error {
}

// New returns a reader/writer for storing/retrieving attestations
func New(ctx context.Context, endpoint, accessKeyId, secretAccessKeyId, bucketName string, useSSL bool) (*Store, <-chan error, error) {
func New(ctx context.Context, endpoint, accessKeyId, secretAccessKeyId, bucketName string, useTLS bool) (*Store, <-chan error, error) {
errCh := make(chan error)
go func() {
<-ctx.Done()
Expand All @@ -54,7 +54,7 @@ func New(ctx context.Context, endpoint, accessKeyId, secretAccessKeyId, bucketNa

c, err := minio.NewWithOptions(endpoint, &minio.Options{
Creds: credentials.NewStaticV4(accessKeyId, secretAccessKeyId, ""),
Secure: useSSL,
Secure: useTLS,
})
if err != nil {
return nil, errCh, err
Expand Down