Skip to content
Open
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ write a lot of boilerplate code to perform all the marshaling and unmarshaling
into objects which match the OpenAPI 3.0 definition. The code generator in this
directory does a lot of that for you. You would run it like so:

go install github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@latest
go install github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen@latest
oapi-codegen -package petstore petstore-expanded.yaml > petstore.gen.go

Let's go through that `petstore.gen.go` file to show you everything which was
Expand Down
Binary file added cmd/oapi-codegen/oapi-codegen
Binary file not shown.
4 changes: 2 additions & 2 deletions cmd/oapi-codegen/oapi-codegen.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (

"gopkg.in/yaml.v2"

"github.com/deepmap/oapi-codegen/v2/pkg/codegen"
"github.com/deepmap/oapi-codegen/v2/pkg/util"
"github.com/Drey/oapi-codegen/v2/pkg/codegen"
"github.com/Drey/oapi-codegen/v2/pkg/util"
)

func errExit(format string, args ...interface{}) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/oapi-codegen/oapi-codegen_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"testing"

"github.com/deepmap/oapi-codegen/v2/pkg/util"
"github.com/Drey/oapi-codegen/v2/pkg/util"
)

func TestLoader(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion examples/authenticated-api/echo/api/api.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/authenticated-api/echo/api/doc.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package api

//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
//go:generate go run github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
4 changes: 2 additions & 2 deletions examples/authenticated-api/echo/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"log"
"net"

"github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/api"
"github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/server"
"github.com/Drey/oapi-codegen/v2/examples/authenticated-api/echo/api"
"github.com/Drey/oapi-codegen/v2/examples/authenticated-api/echo/server"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware"
)
Expand Down
5 changes: 3 additions & 2 deletions examples/authenticated-api/echo/server/fake_jws.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"crypto/ecdsa"
"fmt"

