Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[Go] skip validator import if oneOf discriminator lookup is enabled #20497

Merged
merged 5 commits into from
Jan 22, 2025

Conversation

ctreatma
Copy link
Contributor

@ctreatma ctreatma commented Jan 17, 2025

The Go generator produces invalid code for oneOf models that have discriminators when useOneOfDiscriminatorLookup is set to true. In this case, the model imports gopkg.in/validator.v2 but does not use it because validation is skipped when discriminator lookup is enabled.

This updates the Go generator so that the validator import is skipped if discriminator lookup is enabled. In order to make this change I had to move the validator import from AbstractGoCodegen to GoClientCodegen; this is a safe change because the oneOf validation code only exists in the Go client generator templates, not in the other Go generators.

This also updates the Go generator so that, when useOneOfDiscriminator is set to false and the gopkg.in/validator.v2 is used by a model, the validation library is included in the generated go.mod and go.sum files.

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package || exit
    ./bin/generate-samples.sh ./bin/configs/*.yaml || exit
    ./bin/utils/export_docs_generators.sh || exit
    
    (For Windows users, please run the script in Git BASH)
    Commit all changed files.
    This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
    These must match the expectations made by your contribution.
    You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
    IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
  • File the PR against the correct branch: master (upcoming 7.x.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@wing328

@ctreatma ctreatma force-pushed the fix-go-validate-error branch from a3bb03c to 395cc51 Compare January 17, 2025 20:27
@wing328
Copy link
Member

wing328 commented Jan 21, 2025

i did a test locally and the fix simply rearranged the import

--- a/model_object.go
+++ b/model_object.go
@@ -12,8 +12,8 @@ package openapi

 import (
        "encoding/json"
-       "gopkg.in/validator.v2"
        "fmt"
+       "gopkg.in/validator.v2"
 )

 // Object - struct for Object

and here is the error message I still got after applying the fix:

$ go test
model_object.go:16:2: no required module provides package gopkg.in/validator.v2; to add it:
        go get gopkg.in/validator.v2

@ctreatma
Copy link
Contributor Author

This fix specifically covers the case where the validator.v2 import is specified in the model file but not used in the same file. The error you are running into is a different bug; when the validator.v2 library was added to the model files for validation, it was not added to the go.mod.mustache template. I haven't run into that bug in real use because we automatically run go mod tidy after generating the code, which automatically fixes our go.mod.

I'm happy to fix the missing dependency in go.mod.mustache while I'm in here, but I'm not entirely sure how to do that. The decision to import validator.v2 is made at the model level. Is there an existing pattern I can copy for setting a global flag that go.mod.mustache can reference if any model imported validator.v2?

@wing328
Copy link
Member

wing328 commented Jan 21, 2025

When post processing the models, what about setting additional properties (e.g. importValidatorV2), which can be accessed by go.mod.mustache?

@wing328
Copy link
Member

wing328 commented Jan 22, 2025

confirmed no longer seeing the error after your fix.

@wing328 wing328 merged commit 8cbba73 into OpenAPITools:master Jan 22, 2025
4 checks passed
@ctreatma ctreatma deleted the fix-go-validate-error branch January 22, 2025 16:11
balassit pushed a commit to balassit/openapi-generator that referenced this pull request Feb 6, 2025
…penAPITools#20497)

* move validator import into GoClientCodegen

* add new example for oneof discriminator lookup

* regenerate samples

* add validator.v2 to go.mod if it is imported

* regenerate samples
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants