chore: rename SSL to TLS

Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
in-toto · Aug 2, 2022 · 5ba09d4 · 5ba09d4
1 parent 79e0987
commit 5ba09d4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/cmd/archivist/main.go b/cmd/archivist/main.go
@@ -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 "":

diff --git a/compose.yml b/compose.yml
@@ -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

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -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"`
 }
 

diff --git a/internal/objectstorage/blobstore/minio.go b/internal/objectstorage/blobstore/minio.go
@@ -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()
@@ -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