Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
shibukazu committed Oct 16, 2024
1 parent dc57ed7 commit 3cfec16
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8
google.golang.org/grpc v1.64.0
google.golang.org/protobuf v1.34.1
gopkg.in/yaml.v3 v3.0.1
)

require (
Expand Down Expand Up @@ -57,5 +58,4 @@ require (
golang.org/x/text v0.16.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
20 changes: 16 additions & 4 deletions go/pkg/dsl/generator/openapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ func GenerateFromOpenAPI2(logger *slog.Logger, filePath string) (*dsl.DSL, error
return nil, err
}
variables := make([]dsl.Variable, 0)
parseParamSchema(swaggerDoc.Spec(), schema, refName, "", &variables)
err = parseParamSchema(swaggerDoc.Spec(), schema, refName, "", &variables)
if err != nil {
return nil, err
}
validation := dsl.Validation{
ID: refName,
Cels: []string{},
Expand Down Expand Up @@ -77,15 +80,24 @@ func parseParamSchema(doc *spec.Swagger, schema *spec.Schema, parentObjectName s
return err
}
parentObjectName := objectName
parseParamSchema(doc, resolvedProp, parentObjectName, "", variables)
err = parseParamSchema(doc, resolvedProp, parentObjectName, "", variables)
if err != nil {
return err
}
} else {
if prop.Properties != nil {
// Object
parentObjectName := propName
parseParamSchema(doc, &prop, parentObjectName, "", variables)
err := parseParamSchema(doc, &prop, parentObjectName, "", variables)
if err != nil {
return err
}
} else {
// Primitive
parseParamSchema(doc, &prop, parentObjectName, propName, variables)
err := parseParamSchema(doc, &prop, parentObjectName, propName, variables)
if err != nil {
return err
}
}
}
}
Expand Down

0 comments on commit 3cfec16

Please sign in to comment.