mirrors/versitygw
1
0
Fork 0
mirror of https://github.com/versity/versitygw.git synced 2026-08-22 15:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #148 from versity/ben/admin_cleanup

Browse Source 
fix: cleanup unused adminRegion
This commit is contained in:
Ben McClelland
2023-07-24 08:26:45 -07:00
committed by GitHub
parent daa4aa1510 51e818b3e3
commit e73d661de1
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/versitygw/admin.go
+4 -12
View File
@@ -30,7 +30,6 @@ import (
var (
adminAccess string
adminSecret string
adminRegion string
)
func adminCommand() *cli.Command {
@@ -97,13 +96,6 @@ func adminCommand() *cli.Command {
Aliases: []string{"s"},
Destination: &adminSecret,
},
&cli.StringFlag{
Name: "region",
Usage: "s3 region string",
Value: "us-east-1",
Destination: &adminRegion,
Aliases: []string{"r"},
},
},
}
}
@@ -129,7 +121,7 @@ func createUser(ctx *cli.Context) error {
req.Header.Set("X-Amz-Content-Sha256", hexPayload)
signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", adminRegion, time.Now())
signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", region, time.Now())
if signErr != nil {
return fmt.Errorf("failed to sign the request: %w", err)
}
@@ -146,7 +138,7 @@ func createUser(ctx *cli.Context) error {
return err
}
fmt.Printf("%s", body)
fmt.Printf("%s\n", body)
return nil
}
@@ -169,7 +161,7 @@ func deleteUser(ctx *cli.Context) error {
req.Header.Set("X-Amz-Content-Sha256", hexPayload)
signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", adminRegion, time.Now())
signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", region, time.Now())
if signErr != nil {
return fmt.Errorf("failed to sign the request: %w", err)
}
@@ -186,7 +178,7 @@ func deleteUser(ctx *cli.Context) error {
return err
}
fmt.Printf("%s", body)
fmt.Printf("%s\n", body)
return nil
}