mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-08-21 22:56:55 +00:00
Chris LuandGitHub
c15989387b
* s3tables: allow hyphens in namespace and table names Iceberg REST clients routinely use hyphenated namespace/table names, but the S3 Tables charset (a-z, 0-9, _) rejected them with 400. Accept '-' as an interior character (names must still start, and namespaces end, with a letter or digit), making the catalog conformant for those clients. A permissive superset of the AWS S3 Tables charset. * s3tables: allow hyphens in table ARN parsing too The ARN regexes still excluded '-', so parseTableFromARN rejected ARNs with hyphenated namespace/table names and existing reject-the-hyphen tests broke. Widen the ARN patterns to match the validator, retarget those tests at a still-invalid leading-hyphen name, and cover ARN parsing with hyphens.
38 lines
1.4 KiB
Go
38 lines
1.4 KiB
Go
package s3tables
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestNameValidationAllowsHyphens(t *testing.T) {
|
|
// Hyphen interior is accepted (Iceberg REST clients use names like these).
|
|
require.NoError(t, validateNamespacePart("rest-integration-test"))
|
|
if _, err := validateTableName("test-create-table"); err != nil {
|
|
t.Fatalf("hyphenated table name rejected: %v", err)
|
|
}
|
|
|
|
// A leading or trailing hyphen on a namespace is still rejected (must start
|
|
// and end with a letter or digit), as are characters outside the charset.
|
|
require.Error(t, validateNamespacePart("-leading"))
|
|
require.Error(t, validateNamespacePart("trailing-"))
|
|
require.Error(t, validateNamespacePart("Upper"))
|
|
|
|
// Table names must still start with a letter or digit and stay in charset.
|
|
if _, err := validateTableName("-leading"); err == nil {
|
|
t.Fatal("table name with leading hyphen should be rejected")
|
|
}
|
|
if _, err := validateTableName("Upper"); err == nil {
|
|
t.Fatal("uppercase table name should be rejected")
|
|
}
|
|
}
|
|
|
|
func TestParseTableFromARNAllowsHyphens(t *testing.T) {
|
|
bucket, ns, table, err := parseTableFromARN("arn:aws:s3tables:us-east-1:123456789012:bucket/my-bucket/table/rest-integration-test/test-create-table")
|
|
require.NoError(t, err)
|
|
require.Equal(t, "my-bucket", bucket)
|
|
require.Equal(t, "rest-integration-test", ns)
|
|
require.Equal(t, "test-create-table", table)
|
|
}
|