gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compile

Browse Source
This commit is contained in:
Chris Lu
2026-02-09 21:06:07 -08:00
parent 4ccc7668ce
commit db76eb26e7
1 changed files with 0 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
weed/admin/dash/s3tables_management.go
View File

@@ -67,8 +67,6 @@ func parseNamespaceInput(namespace string) ([]string, error) {
return s3tables.ParseNamespace(namespace) return s3tables.ParseNamespace(namespace)
} }
<<<<<<< HEAD
=======
func (s *AdminServer) parseNamespaceFromGin(c *gin.Context, namespace string) ([]string, bool) { func (s *AdminServer) parseNamespaceFromGin(c *gin.Context, namespace string) ([]string, bool) {
parts, err := parseNamespaceInput(namespace) parts, err := parseNamespaceInput(namespace)
if err != nil { if err != nil {
@@ -78,7 +76,6 @@ func (s *AdminServer) parseNamespaceFromGin(c *gin.Context, namespace string) ([
return parts, true return parts, true
} }
>>>>>>> aef2de31093544cb64a1e7042161ebaa8699f271
func newS3TablesManager() *s3tables.Manager { func newS3TablesManager() *s3tables.Manager {
manager := s3tables.NewManager() manager := s3tables.NewManager()
manager.SetAccountID(s3_constants.AccountAdminId) manager.SetAccountID(s3_constants.AccountAdminId)
@@ -710,14 +707,8 @@ func (s *AdminServer) CreateS3TablesNamespace(c *gin.Context) {
c.JSON(400, gin.H{"error": "bucket_arn and name are required"}) c.JSON(400, gin.H{"error": "bucket_arn and name are required"})
return return
} }
<<<<<<< HEAD
namespaceParts, err := parseNamespaceInput(req.Name)
if err != nil {
c.JSON(400, gin.H{"error": "Invalid namespace: " + err.Error()})
=======
namespaceParts, ok := s.parseNamespaceFromGin(c, req.Name) namespaceParts, ok := s.parseNamespaceFromGin(c, req.Name)
if !ok { if !ok {
>>>>>>> aef2de31093544cb64a1e7042161ebaa8699f271
return return
} }
createReq := &s3tables.CreateNamespaceRequest{TableBucketARN: req.BucketARN, Namespace: namespaceParts} createReq := &s3tables.CreateNamespaceRequest{TableBucketARN: req.BucketARN, Namespace: namespaceParts}
@@ -739,14 +730,8 @@ func (s *AdminServer) DeleteS3TablesNamespace(c *gin.Context) {
c.JSON(400, gin.H{"error": "bucket and name query parameters are required"}) c.JSON(400, gin.H{"error": "bucket and name query parameters are required"})
return return
} }
<<<<<<< HEAD
namespaceParts, err := parseNamespaceInput(namespace)
if err != nil {
c.JSON(400, gin.H{"error": "Invalid namespace: " + err.Error()})
=======
namespaceParts, ok := s.parseNamespaceFromGin(c, namespace) namespaceParts, ok := s.parseNamespaceFromGin(c, namespace)
if !ok { if !ok {
>>>>>>> aef2de31093544cb64a1e7042161ebaa8699f271
return return
} }
req := &s3tables.DeleteNamespaceRequest{TableBucketARN: bucketArn, Namespace: namespaceParts} req := &s3tables.DeleteNamespaceRequest{TableBucketARN: bucketArn, Namespace: namespaceParts}
@@ -789,14 +774,8 @@ func (s *AdminServer) CreateS3TablesTable(c *gin.Context) {
c.JSON(400, gin.H{"error": "bucket_arn, namespace, and name are required"}) c.JSON(400, gin.H{"error": "bucket_arn, namespace, and name are required"})
return return
} }
<<<<<<< HEAD
namespaceParts, err := parseNamespaceInput(req.Namespace)
if err != nil {
c.JSON(400, gin.H{"error": "Invalid namespace: " + err.Error()})
=======
namespaceParts, ok := s.parseNamespaceFromGin(c, req.Namespace) namespaceParts, ok := s.parseNamespaceFromGin(c, req.Namespace)
if !ok { if !ok {
>>>>>>> aef2de31093544cb64a1e7042161ebaa8699f271
return return
} }
format := req.Format format := req.Format
@@ -834,14 +813,8 @@ func (s *AdminServer) DeleteS3TablesTable(c *gin.Context) {
c.JSON(400, gin.H{"error": "bucket, namespace, and name query parameters are required"}) c.JSON(400, gin.H{"error": "bucket, namespace, and name query parameters are required"})
return return
} }
<<<<<<< HEAD
namespaceParts, err := parseNamespaceInput(namespace)
if err != nil {
c.JSON(400, gin.H{"error": "Invalid namespace: " + err.Error()})
=======
namespaceParts, ok := s.parseNamespaceFromGin(c, namespace) namespaceParts, ok := s.parseNamespaceFromGin(c, namespace)
if !ok { if !ok {
>>>>>>> aef2de31093544cb64a1e7042161ebaa8699f271
return return
} }
req := &s3tables.DeleteTableRequest{TableBucketARN: bucketArn, Namespace: namespaceParts, Name: name, VersionToken: version} req := &s3tables.DeleteTableRequest{TableBucketARN: bucketArn, Namespace: namespaceParts, Name: name, VersionToken: version}
@@ -917,14 +890,8 @@ func (s *AdminServer) PutS3TablesTablePolicy(c *gin.Context) {
c.JSON(400, gin.H{"error": "bucket_arn, namespace, name, and policy are required"}) c.JSON(400, gin.H{"error": "bucket_arn, namespace, name, and policy are required"})
return return
} }
<<<<<<< HEAD
namespaceParts, err := parseNamespaceInput(req.Namespace)
if err != nil {
c.JSON(400, gin.H{"error": "Invalid namespace: " + err.Error()})
=======
namespaceParts, ok := s.parseNamespaceFromGin(c, req.Namespace) namespaceParts, ok := s.parseNamespaceFromGin(c, req.Namespace)
if !ok { if !ok {
>>>>>>> aef2de31093544cb64a1e7042161ebaa8699f271
return return
} }
putReq := &s3tables.PutTablePolicyRequest{TableBucketARN: req.BucketARN, Namespace: namespaceParts, Name: req.Name, ResourcePolicy: req.Policy} putReq := &s3tables.PutTablePolicyRequest{TableBucketARN: req.BucketARN, Namespace: namespaceParts, Name: req.Name, ResourcePolicy: req.Policy}
@@ -943,14 +910,8 @@ func (s *AdminServer) GetS3TablesTablePolicy(c *gin.Context) {
c.JSON(400, gin.H{"error": "bucket, namespace, and name query parameters are required"}) c.JSON(400, gin.H{"error": "bucket, namespace, and name query parameters are required"})
return return
} }
<<<<<<< HEAD
namespaceParts, err := parseNamespaceInput(namespace)
if err != nil {
c.JSON(400, gin.H{"error": "Invalid namespace: " + err.Error()})
=======
namespaceParts, ok := s.parseNamespaceFromGin(c, namespace) namespaceParts, ok := s.parseNamespaceFromGin(c, namespace)
if !ok { if !ok {
>>>>>>> aef2de31093544cb64a1e7042161ebaa8699f271
return return
} }
getReq := &s3tables.GetTablePolicyRequest{TableBucketARN: bucketArn, Namespace: namespaceParts, Name: name} getReq := &s3tables.GetTablePolicyRequest{TableBucketARN: bucketArn, Namespace: namespaceParts, Name: name}
@@ -970,14 +931,8 @@ func (s *AdminServer) DeleteS3TablesTablePolicy(c *gin.Context) {
c.JSON(400, gin.H{"error": "bucket, namespace, and name query parameters are required"}) c.JSON(400, gin.H{"error": "bucket, namespace, and name query parameters are required"})
return return
} }
<<<<<<< HEAD
namespaceParts, err := parseNamespaceInput(namespace)
if err != nil {
c.JSON(400, gin.H{"error": "Invalid namespace: " + err.Error()})
=======
namespaceParts, ok := s.parseNamespaceFromGin(c, namespace) namespaceParts, ok := s.parseNamespaceFromGin(c, namespace)
if !ok { if !ok {
>>>>>>> aef2de31093544cb64a1e7042161ebaa8699f271
return return
} }
deleteReq := &s3tables.DeleteTablePolicyRequest{TableBucketARN: bucketArn, Namespace: namespaceParts, Name: name} deleteReq := &s3tables.DeleteTablePolicyRequest{TableBucketARN: bucketArn, Namespace: namespaceParts, Name: name}