Skip to content

Commit

Permalink
fix(schema): allow weak schema type (#2043)
Browse files Browse the repository at this point in the history
Signed-off-by: Jiyong Huang <[email protected]>
  • Loading branch information
ngjaying authored Jun 29, 2023
1 parent c4a649e commit 25cc511
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 5 deletions.
10 changes: 5 additions & 5 deletions internal/schema/inferer.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ type inferer func(schemaFileName string, SchemaMessageName string) (ast.StreamFi
var inferes = map[string]inferer{}

func InferFromSchemaFile(schemaType string, schemaId string) (ast.StreamFields, error) {
r := strings.Split(schemaId, ".")
if len(r) != 2 {
return nil, fmt.Errorf("invalid schemaId: %s", schemaId)
}
if c, ok := inferes[schemaType]; ok {
r := strings.Split(schemaId, ".")
if len(r) != 2 {
return nil, fmt.Errorf("invalid schemaId: %s", schemaId)
}
// mock result for testing
if conf.IsTesting {
return ast.StreamFields{
Expand All @@ -52,6 +52,6 @@ func InferFromSchemaFile(schemaType string, schemaId string) (ast.StreamFields,
}
return c(r[0], r[1])
} else {
return nil, fmt.Errorf("unsupported type: %s", schemaType)
return nil, nil
}
}
49 changes: 49 additions & 0 deletions internal/schema/inferere_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Copyright 2023 EMQ Technologies Co., Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package schema

import (
"errors"
"testing"

"github.com/stretchr/testify/assert"
)

func TestInferFromSchemaFileError(t *testing.T) {
tests := []struct {
name string
schemaType string
schemaId string
err error
}{
{
name: "test weak schema type",
schemaType: "can",
schemaId: "aa",
err: nil,
}, {
name: "test wrong schema id",
schemaType: "protobuf",
schemaId: "aa",
err: errors.New("invalid schemaId: aa"),
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
_, err := InferFromSchemaFile(tt.schemaType, tt.schemaId)
assert.Equal(t, tt.err, err)
})
}
}

0 comments on commit 25cc511

Please sign in to comment.