Skip to content

Commit c70ba11

Browse files
committed
refactor: rewriteSchema
1 parent f8bebf5 commit c70ba11

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

internal/cmd/schema.go

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -319,23 +319,15 @@ func schemaWriteCmdImpl(cmd *cobra.Command, args []string, client v1.SchemaServi
319319

320320
// rewriteSchema rewrites the given existing schema to include the specified prefix on all definitions and caveats.
321321
func rewriteSchema(ctx context.Context, existingSchemaText string, definitionPrefix string, sourceFolder string) (string, error) {
322-
if definitionPrefix == "" && sourceFolder == "" {
322+
if definitionPrefix == "" {
323323
return existingSchemaText, nil
324324
}
325325

326-
var prefixOpt compiler.ObjectPrefixOption
327-
if definitionPrefix != "" {
328-
prefixOpt = compiler.ObjectTypePrefix(definitionPrefix)
329-
} else {
330-
prefixOpt = compiler.AllowUnprefixedObjectType()
331-
}
332-
333-
opts := []compiler.Option{compiler.SkipValidation(), compiler.SourceFolder(sourceFolder)}
334-
335326
compiled, err := compiler.Compile(
336327
compiler.InputSchema{Source: input.Source("schema"), SchemaString: existingSchemaText},
337-
prefixOpt,
338-
opts...,
328+
compiler.ObjectTypePrefix(definitionPrefix),
329+
compiler.SkipValidation(),
330+
compiler.SourceFolder(sourceFolder),
339331
)
340332
if err != nil {
341333
return "", err

0 commit comments

Comments
 (0)