Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions codegen/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import (
"os"

"github.com/urfave/cli/v2"

"github.com/sumup/sumup-py/codegen/pkg/builder"
)

func Generate() *cli.Command {
Expand All @@ -23,25 +21,15 @@ func Generate() *cli.Command {
return fmt.Errorf("empty argument, path to openapi specs expected")
}

specs := c.Args().First()

if err := os.MkdirAll(out, os.ModePerm); err != nil {
return fmt.Errorf("create output directory %q: %w", out, err)
}

spec, err := loadOpenAPIDocument(specs)
builder, err := loadBuilder(c.Args().First(), out)
if err != nil {
return err
}

builder := builder.New(builder.Config{
Out: out,
})

if err := builder.Load(spec); err != nil {
return fmt.Errorf("load spec: %w", err)
}

if err := builder.Build(); err != nil {
return fmt.Errorf("build sdk: %w", err)
}
Expand Down
37 changes: 37 additions & 0 deletions codegen/load.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package main

import (
"fmt"
"os"

"github.com/pb33f/libopenapi"

"github.com/sumup/sumup-py/codegen/pkg/builder"
)

func loadBuilder(specs, out string) (*builder.Builder, error) {
spec, err := os.ReadFile(specs)
if err != nil {
return nil, fmt.Errorf("read specs: %w", err)
}

doc, err := libopenapi.NewDocument(spec)
if err != nil {
return nil, fmt.Errorf("load openapi document: %w", err)
}

model, err := doc.BuildV3Model()
if err != nil {
return nil, fmt.Errorf("build openapi v3 model: %w", err)
}

b := builder.New(builder.Config{
Out: out,
})

if err := b.Load(&model.Model); err != nil {
return nil, fmt.Errorf("load spec: %w", err)
}

return b, nil
}
27 changes: 0 additions & 27 deletions codegen/openapi.go

This file was deleted.

9 changes: 1 addition & 8 deletions codegen/samples.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import (
"regexp"

"github.com/urfave/cli/v2"

"github.com/sumup/sumup-py/codegen/pkg/builder"
)

var versionPattern = regexp.MustCompile(`(?m)^__version__\s*=\s*["']([^"']+)["']`)
Expand Down Expand Up @@ -38,15 +36,10 @@ func Samples() *cli.Command {
return fmt.Errorf("missing SDK version: set --sdk-version or --sdk-version-file")
}

spec, err := loadOpenAPIDocument(c.Args().First())
generator, err := loadBuilder(c.Args().First(), "")
if err != nil {
return err
}

generator := builder.New(builder.Config{})
if err := generator.Load(spec); err != nil {
return fmt.Errorf("load spec: %w", err)
}
catalog, err := generator.Samples(sdkVersion)
if err != nil {
return fmt.Errorf("generate samples: %w", err)
Expand Down
Loading