Bump module import path to v2

Ahead of release, we need to update to the v2 package structure, which
requires quite a few changes across packages.

README.md

@@ -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/cmd/oapi-codegen@latest
+ go install github.com/deepmap/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

cmd/oapi-codegen/oapi-codegen.go

@@ -25,8 +25,8 @@ import (
 
  "gopkg.in/yaml.v2"
 
- "github.com/deepmap/oapi-codegen/pkg/codegen"
- "github.com/deepmap/oapi-codegen/pkg/util"
+ "github.com/deepmap/oapi-codegen/v2/pkg/codegen"
+ "github.com/deepmap/oapi-codegen/v2/pkg/util"
 )
 
 func errExit(format string, args ...interface{}) {

cmd/oapi-codegen/oapi-codegen_test.go

@@ -3,7 +3,7 @@ package main
 import (
  "testing"
 
- "github.com/deepmap/oapi-codegen/pkg/util"
+ "github.com/deepmap/oapi-codegen/v2/pkg/util"
 )
 
 func TestLoader(t *testing.T) {

examples/authenticated-api/echo/api/doc.go

@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml ../../api.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml

examples/authenticated-api/echo/main.go

@@ -5,8 +5,8 @@ import (
  "log"
  "net"
 
- "github.com/deepmap/oapi-codegen/examples/authenticated-api/echo/api"
- "github.com/deepmap/oapi-codegen/examples/authenticated-api/echo/server"
+ "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/api"
+ "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/server"
  "github.com/labstack/echo/v4"
  "github.com/labstack/echo/v4/middleware"
 )

examples/authenticated-api/echo/server/fake_jws.go

@@ -4,7 +4,7 @@ import (
  "crypto/ecdsa"
  "fmt"
 
- "github.com/deepmap/oapi-codegen/pkg/ecdsafile"
+ "github.com/deepmap/oapi-codegen/v2/pkg/ecdsafile"
  "github.com/lestrrat-go/jwx/jwa"
  "github.com/lestrrat-go/jwx/jwk"
  "github.com/lestrrat-go/jwx/jws"

examples/authenticated-api/echo/server/server.go

@@ -6,7 +6,7 @@ import (
  "sort"
  "sync"
 
- "github.com/deepmap/oapi-codegen/examples/authenticated-api/echo/api"
+ "github.com/deepmap/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"

examples/authenticated-api/echo/server/server_test.go

@@ -4,7 +4,7 @@ import (
  "net/http"
  "testing"
 
- "github.com/deepmap/oapi-codegen/examples/authenticated-api/echo/api"
+ "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/api"
  "github.com/oapi-codegen/testutil"
  "github.com/labstack/echo/v4"
  "github.com/stretchr/testify/assert"

examples/custom-client-type/doc.go

@@ -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/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml

examples/go.mod

@@ -1,11 +1,11 @@
-module github.com/deepmap/oapi-codegen/examples
+module github.com/deepmap/oapi-codegen/v2/examples
 
 go 1.20
 
-replace github.com/deepmap/oapi-codegen => ../
+replace github.com/deepmap/oapi-codegen/v2 => ../
 
 require (
- github.com/deepmap/oapi-codegen v0.0.0-00010101000000-000000000000
+ github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
  github.com/getkin/kin-openapi v0.118.0
  github.com/gin-gonic/gin v1.9.1
  github.com/go-chi/chi/v5 v5.0.10

examples/no-vcs-version-override/echo/api/doc.go

@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run -ldflags "-X main.noVCSVersionOverride=v123.456.789" github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml ../../api.yaml
+//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

examples/petstore-expanded/chi/api/petstore.go

@@ -1,4 +1,4 @@
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml
 
 package api
 

examples/petstore-expanded/chi/petstore.go

@@ -12,7 +12,7 @@ import (
  "net/http"
  "os"
 
- "github.com/deepmap/oapi-codegen/examples/petstore-expanded/chi/api"
+ "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/chi/api"
  middleware "github.com/oapi-codegen/nethttp-middleware"
  "github.com/go-chi/chi/v5"
 )

examples/petstore-expanded/chi/petstore_test.go

@@ -7,7 +7,7 @@ import (
  "net/http/httptest"
  "testing"
 
- "github.com/deepmap/oapi-codegen/examples/petstore-expanded/chi/api"
+ "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/chi/api"
  middleware "github.com/oapi-codegen/nethttp-middleware"
  "github.com/oapi-codegen/testutil"
  "github.com/go-chi/chi/v5"

examples/petstore-expanded/echo/api/petstore.go

@@ -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/cmd/oapi-codegen --config=models.cfg.yaml ../../petstore-expanded.yaml
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
+//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
 
 package api
 
@@ -22,7 +22,7 @@ import (
  "net/http"
  "sync"
 
- "github.com/deepmap/oapi-codegen/examples/petstore-expanded/echo/api/models"
+ "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models"
  "github.com/labstack/echo/v4"
 )
 

examples/petstore-expanded/echo/api/server.cfg.yaml

@@ -1,7 +1,7 @@
 package: api
 output: petstore-server.gen.go
 additional-imports:
- - package: github.com/deepmap/oapi-codegen/examples/petstore-expanded/echo/api/models
+ - package: github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models
  alias: .
 generate:
  echo-server: true

examples/petstore-expanded/echo/petstore.go

@@ -11,7 +11,7 @@ import (
  "net"
  "os"
 
- "github.com/deepmap/oapi-codegen/examples/petstore-expanded/echo/api"
+ "github.com/deepmap/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"

examples/petstore-expanded/echo/petstore_test.go

@@ -19,8 +19,8 @@ import (
  "net/http"
  "testing"
 
- "github.com/deepmap/oapi-codegen/examples/petstore-expanded/echo/api"
- "github.com/deepmap/oapi-codegen/examples/petstore-expanded/echo/api/models"
+ "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/labstack/echo/v4"
  echoMiddleware "github.com/labstack/echo/v4/middleware"

examples/petstore-expanded/echo/pkg_codegen_petstore_test.go

@@ -9,9 +9,9 @@ import (
  "net/http/httptest"
  "testing"
 
- examplePetstoreClient "github.com/deepmap/oapi-codegen/examples/petstore-expanded"
- examplePetstore "github.com/deepmap/oapi-codegen/examples/petstore-expanded/echo/api"
- "github.com/deepmap/oapi-codegen/pkg/codegen"
+ 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"
  "github.com/stretchr/testify/assert"
  "golang.org/x/lint"
 )

examples/petstore-expanded/fiber/api/petstore.go

@@ -1,5 +1,5 @@
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
+//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
 
 package api
 

examples/petstore-expanded/fiber/petstore.go

@@ -13,7 +13,7 @@ import (
 
  "github.com/gofiber/fiber/v2"
 
- "github.com/deepmap/oapi-codegen/examples/petstore-expanded/fiber/api"
+ "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/fiber/api"
  middleware "github.com/oapi-codegen/fiber-middleware"
 )
 

examples/petstore-expanded/fiber/petstore_test.go

@@ -12,7 +12,7 @@ import (
  "github.com/gofiber/fiber/v2"
  "github.com/stretchr/testify/assert"
 
- "github.com/deepmap/oapi-codegen/examples/petstore-expanded/fiber/api"
+ "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/fiber/api"
 )
 
 func doGet(t *testing.T, app *fiber.App, rawURL string) (*http.Response, error) {

examples/petstore-expanded/gin/api/petstore.go

@@ -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/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
+//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
 
 package api
 

examples/petstore-expanded/gin/petstore.go

@@ -14,7 +14,7 @@ import (
 
  "github.com/gin-gonic/gin"
 
- "github.com/deepmap/oapi-codegen/examples/petstore-expanded/gin/api"
+ "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gin/api"
  middleware "github.com/oapi-codegen/gin-middleware"
 )
 

examples/petstore-expanded/gin/petstore_test.go

@@ -7,7 +7,7 @@ import (
  "net/http/httptest"
  "testing"
 
- "github.com/deepmap/oapi-codegen/examples/petstore-expanded/gin/api"
+ "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gin/api"
  "github.com/oapi-codegen/testutil"
  "github.com/stretchr/testify/assert"
 )

examples/petstore-expanded/gorilla/api/petstore.go

@@ -1,4 +1,4 @@
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml
 
 package api
 

examples/petstore-expanded/gorilla/petstore.go

@@ -12,7 +12,7 @@ import (
  "net/http"
  "os"
 
- "github.com/deepmap/oapi-codegen/examples/petstore-expanded/gorilla/api"
+ "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gorilla/api"
  middleware "github.com/oapi-codegen/nethttp-middleware"
  "github.com/gorilla/mux"
 )

examples/petstore-expanded/gorilla/petstore_test.go

@@ -7,7 +7,7 @@ import (
  "net/http/httptest"
  "testing"
 
- "github.com/deepmap/oapi-codegen/examples/petstore-expanded/gorilla/api"
+ "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gorilla/api"
  middleware "github.com/oapi-codegen/nethttp-middleware"
  "github.com/oapi-codegen/testutil"
  "github.com/gorilla/mux"

examples/petstore-expanded/internal/doc.go

@@ -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/cmd/oapi-codegen --config=config.yaml ../petstore-expanded.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../petstore-expanded.yaml

examples/petstore-expanded/iris/api/petstore.go

@@ -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/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
+//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
 
 package api