fix CI, replace deprecated S3 API

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
drakkan · Dec 14, 2023 · 909928e · 909928e
1 parent be2e24e
commit 909928e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -298,7 +298,7 @@ jobs:
           MYSQL_USER: sftpgo
           MYSQL_PASSWORD: sftpgo
         options: >-
-          --health-cmd "mysqladmin status -h 127.0.0.1 -P 3306 -u root -p$MYSQL_ROOT_PASSWORD"
+          --health-cmd "mariadb-admin status -h 127.0.0.1 -P 3306 -u root -p$MYSQL_ROOT_PASSWORD"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 6

diff --git a/internal/vfs/s3fs.go b/internal/vfs/s3fs.go
@@ -115,19 +115,6 @@ func NewS3Fs(connectionID, localTempDir, mountPath string, s3Config S3FsConfig)
 		awsConfig.Credentials = aws.NewCredentialsCache(
 			credentials.NewStaticCredentialsProvider(fs.config.AccessKey, fs.config.AccessSecret.GetPayload(), ""))
 	}
-	if fs.config.Endpoint != "" {
-		endpointResolver := aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...any) (aws.Endpoint, error) {
-			return aws.Endpoint{
-				URL:               fs.config.Endpoint,
-				HostnameImmutable: fs.config.ForcePathStyle,
-				PartitionID:       "aws",
-				SigningRegion:     fs.config.Region,
-				Source:            aws.EndpointSourceCustom,
-			}, nil
-		})
-		awsConfig.EndpointResolverWithOptions = endpointResolver
-	}
-
 	fs.setConfigDefaults()
 
 	if fs.config.RoleARN != "" {
@@ -137,6 +124,9 @@ func NewS3Fs(connectionID, localTempDir, mountPath string, s3Config S3FsConfig)
 	}
 	fs.svc = s3.NewFromConfig(awsConfig, func(o *s3.Options) {
 		o.UsePathStyle = fs.config.ForcePathStyle
+		if fs.config.Endpoint != "" {
+			o.BaseEndpoint = aws.String(fs.config.Endpoint)
+		}
 	})
 	return fs, nil
 }