Use new config style

Update all examples and tests to use new configuration style.

examples/petstore-expanded/internal/config.yaml

@@ -0,0 +1,5 @@
+package: petstore
+generate:
+  client: true
+  models: true
+output: ../petstore-client.gen.go

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 --old-config-style --package=petstore --generate types,client -o ../petstore-client.gen.go ../petstore-expanded.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml ../petstore-expanded.yaml

internal/test/all_of/config1.yaml

@@ -1,9 +1,9 @@
-output:
-  v1/openapi.gen.go
 package: v1
 generate:
-  - types
-  - skip-prune
-  - spec
+  models: true
+  embedded-spec: true
 compatibility:
   old-merge-schemas: true
+output-options:
+  skip-prune: true
+output: v1/openapi.gen.go

internal/test/all_of/config2.yaml

@@ -1,7 +1,7 @@
-output:
-  v2/openapi.gen.go
 package: v2
 generate:
-  - types
-  - skip-prune
-  - spec
+  models: true
+  embedded-spec: true
+output-options:
+  skip-prune: true
+output: v2/openapi.gen.go

internal/test/all_of/doc.go

@@ -1,4 +1,4 @@
 package all_of
 
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --old-config-style --config=config1.yaml openapi.yaml
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --old-config-style --config=config2.yaml openapi.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config1.yaml openapi.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config2.yaml openapi.yaml

internal/test/components/config.yaml

@@ -1,6 +1,6 @@
-output:
-  components.gen.go
 package: components
 generate:
-  - types
-  - skip-prune
+  models: true
+output-options:
+  skip-prune: true
+output: components.gen.go

internal/test/components/doc.go

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

internal/test/externalref/externalref.cfg.yaml

@@ -7,5 +7,4 @@ import-mapping:
   ./packageB/spec.yaml: github.com/deepmap/oapi-codegen/internal/test/externalref/packageB
 output: externalref.gen.go
 output-options:
-
   skip-prune: true

internal/test/externalref/packageA/config.yaml

@@ -0,0 +1,9 @@
+package: packageA
+generate:
+  models: true
+  embedded-spec: true
+output-options:
+  skip-prune: true
+import-mapping:
+  ../packageB/spec.yaml: github.com/deepmap/oapi-codegen/internal/test/externalref/packageB
+output: externalref.gen.go

internal/test/externalref/packageA/doc.go

@@ -1,3 +1,3 @@
 package packageA
 
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --old-config-style -generate types,skip-prune,spec --package=packageA -o externalref.gen.go --import-mapping=../packageB/spec.yaml:github.com/deepmap/oapi-codegen/internal/test/externalref/packageB spec.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml spec.yaml

internal/test/externalref/packageB/config.yaml

@@ -0,0 +1,7 @@
+package: packageB
+generate:
+  models: true
+  embedded-spec: true
+output-options:
+  skip-prune: true
+output: externalref.gen.go

internal/test/externalref/packageB/doc.go

@@ -1,3 +1,3 @@
 package packageB
 
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --old-config-style -generate types,skip-prune,spec --package=packageB -o externalref.gen.go spec.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml spec.yaml

internal/test/issues/issue-312/config.yaml

@@ -0,0 +1,7 @@
+package: issue_312
+generate:
+  echo-server: true
+  client: true
+  models: true
+  embedded-spec: true
+output: issue.gen.go

internal/test/issues/issue-312/doc.go

@@ -1,3 +1,3 @@
 package issue_312
 
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --old-config-style --package=issue_312 -o issue.gen.go spec.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml spec.yaml

internal/test/issues/issue-52/config.yaml

@@ -0,0 +1,7 @@
+package: issue_52
+generate:
+  echo-server: true
+  client: true
+  models: true
+  embedded-spec: true
+output: issue.gen.go

internal/test/issues/issue-52/doc.go

@@ -1,3 +1,3 @@
 package issue_52
 
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --old-config-style  --package=issue_52 -o issue.gen.go spec.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml spec.yaml

internal/test/issues/issue-grab_import_names/config.yaml

@@ -0,0 +1,7 @@
+package: grab_import_names
+generate:
+  echo-server: true
+  client: true
+  models: true
+  embedded-spec: true
+output: issue.gen.go

internal/test/issues/issue-grab_import_names/doc.go

@@ -1,3 +1,3 @@
 package grab_import_names
 
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --old-config-style  --package=grab_import_names -o issue.gen.go spec.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml spec.yaml

internal/test/issues/issue-illegal_enum_names/config.yaml

@@ -0,0 +1,7 @@
+package: illegal_enum_names
+generate:
+  echo-server: true
+  client: true
+  models: true
+  embedded-spec: true
+output: issue.gen.go

internal/test/issues/issue-illegal_enum_names/doc.go

@@ -1,3 +1,3 @@
 package illegal_enum_names
 
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --old-config-style  --package=illegal_enum_names -o issue.gen.go spec.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml spec.yaml

internal/test/parameters/config.yaml

@@ -0,0 +1,7 @@
+package: parameters
+generate:
+  echo-server: true
+  client: true
+  models: true
+  embedded-spec: true
+output: parameters.gen.go

internal/test/parameters/doc.go

@@ -1,3 +1,3 @@
 package parameters
 
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --old-config-style --package=parameters -o parameters.gen.go parameters.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml parameters.yaml

internal/test/schemas/config.yaml

@@ -0,0 +1,7 @@
+package: schemas
+generate:
+  echo-server: true
+  client: true
+  models: true
+  embedded-spec: true
+output: schemas.gen.go

internal/test/schemas/doc.go

@@ -1,3 +1,3 @@
 package schemas
 
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --old-config-style --package=schemas -o schemas.gen.go schemas.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml schemas.yaml

internal/test/server/config.yaml

@@ -0,0 +1,5 @@
+package: server
+generate:
+  chi-server: true
+  models: true
+output: server.gen.go

internal/test/server/doc.go

@@ -1,4 +1,4 @@
 package server
 
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --old-config-style --generate=types,chi-server --package=server -o server.gen.go ../test-schema.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml ../test-schema.yaml
 //go:generate go run github.com/matryer/moq -out server_moq.gen.go . ServerInterface

pkg/codegen/configuration.go

@@ -40,19 +40,19 @@ type CompatibilityOptions struct {
 	// level. So, new behavior merges OpenAPI specs but generates different code
 	// than we have in the past. Set OldMergeSchemas to true for the old behavior.
 	// Please see https://github.com/deepmap/oapi-codegen/issues/531
-	OldMergeSchemas bool `yaml:"old-merge-schemas"`
+	OldMergeSchemas bool `yaml:"old-merge-schemas,omitempty"`
 	// Enum values can generate conflicting typenames, so we've updated the
 	// code for enum generation to avoid these conflicts, but it will result
 	// in some enum types being renamed in existing code. Set OldEnumConflicts to true
 	// to revert to old behavior. Please see:
 	// Please see https://github.com/deepmap/oapi-codegen/issues/549
-	OldEnumConflicts bool `yaml:"old-enum-conflicts"`
+	OldEnumConflicts bool `yaml:"old-enum-conflicts,omitempty"`
 	// It was a mistake to generate a go type definition for every $ref in
 	// the OpenAPI schema. New behavior uses type aliases where possible, but
 	// this can generate code which breaks existing builds. Set OldAliasing to true
 	// for old behavior.
 	// Please see https://github.com/deepmap/oapi-codegen/issues/549
-	OldAliasing bool `yaml:"old-aliasing"`
+	OldAliasing bool `yaml:"old-aliasing,omitempty"`
 }
 
 // OutputOptions are used to modify the output code in some way.