requested PR updates

Author: els-tmiller

README.md

@@ -189,7 +189,7 @@ If using Fargate, the credentials URL can be sourced automatically:
 ```bash
 export IMMUDB_S3_STORAGE=true
 export IMMUDB_S3_ROLE_ENABLED=true
-export IMMUDB_S3_FARGATE_CREDENTIALS=true
+export IMMUDB_S3_USE_FARGATE_CREDENTIALS=true
 export IMMUDB_S3_BUCKET_NAME=<BUCKET NAME>
 export IMMUDB_S3_LOCATION=<AWS S3 REGION>
 export IMMUDB_S3_PATH_PREFIX=testing-001

cmd/immudb/command/init.go

@@ -89,7 +89,7 @@ func (cl *Commandline) setupFlags(cmd *cobra.Command, options *server.Options) {
 	cmd.Flags().String("s3-path-prefix", "", "s3 path prefix (multiple immudb instances can share the same bucket if they have different prefixes)")
 	cmd.Flags().Bool("s3-external-identifier", false, "use the remote identifier if there is no local identifier")
 	cmd.Flags().String("s3-instance-metadata-url", "http://169.254.169.254", "s3 instance metadata url")
-	cmd.Flags().String("s3-fargate-credentials", "false", "s3 fargate credentials true/false")
+	cmd.Flags().String("s3-use-fargate-credentials", "false", "use fargate credentials for s3 authentication: true/false")
 	cmd.Flags().Int("max-sessions", 100, "maximum number of simultaneously opened sessions")
 	cmd.Flags().Duration("max-session-inactivity-time", 3*time.Minute, "max session inactivity time is a duration after which an active session is declared inactive by the server. A session is kept active if server is still receiving requests from client (keep-alive or other methods)")
 	cmd.Flags().Duration("max-session-age-time", 0, "the current default value is infinity. max session age time is a duration after which session will be forcibly closed")

cmd/immudb/command/parse_options.go

@@ -106,7 +106,7 @@ func parseOptions() (options *server.Options, err error) {
 	s3PathPrefix := viper.GetString("s3-path-prefix")
 	s3ExternalIdentifier := viper.GetBool("s3-external-identifier")
 	s3MetadataURL := viper.GetString("s3-instance-metadata-url")
-	s3FargateCredentials := viper.GetBool("s3-fargate-credentials")
+	s3UseFargateCredentials := viper.GetBool("s3-use-fargate-credentials")
 
 	remoteStorageOptions := server.DefaultRemoteStorageOptions().
 		WithS3Storage(s3Storage).
@@ -120,7 +120,7 @@ func parseOptions() (options *server.Options, err error) {
 		WithS3PathPrefix(s3PathPrefix).
 		WithS3ExternalIdentifier(s3ExternalIdentifier).
 		WithS3InstanceMetadataURL(s3MetadataURL).
-		WithS3FargateCredentials(s3FargateCredentials)
+		WithS3UseFargateCredentials(s3UseFargateCredentials)
 
 	sessionOptions := sessions.DefaultOptions().
 		WithMaxSessions(viper.GetInt("max-sessions")).

embedded/remotestorage/s3/s3.go

@@ -57,7 +57,7 @@ type Storage struct {
 	awsInstanceMetadataURL string
 	awsCredsRefreshPeriod  time.Duration
 
-	fargateCredentials bool
+	useFargateCredentials bool
 }
 
 var (
@@ -101,7 +101,7 @@ func Open(
 	location string,
 	prefix string,
 	awsInstanceMetadataURL string,
-	fargateCredentials bool,
+	useFargateCredentials bool,
 ) (remotestorage.Storage, error) {
 
 	// Endpoint must always end with '/'
@@ -140,7 +140,7 @@ func Open(
 		},
 		awsInstanceMetadataURL: awsInstanceMetadataURL,
 		awsCredsRefreshPeriod:  time.Minute,
-		fargateCredentials:     fargateCredentials,
+		useFargateCredentials:     useFargateCredentials,
 	}
 
 	err := s3storage.getRoleCredentials()
@@ -811,13 +811,16 @@ func (s *Storage) getRoleCredentials() error {
 }
 
 func (s *Storage) requestCredentials() (string, string, string, error) {
-	if s.fargateCredentials {
+	if s.useFargateCredentials {
 		// Use Fargate credentials
+
+		const fargateMetadataEndpoint = "http://169.254.170.2"
+
 		fargateCredentialsRelativeURI := os.Getenv("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI")
 		if fargateCredentialsRelativeURI == "" {
-      return "", "", "", errors.New(fmt.Sprintf("environment variable %s is not set or empty", "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"))
+      return "", "", "", errors.New("environment variable AWS_CONTAINER_CREDENTIALS_RELATIVE_URI is not set or empty")
     }
-		fargateCredentialsURL := fmt.Sprintf("%s%s", "http://169.254.170.2", fargateCredentialsRelativeURI)
+		fargateCredentialsURL := fargateMetadataEndpoint + fargateCredentialsRelativeURI
 
 		fargateReq, err := http.NewRequest("GET", fargateCredentialsURL, nil)
 		if err != nil {
@@ -830,7 +833,7 @@ func (s *Storage) requestCredentials() (string, string, string, error) {
 		}
 		defer fargateResp.Body.Close()
 
-		creds, err := ioutil.ReadAll(fargateResp.Body)
+		creds, err := io.ReadAll(fargateResp.Body)
 		if err != nil {
 			return "", "", "", errors.New("cannot read fargate credentials")
 		}

pkg/server/options.go

@@ -87,18 +87,18 @@ type Options struct {
 }
 
 type RemoteStorageOptions struct {
-	S3Storage             bool
-	S3RoleEnabled         bool
-	S3Role                string
-	S3Endpoint            string
-	S3AccessKeyID         string
-	S3SecretKey           string `json:"-"`
-	S3BucketName          string
-	S3Location            string
-	S3PathPrefix          string
-	S3ExternalIdentifier  bool
-	S3InstanceMetadataURL string
-	FargateCredentials    bool
+	S3Storage               bool
+	S3RoleEnabled           bool
+	S3Role                  string
+	S3Endpoint              string
+	S3AccessKeyID           string
+	S3SecretKey             string `json:"-"`
+	S3BucketName            string
+	S3Location              string
+	S3PathPrefix            string
+	S3ExternalIdentifier    bool
+	S3InstanceMetadataURL   string
+	S3UseFargateCredentials bool
 }
 
 type ReplicationOptions struct {
@@ -371,8 +371,8 @@ func (o *Options) String() string {
 		opts = append(opts, "S3 storage")
 		if o.RemoteStorageOptions.S3RoleEnabled {
 			opts = append(opts, rightPad("   role auth", o.RemoteStorageOptions.S3RoleEnabled))
-			if o.RemoteStorageOptions.FargateCredentials {
-				opts = append(opts, rightPad("   fargate creds", o.RemoteStorageOptions.FargateCredentials))
+			if o.RemoteStorageOptions.S3UseFargateCredentials {
+				opts = append(opts, rightPad("   fargate creds", o.RemoteStorageOptions.S3UseFargateCredentials))
 			} else {
 				opts = append(opts, rightPad("   role name", o.RemoteStorageOptions.S3Role))
 			}
@@ -384,7 +384,7 @@ func (o *Options) String() string {
 		}
 		opts = append(opts, rightPad("   prefix", o.RemoteStorageOptions.S3PathPrefix))
 		opts = append(opts, rightPad("   external id", o.RemoteStorageOptions.S3ExternalIdentifier))
-		if !o.RemoteStorageOptions.FargateCredentials {
+		if !o.RemoteStorageOptions.S3UseFargateCredentials {
 		  opts = append(opts, rightPad("   metadata url", o.RemoteStorageOptions.S3InstanceMetadataURL))
 		}
 	}
@@ -606,8 +606,8 @@ func (opts *RemoteStorageOptions) WithS3InstanceMetadataURL(url string) *RemoteS
 	return opts
 }
 
-func (opts *RemoteStorageOptions) WithS3FargateCredentials(fargateCredentials bool) *RemoteStorageOptions {
-	opts.FargateCredentials = fargateCredentials
+func (opts *RemoteStorageOptions) WithS3UseFargateCredentials(s3UseFargateCredentials bool) *RemoteStorageOptions {
+	opts.S3UseFargateCredentials = s3UseFargateCredentials
 	return opts
 }
 

pkg/server/remote_storage.go

@@ -60,7 +60,7 @@ func (s *ImmuServer) createRemoteStorageInstance() (remotestorage.Storage, error
 			s.Options.RemoteStorageOptions.S3Location,
 			s.Options.RemoteStorageOptions.S3PathPrefix,
 			s.Options.RemoteStorageOptions.S3InstanceMetadataURL,
-			s.Options.RemoteStorageOptions.FargateCredentials,
+			s.Options.RemoteStorageOptions.S3UseFargateCredentials,
 		)
 	}