"github.com/deepmap/oapi-codegen/v2/pkg/ecdsafile"
"github.com/Drey/oapi-codegen/v2/pkg/ecdsafile"
"github.com/lestrrat-go/jwx/jwa"
"github.com/lestrrat-go/jwx/jwk"
"github.com/lestrrat-go/jwx/jws"
Expand All @@ -13,7 +13,8 @@ import (

// PrivateKey is an ECDSA private key which was generated with the following
// command:
// openssl ecparam -name prime256v1 -genkey -noout -out ecprivatekey.pem
//
// openssl ecparam -name prime256v1 -genkey -noout -out ecprivatekey.pem
//
// We are using a hard coded key here in this example, but in real applications,
// you would never do this. Your JWT signing key must never be in your application,
Expand Down
2 changes: 1 addition & 1 deletion examples/authenticated-api/echo/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sort"
"sync"

"github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/api"
"github.com/Drey/oapi-codegen/v2/examples/authenticated-api/echo/api"
"github.com/getkin/kin-openapi/openapi3filter"
"github.com/labstack/echo/v4"
middleware "github.com/oapi-codegen/echo-middleware"
Expand Down
4 changes: 2 additions & 2 deletions examples/authenticated-api/echo/server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"net/http"
"testing"

"github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/api"
"github.com/oapi-codegen/testutil"
"github.com/Drey/oapi-codegen/v2/examples/authenticated-api/echo/api"
"github.com/labstack/echo/v4"
"github.com/oapi-codegen/testutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-client-type/custom-client-type.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/custom-client-type/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package customclienttype
// This is an example of how to add a prefix to the name of the generated Client struct
// See https://github.com/deepmap/oapi-codegen/issues/785 for why this might be necessary

//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
//go:generate go run github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
6 changes: 3 additions & 3 deletions examples/go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/deepmap/oapi-codegen/v2/examples
module github.com/Drey/oapi-codegen/v2/examples

go 1.20

replace github.com/deepmap/oapi-codegen/v2 => ../
replace github.com/Drey/oapi-codegen/v2 => ../

require (
github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
github.com/Drey/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
github.com/getkin/kin-openapi v0.122.0
github.com/gin-gonic/gin v1.9.1
github.com/go-chi/chi/v5 v5.0.10
Expand Down
2 changes: 1 addition & 1 deletion examples/no-vcs-version-override/echo/api/api.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/no-vcs-version-override/echo/api/doc.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package api

//go:generate go run -ldflags "-X main.noVCSVersionOverride=v123.456.789" github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
//go:generate go run -ldflags "-X main.noVCSVersionOverride=v123.456.789" github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
2 changes: 1 addition & 1 deletion examples/petstore-expanded/chi/api/petstore.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/petstore-expanded/chi/api/petstore.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml
//go:generate go run github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml

package api

Expand Down
4 changes: 2 additions & 2 deletions examples/petstore-expanded/chi/petstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"net/http"
"os"

"github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/chi/api"
middleware "github.com/oapi-codegen/nethttp-middleware"
"github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/chi/api"
"github.com/go-chi/chi/v5"
middleware "github.com/oapi-codegen/nethttp-middleware"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions examples/petstore-expanded/chi/petstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"net/http/httptest"
"testing"

"github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/chi/api"
"github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/chi/api"
"github.com/go-chi/chi/v5"
middleware "github.com/oapi-codegen/nethttp-middleware"
"github.com/oapi-codegen/testutil"
"github.com/go-chi/chi/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/petstore-expanded/echo/api/models/models.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/petstore-expanded/echo/api/petstore-server.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions examples/petstore-expanded/echo/api/petstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=models.cfg.yaml ../../petstore-expanded.yaml
//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
//go:generate go run github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen --config=models.cfg.yaml ../../petstore-expanded.yaml
//go:generate go run github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml

package api

Expand All @@ -22,7 +22,7 @@ import (
"net/http"
"sync"

"github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models"
"github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/echo/api/models"
"github.com/labstack/echo/v4"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/petstore-expanded/echo/api/server.cfg.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package: api
output: petstore-server.gen.go
additional-imports:
- package: github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models
- package: github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/echo/api/models
alias: .
generate:
echo-server: true
Expand Down
2 changes: 1 addition & 1 deletion examples/petstore-expanded/echo/petstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"net"
"os"

"github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api"
"github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/echo/api"
"github.com/labstack/echo/v4"
echomiddleware "github.com/labstack/echo/v4/middleware"
middleware "github.com/oapi-codegen/echo-middleware"
Expand Down
6 changes: 3 additions & 3 deletions examples/petstore-expanded/echo/petstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import (
"net/http"
"testing"

"github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api"
"github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models"
"github.com/oapi-codegen/testutil"
"github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/echo/api"
"github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/echo/api/models"
"github.com/labstack/echo/v4"
echoMiddleware "github.com/labstack/echo/v4/middleware"
middleware "github.com/oapi-codegen/echo-middleware"
"github.com/oapi-codegen/testutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
6 changes: 3 additions & 3 deletions examples/petstore-expanded/echo/pkg_codegen_petstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"net/http/httptest"
"testing"

examplePetstoreClient "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded"
examplePetstore "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api"
"github.com/deepmap/oapi-codegen/v2/pkg/codegen"
examplePetstoreClient "github.com/Drey/oapi-codegen/v2/examples/petstore-expanded"
examplePetstore "github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/echo/api"
"github.com/Drey/oapi-codegen/v2/pkg/codegen"
"github.com/stretchr/testify/assert"
"golang.org/x/lint"
)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/petstore-expanded/fiber/api/petstore-types.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/petstore-expanded/fiber/api/petstore.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
//go:generate go run github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
//go:generate go run github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml

package api

Expand Down
2 changes: 1 addition & 1 deletion examples/petstore-expanded/fiber/petstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/gofiber/fiber/v2"

"github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/fiber/api"
"github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/fiber/api"
middleware "github.com/oapi-codegen/fiber-middleware"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/petstore-expanded/fiber/petstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/gofiber/fiber/v2"
"github.com/stretchr/testify/assert"

"github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/fiber/api"
"github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/fiber/api"
)

func doGet(t *testing.T, app *fiber.App, rawURL string) (*http.Response, error) {
Expand Down
2 changes: 1 addition & 1 deletion examples/petstore-expanded/gin/api/petstore-server.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/petstore-expanded/gin/api/petstore-types.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/petstore-expanded/gin/api/petstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
//go:generate go run github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
//go:generate go run github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml

package api

Expand Down
2 changes: 1 addition & 1 deletion examples/petstore-expanded/gin/petstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"github.com/gin-gonic/gin"

"github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gin/api"
"github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/gin/api"
middleware "github.com/oapi-codegen/gin-middleware"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/petstore-expanded/gin/petstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http/httptest"
"testing"

"github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gin/api"
"github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/gin/api"
"github.com/oapi-codegen/testutil"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/petstore-expanded/gorilla/api/petstore.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/petstore-expanded/gorilla/api/petstore.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml
//go:generate go run github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml

package api

Expand Down
4 changes: 2 additions & 2 deletions examples/petstore-expanded/gorilla/petstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"net/http"
"os"

"github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gorilla/api"
middleware "github.com/oapi-codegen/nethttp-middleware"
"github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/gorilla/api"
"github.com/gorilla/mux"
middleware "github.com/oapi-codegen/nethttp-middleware"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions examples/petstore-expanded/gorilla/petstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"net/http/httptest"
"testing"

"github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gorilla/api"
"github.com/Drey/oapi-codegen/v2/examples/petstore-expanded/gorilla/api"
"github.com/gorilla/mux"
middleware "github.com/oapi-codegen/nethttp-middleware"
"github.com/oapi-codegen/testutil"
"github.com/gorilla/mux"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/petstore-expanded/internal/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ package internal
// server. The file petstore.gen.go is automatically generated from the schema

// Run oapi-codegen to regenerate the petstore boilerplate
//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../petstore-expanded.yaml
//go:generate go run github.com/Drey/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../petstore-expanded.yaml
Loading