From 808bbc3033a562e69854d3649baf8f08692e6898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Pa=C5=9Bko?= Date: Wed, 6 Sep 2023 10:03:47 +0200 Subject: [PATCH 1/3] handle response_body option --- cmd/protoc-gen-openapi/generator/generator.go | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/cmd/protoc-gen-openapi/generator/generator.go b/cmd/protoc-gen-openapi/generator/generator.go index e548ab21..7d80d409 100644 --- a/cmd/protoc-gen-openapi/generator/generator.go +++ b/cmd/protoc-gen-openapi/generator/generator.go @@ -441,14 +441,15 @@ func (g *OpenAPIv3Generator) buildOperationV3( description string, defaultHost string, path string, - bodyField string, + reqBodyField string, + resBodyField string, inputMessage *protogen.Message, outputMessage *protogen.Message, ) (*v3.Operation, string) { // coveredParameters tracks the parameters that have been used in the body or path. coveredParameters := make([]string, 0) - if bodyField != "" { - coveredParameters = append(coveredParameters, bodyField) + if reqBodyField != "" { + coveredParameters = append(coveredParameters, reqBodyField) } // Initialize the list of operation parameters. parameters := []*v3.ParameterOrReference{} @@ -542,10 +543,10 @@ func (g *OpenAPIv3Generator) buildOperationV3( } // Add any unhandled fields in the request message as query parameters. - if bodyField != "*" && string(inputMessage.Desc.FullName()) != "google.api.HttpBody" { + if reqBodyField != "*" && string(inputMessage.Desc.FullName()) != "google.api.HttpBody" { for _, field := range inputMessage.Fields { fieldName := string(field.Desc.Name()) - if !contains(coveredParameters, fieldName) && fieldName != bodyField { + if !contains(coveredParameters, fieldName) && fieldName != reqBodyField { fieldParams := g.buildQueryParamsV3(field) parameters = append(parameters, fieldParams...) } @@ -553,6 +554,16 @@ func (g *OpenAPIv3Generator) buildOperationV3( } // Create the response. + if resBodyField != "" && resBodyField != "*" { + // If body refers to a message field, use that type. + for _, field := range outputMessage.Fields { + if string(field.Desc.Name()) == resBodyField { + outputMessage = field.Message + break + } + } + } + name, content := g.reflect.responseContentForMessage(outputMessage.Desc) responses := &v3.Responses{ ResponseOrReference: []*v3.NamedResponseOrReference{ @@ -615,17 +626,17 @@ func (g *OpenAPIv3Generator) buildOperationV3( } // If a body field is specified, we need to pass a message as the request body. - if bodyField != "" { + if reqBodyField != "" { var requestSchema *v3.SchemaOrReference - if bodyField == "*" { + if reqBodyField == "*" { // Pass the entire request message as the request body. requestSchema = g.reflect.schemaOrReferenceForMessage(inputMessage.Desc) } else { // If body refers to a message field, use that type. for _, field := range inputMessage.Fields { - if string(field.Desc.Name()) == bodyField { + if string(field.Desc.Name()) == reqBodyField { switch field.Desc.Kind() { case protoreflect.StringKind: requestSchema = &v3.SchemaOrReference{ @@ -722,9 +733,12 @@ func (g *OpenAPIv3Generator) addPathsToDocumentV3(d *v3.Document, services []*pr for _, rule := range rules { var path string var methodName string - var body string + var reqBody string + var resBody string + + reqBody = rule.Body + resBody = rule.ResponseBody - body = rule.Body switch pattern := rule.Pattern.(type) { case *annotations.HttpRule_Get: path = pattern.Get @@ -751,7 +765,7 @@ func (g *OpenAPIv3Generator) addPathsToDocumentV3(d *v3.Document, services []*pr defaultHost := proto.GetExtension(service.Desc.Options(), annotations.E_DefaultHost).(string) op, path2 := g.buildOperationV3( - d, operationID, service.GoName, comment, defaultHost, path, body, inputMessage, outputMessage) + d, operationID, service.GoName, comment, defaultHost, path, reqBody, resBody, inputMessage, outputMessage) // Merge any `Operation` annotations with the current extOperation := proto.GetExtension(method.Desc.Options(), v3.E_Operation) From 5f00e0d5c547a6238fb5f920e12d7744479262b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Pa=C5=9Bko?= Date: Wed, 6 Sep 2023 12:36:57 +0200 Subject: [PATCH 2/3] rename packages --- README.md | 2 +- cmd/disco/README.md | 2 +- cmd/disco/main.go | 4 ++-- cmd/parse-linter-output/main.go | 2 +- cmd/petstore-builder/petstore-v2.go | 2 +- cmd/petstore-builder/petstore-v3.go | 2 +- cmd/protoc-gen-jsonschema/README.md | 2 +- .../examples/tests/embedded/message.proto | 2 +- .../examples/tests/jsonoptions/message.proto | 2 +- .../examples/tests/mapfields/message.proto | 2 +- .../tests/protobuftypes/message.proto | 2 +- .../examples/tests/protobuftypes/openapi.yaml | 2 +- .../tests/protobuftypes/openapi_json.yaml | 2 +- .../generator/json-schema.go | 2 +- cmd/protoc-gen-jsonschema/main.go | 2 +- cmd/protoc-gen-openapi/README.md | 2 +- .../google/example/library/v1/openapi.yaml | 2 +- .../library/v1/openapi_default_response.yaml | 2 +- .../library/v1/openapi_fq_schema_naming.yaml | 2 +- .../example/library/v1/openapi_json.yaml | 2 +- .../library/v1/openapi_string_enum.yaml | 2 +- .../tests/additional_bindings/message.proto | 2 +- .../tests/additional_bindings/openapi.yaml | 2 +- .../examples/tests/allofwrap/message.proto | 2 +- .../examples/tests/allofwrap/openapi.yaml | 2 +- .../examples/tests/bodymapping/message.proto | 2 +- .../examples/tests/bodymapping/openapi.yaml | 2 +- .../bodymapping/openapi_default_response.yaml | 2 +- .../bodymapping/openapi_fq_schema_naming.yaml | 2 +- .../tests/bodymapping/openapi_json.yaml | 2 +- .../bodymapping/openapi_string_enum.yaml | 2 +- .../examples/tests/enumoptions/message.proto | 2 +- .../examples/tests/enumoptions/openapi.yaml | 2 +- .../enumoptions/openapi_default_response.yaml | 2 +- .../enumoptions/openapi_fq_schema_naming.yaml | 2 +- .../tests/enumoptions/openapi_json.yaml | 2 +- .../enumoptions/openapi_string_enum.yaml | 2 +- .../examples/tests/jsonoptions/message.proto | 2 +- .../examples/tests/jsonoptions/openapi.yaml | 2 +- .../jsonoptions/openapi_default_response.yaml | 2 +- .../jsonoptions/openapi_fq_schema_naming.yaml | 2 +- .../tests/jsonoptions/openapi_json.yaml | 2 +- .../jsonoptions/openapi_string_enum.yaml | 2 +- .../examples/tests/mapfields/message.proto | 2 +- .../examples/tests/mapfields/openapi.yaml | 2 +- .../mapfields/openapi_default_response.yaml | 2 +- .../mapfields/openapi_fq_schema_naming.yaml | 2 +- .../tests/mapfields/openapi_json.yaml | 2 +- .../tests/mapfields/openapi_string_enum.yaml | 2 +- .../tests/noannotations/message.proto | 2 +- .../examples/tests/noannotations/openapi.yaml | 2 +- .../openapi_default_response.yaml | 2 +- .../openapi_fq_schema_naming.yaml | 2 +- .../tests/noannotations/openapi_json.yaml | 2 +- .../noannotations/openapi_string_enum.yaml | 2 +- .../tests/openapiv3annotations/message.proto | 4 ++-- .../tests/openapiv3annotations/openapi.yaml | 4 ++-- .../openapi_default_response.yaml | 4 ++-- .../openapi_fq_schema_naming.yaml | 4 ++-- .../openapiv3annotations/openapi_json.yaml | 4 ++-- .../openapi_string_enum.yaml | 4 ++-- .../examples/tests/pathparams/message.proto | 2 +- .../examples/tests/pathparams/openapi.yaml | 2 +- .../pathparams/openapi_default_response.yaml | 2 +- .../pathparams/openapi_fq_schema_naming.yaml | 2 +- .../tests/pathparams/openapi_json.yaml | 2 +- .../tests/pathparams/openapi_string_enum.yaml | 2 +- .../tests/protobuftypes/message.proto | 2 +- .../examples/tests/protobuftypes/openapi.yaml | 2 +- .../openapi_default_response.yaml | 2 +- .../openapi_fq_schema_naming.yaml | 2 +- .../tests/protobuftypes/openapi_json.yaml | 2 +- .../protobuftypes/openapi_string_enum.yaml | 2 +- .../examples/tests/rpctypes/message.proto | 2 +- .../examples/tests/rpctypes/openapi.yaml | 2 +- .../rpctypes/openapi_default_response.yaml | 2 +- .../rpctypes/openapi_fq_schema_naming.yaml | 2 +- .../examples/tests/rpctypes/openapi_json.yaml | 2 +- .../tests/rpctypes/openapi_string_enum.yaml | 2 +- cmd/protoc-gen-openapi/generator/generator.go | 6 ++--- cmd/protoc-gen-openapi/generator/reflector.go | 4 ++-- .../generator/wellknown/mediatypes.go | 2 +- .../generator/wellknown/schemas.go | 12 ++++++---- cmd/protoc-gen-openapi/main.go | 2 +- cmd/report-messages/main.go | 4 ++-- cmd/report/main.go | 4 ++-- cmd/vocabulary-operations/main.go | 4 ++-- conversions/openapiv2.go | 4 ++-- conversions/openapiv3.go | 4 ++-- discovery/discovery.go | 2 +- discovery/document.go | 2 +- discovery/list.go | 2 +- generate-gnostic/domain.go | 2 +- generate-gnostic/generate-compiler.go | 2 +- generate-gnostic/generate-extension.go | 14 ++++++------ generate-gnostic/generate-proto.go | 2 +- generate-gnostic/main.go | 4 ++-- generate-gnostic/types.go | 2 +- gnostic.go | 2 +- gnostic_test.go | 2 +- go.mod | 3 ++- go.sum | 6 +++++ jsonwriter/writer_test.go | 4 ++-- lib/gnostic.go | 22 ++++++++++--------- .../go/gnostic-lint-descriptions/linter_v2.go | 4 ++-- .../go/gnostic-lint-descriptions/linter_v3.go | 4 ++-- linters/go/gnostic-lint-descriptions/main.go | 6 ++--- linters/go/gnostic-lint-paths/main.go | 6 ++--- metrics/lint/aip-linterv2.go | 8 +++---- metrics/lint/aip-linterv3.go | 8 +++---- metrics/vocabulary/difference.go | 2 +- metrics/vocabulary/discovery.go | 4 ++-- metrics/vocabulary/filterCommon.go | 2 +- metrics/vocabulary/intersection.go | 2 +- metrics/vocabulary/openapiv2.go | 4 ++-- metrics/vocabulary/openapiv3.go | 4 ++-- metrics/vocabulary/union.go | 2 +- metrics/vocabulary/version.go | 2 +- metrics/vocabulary/vocabulary.go | 2 +- metrics/vocabulary/vocabulary_test.go | 8 +++---- openapiv2/OpenAPIv2.go | 2 +- openapiv2/document.go | 2 +- openapiv3/OpenAPIv3.go | 2 +- openapiv3/OpenAPIv3.proto | 2 +- openapiv3/annotations.proto | 2 +- openapiv3/document.go | 2 +- openapiv3/schema-generator/main.go | 2 +- plugins/environment.go | 8 +++---- plugins/gnostic-analyze/main.go | 19 ++++++++-------- plugins/gnostic-analyze/statistics/statsv2.go | 2 +- plugins/gnostic-analyze/statistics/statsv3.go | 2 +- plugins/gnostic-analyze/summarize/main.go | 2 +- plugins/gnostic-complexity/main.go | 8 +++---- plugins/gnostic-linter/main.go | 10 ++++----- plugins/gnostic-plugin-request/main.go | 8 +++---- .../gnostic-process-plugin-response/main.go | 2 +- plugins/gnostic-summary/main.go | 8 +++---- plugins/gnostic-vocabulary/main.go | 14 ++++++------ surface/model_openapiv2.go | 4 ++-- surface/model_openapiv2_test.go | 2 +- surface/model_openapiv3.go | 4 ++-- surface/model_openapiv3_test.go | 2 +- tools/format-schema/main.go | 2 +- tools/j2y2j/main.go | 2 +- 144 files changed, 242 insertions(+), 228 deletions(-) diff --git a/README.md b/README.md index 9052de3f..f5a1993b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Go Actions Status](https://github.com/google/gnostic/workflows/Go/badge.svg)](https://github.com/google/gnostic/actions) +[![Go Actions Status](https://github.com/eqlabs/gnostic/workflows/Go/badge.svg)](https://github.com/eqlabs/gnostic/actions) # ⨁ gnostic diff --git a/cmd/disco/README.md b/cmd/disco/README.md index 6b87b7e5..08665b15 100644 --- a/cmd/disco/README.md +++ b/cmd/disco/README.md @@ -6,7 +6,7 @@ descriptions to OpenAPI. Installation: - go install github.com/google/gnostic/cmd/disco + go install github.com/eqlabs/gnostic/cmd/disco Usage: diff --git a/cmd/disco/main.go b/cmd/disco/main.go index ec5a067e..e201ae1c 100644 --- a/cmd/disco/main.go +++ b/cmd/disco/main.go @@ -24,8 +24,8 @@ import ( "github.com/docopt/docopt-go" "github.com/golang/protobuf/proto" - "github.com/google/gnostic/conversions" - discovery "github.com/google/gnostic/discovery" + "github.com/eqlabs/gnostic/conversions" + discovery "github.com/eqlabs/gnostic/discovery" ) func main() { diff --git a/cmd/parse-linter-output/main.go b/cmd/parse-linter-output/main.go index c310f296..869f4b27 100644 --- a/cmd/parse-linter-output/main.go +++ b/cmd/parse-linter-output/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - lint "github.com/google/gnostic/metrics/lint" + lint "github.com/eqlabs/gnostic/metrics/lint" ) func main() { diff --git a/cmd/petstore-builder/petstore-v2.go b/cmd/petstore-builder/petstore-v2.go index ec2cd6e2..785cf462 100644 --- a/cmd/petstore-builder/petstore-v2.go +++ b/cmd/petstore-builder/petstore-v2.go @@ -15,7 +15,7 @@ package main import ( - v2 "github.com/google/gnostic/openapiv2" + v2 "github.com/eqlabs/gnostic/openapiv2" ) func buildDocumentV2() *v2.Document { diff --git a/cmd/petstore-builder/petstore-v3.go b/cmd/petstore-builder/petstore-v3.go index 9042ff95..e5d1bb57 100644 --- a/cmd/petstore-builder/petstore-v3.go +++ b/cmd/petstore-builder/petstore-v3.go @@ -15,7 +15,7 @@ package main import ( - v3 "github.com/google/gnostic/openapiv3" + v3 "github.com/eqlabs/gnostic/openapiv3" ) func buildDocumentV3() *v3.Document { diff --git a/cmd/protoc-gen-jsonschema/README.md b/cmd/protoc-gen-jsonschema/README.md index 62e87d01..231d7a6d 100644 --- a/cmd/protoc-gen-jsonschema/README.md +++ b/cmd/protoc-gen-jsonschema/README.md @@ -5,7 +5,7 @@ JSON Schemas for Protocol Buffer messages. Installation: - go install github.com/google/gnostic/cmd/protoc-gen-jsonschema + go install github.com/eqlabs/gnostic/cmd/protoc-gen-jsonschema Usage: diff --git a/cmd/protoc-gen-jsonschema/examples/tests/embedded/message.proto b/cmd/protoc-gen-jsonschema/examples/tests/embedded/message.proto index 399b11b3..3c291752 100644 --- a/cmd/protoc-gen-jsonschema/examples/tests/embedded/message.proto +++ b/cmd/protoc-gen-jsonschema/examples/tests/embedded/message.proto @@ -19,7 +19,7 @@ package tests.embedded.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/embedded/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/embedded/message/v1;message"; service Messaging { rpc UpdateMessage(Message) returns (Message) { diff --git a/cmd/protoc-gen-jsonschema/examples/tests/jsonoptions/message.proto b/cmd/protoc-gen-jsonschema/examples/tests/jsonoptions/message.proto index c76a5010..5a66c76f 100644 --- a/cmd/protoc-gen-jsonschema/examples/tests/jsonoptions/message.proto +++ b/cmd/protoc-gen-jsonschema/examples/tests/jsonoptions/message.proto @@ -19,7 +19,7 @@ package tests.jsonnames.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/jsonnames/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/jsonnames/message/v1;message"; // Messaging service service Messaging { diff --git a/cmd/protoc-gen-jsonschema/examples/tests/mapfields/message.proto b/cmd/protoc-gen-jsonschema/examples/tests/mapfields/message.proto index 441406ff..d6e923dc 100644 --- a/cmd/protoc-gen-jsonschema/examples/tests/mapfields/message.proto +++ b/cmd/protoc-gen-jsonschema/examples/tests/mapfields/message.proto @@ -22,7 +22,7 @@ import "google/api/field_behavior.proto"; import "google/protobuf/struct.proto"; import "google/protobuf/empty.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/mapfields/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/mapfields/message/v1;message"; service Messaging { rpc UpdateMessage(Message) returns (Message) { diff --git a/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/message.proto b/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/message.proto index 5489ed1c..169a1400 100644 --- a/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/message.proto +++ b/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/message.proto @@ -22,7 +22,7 @@ import "google/api/annotations.proto"; import "google/protobuf/struct.proto"; import "google/protobuf/empty.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/protobuftypes/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/protobuftypes/message/v1;message"; service Messaging { option (google.api.default_host) = "foo.googleapi.com"; diff --git a/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi.yaml b/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi.yaml index 1a995ce0..f79e598e 100644 --- a/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi.yaml +++ b/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi_json.yaml b/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi_json.yaml index f6e0ebd0..757975cd 100644 --- a/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi_json.yaml +++ b/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-jsonschema/generator/json-schema.go b/cmd/protoc-gen-jsonschema/generator/json-schema.go index d1f8c9ac..8e295c02 100644 --- a/cmd/protoc-gen-jsonschema/generator/json-schema.go +++ b/cmd/protoc-gen-jsonschema/generator/json-schema.go @@ -26,7 +26,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" - "github.com/google/gnostic/jsonschema" + "github.com/eqlabs/gnostic/jsonschema" ) var ( diff --git a/cmd/protoc-gen-jsonschema/main.go b/cmd/protoc-gen-jsonschema/main.go index 93fa54e5..3f2afb41 100644 --- a/cmd/protoc-gen-jsonschema/main.go +++ b/cmd/protoc-gen-jsonschema/main.go @@ -18,7 +18,7 @@ package main import ( "flag" - "github.com/google/gnostic/cmd/protoc-gen-jsonschema/generator" + "github.com/eqlabs/gnostic/cmd/protoc-gen-jsonschema/generator" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/types/pluginpb" ) diff --git a/cmd/protoc-gen-openapi/README.md b/cmd/protoc-gen-openapi/README.md index 154d7202..ab8d0dd0 100644 --- a/cmd/protoc-gen-openapi/README.md +++ b/cmd/protoc-gen-openapi/README.md @@ -6,7 +6,7 @@ Protocol Buffer service. Installation: - go install github.com/google/gnostic/cmd/protoc-gen-openapi + go install github.com/eqlabs/gnostic/cmd/protoc-gen-openapi Usage: diff --git a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi.yaml b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi.yaml index 219a0b24..862aecc7 100644 --- a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_default_response.yaml index f1ecadb6..d0a06245 100644 --- a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_fq_schema_naming.yaml index 2b908fa3..3c8a74a9 100644 --- a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_json.yaml index a0ea21f4..30e767c4 100644 --- a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_string_enum.yaml index f1ecadb6..d0a06245 100644 --- a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/additional_bindings/message.proto b/cmd/protoc-gen-openapi/examples/tests/additional_bindings/message.proto index ef6928a3..fe721d0e 100644 --- a/cmd/protoc-gen-openapi/examples/tests/additional_bindings/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/additional_bindings/message.proto @@ -19,7 +19,7 @@ package tests.additional_bindings.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/additional_bindings/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/additional_bindings/message/v1;message"; service Messaging { rpc UpdateMessage(Message) returns(Message) { diff --git a/cmd/protoc-gen-openapi/examples/tests/additional_bindings/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/additional_bindings/openapi.yaml index 15c32d3e..8007f646 100644 --- a/cmd/protoc-gen-openapi/examples/tests/additional_bindings/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/additional_bindings/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/allofwrap/message.proto b/cmd/protoc-gen-openapi/examples/tests/allofwrap/message.proto index 55049a70..99aab1f5 100644 --- a/cmd/protoc-gen-openapi/examples/tests/allofwrap/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/allofwrap/message.proto @@ -20,7 +20,7 @@ package tests.allofwrap.message.v1; import "google/api/annotations.proto"; import "google/api/field_behavior.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/bodymapping/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/bodymapping/message/v1;message"; service Messaging { rpc UpdateMessage(Message) returns(Message) { diff --git a/cmd/protoc-gen-openapi/examples/tests/allofwrap/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/allofwrap/openapi.yaml index c9c35391..bafbefaf 100644 --- a/cmd/protoc-gen-openapi/examples/tests/allofwrap/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/allofwrap/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/bodymapping/message.proto b/cmd/protoc-gen-openapi/examples/tests/bodymapping/message.proto index f8c350fc..3ce8f812 100644 --- a/cmd/protoc-gen-openapi/examples/tests/bodymapping/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/bodymapping/message.proto @@ -19,7 +19,7 @@ package tests.bodymappying.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/bodymapping/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/bodymapping/message/v1;message"; service Messaging { rpc UpdateMessage(Message) returns(Message) { diff --git a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi.yaml index 261792b4..bbdbcd8b 100644 --- a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_default_response.yaml index 1643daff..9c802bc2 100644 --- a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_fq_schema_naming.yaml index 45edf441..88be32d2 100644 --- a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_json.yaml index a6caaaee..66dcc014 100644 --- a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_string_enum.yaml index 1643daff..9c802bc2 100644 --- a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/enumoptions/message.proto b/cmd/protoc-gen-openapi/examples/tests/enumoptions/message.proto index 2f4ac65b..57645c32 100644 --- a/cmd/protoc-gen-openapi/examples/tests/enumoptions/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/enumoptions/message.proto @@ -19,7 +19,7 @@ package tests.enumoptions.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/enumoptions/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/enumoptions/message/v1;message"; // Messaging service service Messaging { diff --git a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi.yaml index 11073498..3253356b 100644 --- a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_default_response.yaml index 11073498..3253356b 100644 --- a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_fq_schema_naming.yaml index 9f162c6b..df5f17ce 100644 --- a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_json.yaml index 9aada7aa..1eb1f243 100644 --- a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_string_enum.yaml index 641d2eb8..dcc7d009 100644 --- a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/message.proto b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/message.proto index 5e83235d..6c7b91db 100644 --- a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/message.proto @@ -19,7 +19,7 @@ package tests.jsonnames.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/jsonnames/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/jsonnames/message/v1;message"; // Messaging service service Messaging { diff --git a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi.yaml index 0e7a8f80..79e8397c 100644 --- a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_default_response.yaml index d653131a..16f482f9 100644 --- a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_fq_schema_naming.yaml index 13ef0fd2..c9eaa548 100644 --- a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_json.yaml index aa75c871..102a0ca1 100644 --- a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_string_enum.yaml index d653131a..16f482f9 100644 --- a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/mapfields/message.proto b/cmd/protoc-gen-openapi/examples/tests/mapfields/message.proto index e0b490f1..4c14b9f8 100644 --- a/cmd/protoc-gen-openapi/examples/tests/mapfields/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/mapfields/message.proto @@ -20,7 +20,7 @@ package tests.mapfields.message.v1; import "google/api/annotations.proto"; import "google/protobuf/struct.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/mapfields/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/mapfields/message/v1;message"; service Messaging { rpc UpdateMessage(Message) returns(Message) { diff --git a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi.yaml index c63dc62e..31c8a84f 100644 --- a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_default_response.yaml index 4d510192..7a6890cd 100644 --- a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_fq_schema_naming.yaml index 1c343d1e..3df0f365 100644 --- a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_json.yaml index 8e8b796e..222ae37f 100644 --- a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_string_enum.yaml index 4d510192..7a6890cd 100644 --- a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/noannotations/message.proto b/cmd/protoc-gen-openapi/examples/tests/noannotations/message.proto index bc554485..1f91d401 100644 --- a/cmd/protoc-gen-openapi/examples/tests/noannotations/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/noannotations/message.proto @@ -19,7 +19,7 @@ package tests.noannotations.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/noannotations/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/noannotations/message/v1;message"; service Messaging1 { rpc UpdateMessage(Message) returns(Message) { diff --git a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi.yaml index d00cbb93..c33380e6 100644 --- a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_default_response.yaml index d00cbb93..c33380e6 100644 --- a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_fq_schema_naming.yaml index 7f2e9e79..27dbbe11 100644 --- a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_json.yaml index d7d35208..73d5aae5 100644 --- a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_string_enum.yaml index d00cbb93..c33380e6 100644 --- a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/message.proto b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/message.proto index fa9f6f0f..f3299e62 100644 --- a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/message.proto @@ -20,7 +20,7 @@ package tests.openapiv3annotations.message.v1; import "google/api/annotations.proto"; import "openapiv3/annotations.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/openapiv3annotations/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/openapiv3annotations/message/v1;message"; option (openapi.v3.document) = { info: { @@ -34,7 +34,7 @@ option (openapi.v3.document) = { } license: { name: "Apache License"; - url: "https://github.com/google/gnostic/blob/master/LICENSE"; + url: "https://github.com/eqlabs/gnostic/blob/master/LICENSE"; } } components: { diff --git a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi.yaml index b1e31f0f..cd5810af 100644 --- a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: @@ -11,7 +11,7 @@ info: email: gnostic@google.com license: name: Apache License - url: https://github.com/google/gnostic/blob/master/LICENSE + url: https://github.com/eqlabs/gnostic/blob/master/LICENSE version: Version from annotation paths: /v1/messages/{message_id}: diff --git a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_default_response.yaml index b1e31f0f..cd5810af 100644 --- a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: @@ -11,7 +11,7 @@ info: email: gnostic@google.com license: name: Apache License - url: https://github.com/google/gnostic/blob/master/LICENSE + url: https://github.com/eqlabs/gnostic/blob/master/LICENSE version: Version from annotation paths: /v1/messages/{message_id}: diff --git a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_fq_schema_naming.yaml index 5dbbceca..1175153c 100644 --- a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: @@ -11,7 +11,7 @@ info: email: gnostic@google.com license: name: Apache License - url: https://github.com/google/gnostic/blob/master/LICENSE + url: https://github.com/eqlabs/gnostic/blob/master/LICENSE version: Version from annotation paths: /v1/messages/{message_id}: diff --git a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_json.yaml index b1e31f0f..cd5810af 100644 --- a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: @@ -11,7 +11,7 @@ info: email: gnostic@google.com license: name: Apache License - url: https://github.com/google/gnostic/blob/master/LICENSE + url: https://github.com/eqlabs/gnostic/blob/master/LICENSE version: Version from annotation paths: /v1/messages/{message_id}: diff --git a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_string_enum.yaml index b1e31f0f..cd5810af 100644 --- a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: @@ -11,7 +11,7 @@ info: email: gnostic@google.com license: name: Apache License - url: https://github.com/google/gnostic/blob/master/LICENSE + url: https://github.com/eqlabs/gnostic/blob/master/LICENSE version: Version from annotation paths: /v1/messages/{message_id}: diff --git a/cmd/protoc-gen-openapi/examples/tests/pathparams/message.proto b/cmd/protoc-gen-openapi/examples/tests/pathparams/message.proto index 7e427134..a5d6732a 100644 --- a/cmd/protoc-gen-openapi/examples/tests/pathparams/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/pathparams/message.proto @@ -19,7 +19,7 @@ package tests.pathparams.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/pathparams/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/pathparams/message/v1;message"; service Messaging { rpc GetMessage(GetMessageRequest) returns (Message) { diff --git a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi.yaml index f65b66d2..5fd86e25 100644 --- a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_default_response.yaml index 470bab61..05b79112 100644 --- a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_fq_schema_naming.yaml index f682585d..5d6b0c3c 100644 --- a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_json.yaml index ff7d0a3d..207a31c3 100644 --- a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_string_enum.yaml index 470bab61..05b79112 100644 --- a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/message.proto b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/message.proto index 51160a14..40494cd9 100644 --- a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/message.proto @@ -26,7 +26,7 @@ import "google/protobuf/wrappers.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/protobuftypes/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/protobuftypes/message/v1;message"; service Messaging { option (google.api.default_host) = "foo.googleapi.com"; diff --git a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi.yaml index 6cb6b7fb..9c671ec0 100644 --- a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_default_response.yaml index 1158893e..766f0d19 100644 --- a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_fq_schema_naming.yaml index bd276315..a675d32a 100644 --- a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_json.yaml index ae946c55..eabb7752 100644 --- a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_string_enum.yaml index 1158893e..766f0d19 100644 --- a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/rpctypes/message.proto b/cmd/protoc-gen-openapi/examples/tests/rpctypes/message.proto index 0befc838..63c3b500 100644 --- a/cmd/protoc-gen-openapi/examples/tests/rpctypes/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/rpctypes/message.proto @@ -21,7 +21,7 @@ import "google/protobuf/empty.proto"; import "google/api/annotations.proto"; import "google/rpc/status.proto"; -option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/rpctypes/message/v1;message"; +option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/rpctypes/message/v1;message"; service Status { rpc GetStatus(google.protobuf.Empty) returns (google.rpc.Status) { diff --git a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi.yaml index 077d2b5a..14e9d891 100644 --- a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_default_response.yaml index 077d2b5a..14e9d891 100644 --- a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_fq_schema_naming.yaml index 15abe7da..dbbdcaf4 100644 --- a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_json.yaml index ef2df5f4..aa850582 100644 --- a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_string_enum.yaml index 077d2b5a..14e9d891 100644 --- a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/generator/generator.go b/cmd/protoc-gen-openapi/generator/generator.go index 7d80d409..b80918e4 100644 --- a/cmd/protoc-gen-openapi/generator/generator.go +++ b/cmd/protoc-gen-openapi/generator/generator.go @@ -30,8 +30,8 @@ import ( "google.golang.org/protobuf/reflect/protoreflect" any_pb "google.golang.org/protobuf/types/known/anypb" - wk "github.com/google/gnostic/cmd/protoc-gen-openapi/generator/wellknown" - v3 "github.com/google/gnostic/openapiv3" + wk "github.com/eqlabs/gnostic/cmd/protoc-gen-openapi/generator/wellknown" + v3 "github.com/eqlabs/gnostic/openapiv3" ) type Configuration struct { @@ -47,7 +47,7 @@ type Configuration struct { } const ( - infoURL = "https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi" + infoURL = "https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi" ) // In order to dynamically add google.rpc.Status responses we need diff --git a/cmd/protoc-gen-openapi/generator/reflector.go b/cmd/protoc-gen-openapi/generator/reflector.go index 31a0f930..cd12f071 100644 --- a/cmd/protoc-gen-openapi/generator/reflector.go +++ b/cmd/protoc-gen-openapi/generator/reflector.go @@ -21,8 +21,8 @@ import ( "google.golang.org/protobuf/reflect/protoreflect" - wk "github.com/google/gnostic/cmd/protoc-gen-openapi/generator/wellknown" - v3 "github.com/google/gnostic/openapiv3" + wk "github.com/eqlabs/gnostic/cmd/protoc-gen-openapi/generator/wellknown" + v3 "github.com/eqlabs/gnostic/openapiv3" ) const ( diff --git a/cmd/protoc-gen-openapi/generator/wellknown/mediatypes.go b/cmd/protoc-gen-openapi/generator/wellknown/mediatypes.go index 5b8dfa33..b7c7f185 100644 --- a/cmd/protoc-gen-openapi/generator/wellknown/mediatypes.go +++ b/cmd/protoc-gen-openapi/generator/wellknown/mediatypes.go @@ -16,7 +16,7 @@ package wellknown import ( - v3 "github.com/google/gnostic/openapiv3" + v3 "github.com/eqlabs/gnostic/openapiv3" ) func NewGoogleApiHttpBodyMediaType() *v3.MediaTypes { diff --git a/cmd/protoc-gen-openapi/generator/wellknown/schemas.go b/cmd/protoc-gen-openapi/generator/wellknown/schemas.go index 8840dde8..895cb100 100644 --- a/cmd/protoc-gen-openapi/generator/wellknown/schemas.go +++ b/cmd/protoc-gen-openapi/generator/wellknown/schemas.go @@ -16,7 +16,7 @@ package wellknown import ( - v3 "github.com/google/gnostic/openapiv3" + v3 "github.com/eqlabs/gnostic/openapiv3" "google.golang.org/protobuf/reflect/protoreflect" ) @@ -168,9 +168,12 @@ func NewGoogleProtobufStructSchema() *v3.SchemaOrReference { // google.protobuf.Value is handled specially // See here for the details on the JSON mapping: -// https://developers.google.com/protocol-buffers/docs/proto3#json +// +// https://developers.google.com/protocol-buffers/docs/proto3#json +// // and here: -// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Value +// +// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Value func NewGoogleProtobufValueSchema(name string) *v3.NamedSchemaOrReference { return &v3.NamedSchemaOrReference{ Name: name, @@ -186,7 +189,8 @@ func NewGoogleProtobufValueSchema(name string) *v3.NamedSchemaOrReference { // google.protobuf.Any is handled specially // See here for the details on the JSON mapping: -// https://developers.google.com/protocol-buffers/docs/proto3#json +// +// https://developers.google.com/protocol-buffers/docs/proto3#json func NewGoogleProtobufAnySchema(name string) *v3.NamedSchemaOrReference { return &v3.NamedSchemaOrReference{ Name: name, diff --git a/cmd/protoc-gen-openapi/main.go b/cmd/protoc-gen-openapi/main.go index 75405aed..a43314ea 100644 --- a/cmd/protoc-gen-openapi/main.go +++ b/cmd/protoc-gen-openapi/main.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "github.com/google/gnostic/cmd/protoc-gen-openapi/generator" + "github.com/eqlabs/gnostic/cmd/protoc-gen-openapi/generator" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/types/pluginpb" ) diff --git a/cmd/report-messages/main.go b/cmd/report-messages/main.go index a308a80f..0351558a 100644 --- a/cmd/report-messages/main.go +++ b/cmd/report-messages/main.go @@ -23,9 +23,9 @@ import ( "github.com/golang/protobuf/proto" - "github.com/google/gnostic/printer" + "github.com/eqlabs/gnostic/printer" - plugins "github.com/google/gnostic/plugins" + plugins "github.com/eqlabs/gnostic/plugins" ) func readMessagesFromFileWithName(filename string) *plugins.Messages { diff --git a/cmd/report/main.go b/cmd/report/main.go index f0b166b3..8b17f35c 100644 --- a/cmd/report/main.go +++ b/cmd/report/main.go @@ -25,9 +25,9 @@ import ( "github.com/golang/protobuf/proto" - "github.com/google/gnostic/printer" + "github.com/eqlabs/gnostic/printer" - pb "github.com/google/gnostic/openapiv2" + pb "github.com/eqlabs/gnostic/openapiv2" ) func readDocumentFromFileWithName(filename string) (*pb.Document, error) { diff --git a/cmd/vocabulary-operations/main.go b/cmd/vocabulary-operations/main.go index 8bc22ef2..40d3e033 100644 --- a/cmd/vocabulary-operations/main.go +++ b/cmd/vocabulary-operations/main.go @@ -24,8 +24,8 @@ import ( "github.com/golang/protobuf/proto" - metrics "github.com/google/gnostic/metrics" - vocabulary "github.com/google/gnostic/metrics/vocabulary" + metrics "github.com/eqlabs/gnostic/metrics" + vocabulary "github.com/eqlabs/gnostic/metrics/vocabulary" ) // openVocabularyFiles uses standard input to create a slice of diff --git a/conversions/openapiv2.go b/conversions/openapiv2.go index fb738865..2d9dd13f 100644 --- a/conversions/openapiv2.go +++ b/conversions/openapiv2.go @@ -18,8 +18,8 @@ import ( "log" "net/url" - discovery "github.com/google/gnostic/discovery" - openapi2 "github.com/google/gnostic/openapiv2" + discovery "github.com/eqlabs/gnostic/discovery" + openapi2 "github.com/eqlabs/gnostic/openapiv2" ) func addOpenAPI2SchemaForSchema(d *openapi2.Document, name string, schema *discovery.Schema) { diff --git a/conversions/openapiv3.go b/conversions/openapiv3.go index 576c2ec2..838d7377 100644 --- a/conversions/openapiv3.go +++ b/conversions/openapiv3.go @@ -19,8 +19,8 @@ import ( "net/url" "strings" - discovery "github.com/google/gnostic/discovery" - openapi3 "github.com/google/gnostic/openapiv3" + discovery "github.com/eqlabs/gnostic/discovery" + openapi3 "github.com/eqlabs/gnostic/openapiv3" ) func pathForMethod(path string) string { diff --git a/discovery/discovery.go b/discovery/discovery.go index 8e7aac11..62e7062c 100644 --- a/discovery/discovery.go +++ b/discovery/discovery.go @@ -23,7 +23,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/google/gnostic/compiler" + "github.com/eqlabs/gnostic/compiler" ) // Version returns the package name (and OpenAPI version). diff --git a/discovery/document.go b/discovery/document.go index 2745d94c..d263880f 100644 --- a/discovery/document.go +++ b/discovery/document.go @@ -17,7 +17,7 @@ package discovery_v1 import ( "errors" - "github.com/google/gnostic/compiler" + "github.com/eqlabs/gnostic/compiler" ) // FetchDocumentBytes downloads the bytes of a discovery document from a URL. diff --git a/discovery/list.go b/discovery/list.go index 257b67da..d2370e45 100644 --- a/discovery/list.go +++ b/discovery/list.go @@ -19,7 +19,7 @@ import ( "errors" "strings" - "github.com/google/gnostic/compiler" + "github.com/eqlabs/gnostic/compiler" ) // APIsListServiceURL is the URL for the Google APIs Discovery Service diff --git a/generate-gnostic/domain.go b/generate-gnostic/domain.go index cb67b677..b1a38ca5 100644 --- a/generate-gnostic/domain.go +++ b/generate-gnostic/domain.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "github.com/google/gnostic/jsonschema" + "github.com/eqlabs/gnostic/jsonschema" ) // Domain models a collection of types that is defined by a schema. diff --git a/generate-gnostic/generate-compiler.go b/generate-gnostic/generate-compiler.go index a6241646..6a52923a 100644 --- a/generate-gnostic/generate-compiler.go +++ b/generate-gnostic/generate-compiler.go @@ -20,7 +20,7 @@ import ( "sort" "strings" - "github.com/google/gnostic/printer" + "github.com/eqlabs/gnostic/printer" ) // patternNames hands out unique names for a given string. diff --git a/generate-gnostic/generate-extension.go b/generate-gnostic/generate-extension.go index b8456185..55ca3638 100644 --- a/generate-gnostic/generate-extension.go +++ b/generate-gnostic/generate-extension.go @@ -26,9 +26,9 @@ import ( "sort" "strings" - "github.com/google/gnostic/compiler" - "github.com/google/gnostic/jsonschema" - "github.com/google/gnostic/printer" + "github.com/eqlabs/gnostic/compiler" + "github.com/eqlabs/gnostic/jsonschema" + "github.com/eqlabs/gnostic/printer" ) var protoOptionsForExtensions = []ProtoOption{ @@ -272,7 +272,7 @@ func generateExtension(schemaFile string, outDir string) error { "fmt", "regexp", "strings", - "github.com/google/gnostic/compiler", + "github.com/eqlabs/gnostic/compiler", "gopkg.in/yaml.v3", }) goFilename := path.Join(protoOutDirectory, outFileBaseName+".go") @@ -287,7 +287,7 @@ func generateExtension(schemaFile string, outDir string) error { // TODO: This path is currently fixed to the location of the samples. // Can we make it relative, perhaps with an option or by generating // a go.mod file for the generated extension handler? - outDirRelativeToPackageRoot := "github.com/google/gnostic/extensions/sample/" + outDir + outDirRelativeToPackageRoot := "github.com/eqlabs/gnostic/extensions/sample/" + outDir var extensionNameKeys []string for k := range extensionNameToMessageName { @@ -314,8 +314,8 @@ func generateExtension(schemaFile string, outDir string) error { } extMainCode := fmt.Sprintf(additionalCompilerCodeWithMain, cases) imports := []string{ - "github.com/google/gnostic/extensions", - "github.com/google/gnostic/compiler", + "github.com/eqlabs/gnostic/extensions", + "github.com/eqlabs/gnostic/compiler", "google.golang.org/protobuf/proto", "gopkg.in/yaml.v3", outDirRelativeToPackageRoot + "/" + "proto", diff --git a/generate-gnostic/generate-proto.go b/generate-gnostic/generate-proto.go index 1fe0eb99..ce69a92d 100644 --- a/generate-gnostic/generate-proto.go +++ b/generate-gnostic/generate-proto.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/google/gnostic/printer" + "github.com/eqlabs/gnostic/printer" ) // ProtoOption represents an option to be added to generated .proto files. diff --git a/generate-gnostic/main.go b/generate-gnostic/main.go index 59397181..bb40188c 100644 --- a/generate-gnostic/main.go +++ b/generate-gnostic/main.go @@ -28,7 +28,7 @@ import ( "golang.org/x/tools/imports" - "github.com/google/gnostic/jsonschema" + "github.com/eqlabs/gnostic/jsonschema" ) // License is the software license applied to generated code. @@ -193,7 +193,7 @@ func generateOpenAPIModel(version string) error { "gopkg.in/yaml.v3", "strings", "regexp", - "github.com/google/gnostic/compiler", + "github.com/eqlabs/gnostic/compiler", } // generate the compiler log.Printf("Generating compiler support code") diff --git a/generate-gnostic/types.go b/generate-gnostic/types.go index df148d70..75e05387 100644 --- a/generate-gnostic/types.go +++ b/generate-gnostic/types.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/google/gnostic/jsonschema" + "github.com/eqlabs/gnostic/jsonschema" ) /// Type Modeling diff --git a/gnostic.go b/gnostic.go index 2de60601..1fcb42de 100644 --- a/gnostic.go +++ b/gnostic.go @@ -35,7 +35,7 @@ import ( "fmt" "os" - "github.com/google/gnostic/lib" + "github.com/eqlabs/gnostic/lib" ) func main() { diff --git a/gnostic_test.go b/gnostic_test.go index 80e2f256..f8ba1a17 100644 --- a/gnostic_test.go +++ b/gnostic_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/google/gnostic/lib" + "github.com/eqlabs/gnostic/lib" ) func isURL(path string) bool { diff --git a/go.mod b/go.mod index 69eae40b..e8abbd7e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/google/gnostic +module github.com/eqlabs/gnostic go 1.12 @@ -6,6 +6,7 @@ require ( github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 github.com/flowstack/go-jsonschema v0.1.1 github.com/golang/protobuf v1.5.3 + github.com/google/gnostic v0.6.9 github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 github.com/google/go-cmp v0.5.9 github.com/stoewer/go-strcase v1.2.0 diff --git a/go.sum b/go.sum index 41e7e0df..b48fb2f3 100644 --- a/go.sum +++ b/go.sum @@ -710,6 +710,8 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= +github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 h1:0VpGH+cDhbDtdcweoyCVsF3fhN8kejK6rFe/2FFX2nU= github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49/go.mod h1:BkkQ4L1KS1xMt2aWSPStnn55ChGC0DPOn2FQYj+f25M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -788,6 +790,7 @@ github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHU github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= @@ -1343,6 +1346,7 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= @@ -1480,12 +1484,14 @@ google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cn google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/jsonwriter/writer_test.go b/jsonwriter/writer_test.go index b714e609..ecec17d4 100644 --- a/jsonwriter/writer_test.go +++ b/jsonwriter/writer_test.go @@ -17,8 +17,8 @@ package jsonwriter_test import ( "testing" - "github.com/google/gnostic/compiler" - "github.com/google/gnostic/jsonwriter" + "github.com/eqlabs/gnostic/compiler" + "github.com/eqlabs/gnostic/jsonwriter" "gopkg.in/yaml.v3" ) diff --git a/lib/gnostic.go b/lib/gnostic.go index cf463530..9bc50dd5 100644 --- a/lib/gnostic.go +++ b/lib/gnostic.go @@ -31,13 +31,13 @@ import ( "github.com/golang/protobuf/proto" "gopkg.in/yaml.v3" - "github.com/google/gnostic/compiler" - discovery_v1 "github.com/google/gnostic/discovery" - "github.com/google/gnostic/jsonwriter" - openapi_v2 "github.com/google/gnostic/openapiv2" - openapi_v3 "github.com/google/gnostic/openapiv3" - plugins "github.com/google/gnostic/plugins" - surface "github.com/google/gnostic/surface" + "github.com/eqlabs/gnostic/compiler" + discovery_v1 "github.com/eqlabs/gnostic/discovery" + "github.com/eqlabs/gnostic/jsonwriter" + openapi_v2 "github.com/eqlabs/gnostic/openapiv2" + openapi_v3 "github.com/eqlabs/gnostic/openapiv3" + plugins "github.com/eqlabs/gnostic/plugins" + surface "github.com/eqlabs/gnostic/surface" ) // UsageError is a response to invalid command-line inputs @@ -241,9 +241,11 @@ func isURL(path string) bool { // Write bytes to a named file. // Certain names have special meaning: -// ! writes nothing -// - writes to stdout -// = writes to stderr +// +// ! writes nothing +// - writes to stdout +// = writes to stderr +// // If a directory name is given, the file is written there with // a name derived from the source and extension arguments. func writeFile(name string, bytes []byte, source string, extension string) { diff --git a/linters/go/gnostic-lint-descriptions/linter_v2.go b/linters/go/gnostic-lint-descriptions/linter_v2.go index 3e44f300..b4a3cb95 100644 --- a/linters/go/gnostic-lint-descriptions/linter_v2.go +++ b/linters/go/gnostic-lint-descriptions/linter_v2.go @@ -14,8 +14,8 @@ package main import ( - openapi "github.com/google/gnostic/openapiv2" - plugins "github.com/google/gnostic/plugins" + openapi "github.com/eqlabs/gnostic/openapiv2" + plugins "github.com/eqlabs/gnostic/plugins" ) // DocumentLinter contains information collected about an API description. diff --git a/linters/go/gnostic-lint-descriptions/linter_v3.go b/linters/go/gnostic-lint-descriptions/linter_v3.go index b30ba8c0..3d217002 100644 --- a/linters/go/gnostic-lint-descriptions/linter_v3.go +++ b/linters/go/gnostic-lint-descriptions/linter_v3.go @@ -15,8 +15,8 @@ package main import ( - openapi "github.com/google/gnostic/openapiv3" - plugins "github.com/google/gnostic/plugins" + openapi "github.com/eqlabs/gnostic/openapiv3" + plugins "github.com/eqlabs/gnostic/plugins" ) // DocumentLinter contains information collected about an API description. diff --git a/linters/go/gnostic-lint-descriptions/main.go b/linters/go/gnostic-lint-descriptions/main.go index ea33ce62..dc373106 100644 --- a/linters/go/gnostic-lint-descriptions/main.go +++ b/linters/go/gnostic-lint-descriptions/main.go @@ -23,9 +23,9 @@ package main import ( "github.com/golang/protobuf/proto" - openapiv2 "github.com/google/gnostic/openapiv2" - openapiv3 "github.com/google/gnostic/openapiv3" - plugins "github.com/google/gnostic/plugins" + openapiv2 "github.com/eqlabs/gnostic/openapiv2" + openapiv3 "github.com/eqlabs/gnostic/openapiv3" + plugins "github.com/eqlabs/gnostic/plugins" ) type DocumentLinter interface { diff --git a/linters/go/gnostic-lint-paths/main.go b/linters/go/gnostic-lint-paths/main.go index 56dab5bd..84f1f8a8 100644 --- a/linters/go/gnostic-lint-paths/main.go +++ b/linters/go/gnostic-lint-paths/main.go @@ -20,9 +20,9 @@ package main import ( "github.com/golang/protobuf/proto" - openapiv2 "github.com/google/gnostic/openapiv2" - openapiv3 "github.com/google/gnostic/openapiv3" - plugins "github.com/google/gnostic/plugins" + openapiv2 "github.com/eqlabs/gnostic/openapiv2" + openapiv3 "github.com/eqlabs/gnostic/openapiv3" + plugins "github.com/eqlabs/gnostic/plugins" ) func checkPathsV2(document *openapiv2.Document, messages []*plugins.Message) []*plugins.Message { diff --git a/metrics/lint/aip-linterv2.go b/metrics/lint/aip-linterv2.go index ee4b17ef..0980befe 100644 --- a/metrics/lint/aip-linterv2.go +++ b/metrics/lint/aip-linterv2.go @@ -17,8 +17,8 @@ package linter import ( "fmt" - rules "github.com/google/gnostic/metrics/rules" - pb "github.com/google/gnostic/openapiv2" + rules "github.com/eqlabs/gnostic/metrics/rules" + pb "github.com/eqlabs/gnostic/openapiv2" ) // fillProtoStructure takes a slice of rules and coverts them to a slice of @@ -94,8 +94,8 @@ func processParametersV2(operation *pb.Operation, path []string) []rules.Field { return parameters } -//AIPLintV2 accepts an OpenAPI v2 document and will call the individual AIP rules -//on the document. +// AIPLintV2 accepts an OpenAPI v2 document and will call the individual AIP rules +// on the document. func AIPLintV2(document *pb.Document) (*Linter, int) { fields := gatherParametersV2(document) messages := make([]rules.MessageType, 0) diff --git a/metrics/lint/aip-linterv3.go b/metrics/lint/aip-linterv3.go index c2737836..141e4427 100644 --- a/metrics/lint/aip-linterv3.go +++ b/metrics/lint/aip-linterv3.go @@ -18,8 +18,8 @@ import ( "fmt" "os" - rules "github.com/google/gnostic/metrics/rules" - openapi_v3 "github.com/google/gnostic/openapiv3" + rules "github.com/eqlabs/gnostic/metrics/rules" + openapi_v3 "github.com/eqlabs/gnostic/openapiv3" ) // processParametersV2 loops over the parameters of component and creates a @@ -89,8 +89,8 @@ func gatherParameters(document *openapi_v3.Document) []rules.Field { return p } -//AIPLintV3 accepts an OpenAPI v2 document and will call the individual AIP rules -//on the document. +// AIPLintV3 accepts an OpenAPI v2 document and will call the individual AIP rules +// on the document. func AIPLintV3(document *openapi_v3.Document) (*Linter, int) { fields := gatherParameters(document) messages := make([]rules.MessageType, 0) diff --git a/metrics/vocabulary/difference.go b/metrics/vocabulary/difference.go index 9745099c..1d624b69 100644 --- a/metrics/vocabulary/difference.go +++ b/metrics/vocabulary/difference.go @@ -15,7 +15,7 @@ package vocabulary import ( - metrics "github.com/google/gnostic/metrics" + metrics "github.com/eqlabs/gnostic/metrics" ) // mapDifference finds the difference between two Vocabularies. diff --git a/metrics/vocabulary/discovery.go b/metrics/vocabulary/discovery.go index 3e8d8032..5892f61e 100644 --- a/metrics/vocabulary/discovery.go +++ b/metrics/vocabulary/discovery.go @@ -15,8 +15,8 @@ package vocabulary import ( - discovery_v1 "github.com/google/gnostic/discovery" - metrics "github.com/google/gnostic/metrics" + discovery_v1 "github.com/eqlabs/gnostic/discovery" + metrics "github.com/eqlabs/gnostic/metrics" ) func (vocab *Vocabulary) processMethodDiscovery(operation *discovery_v1.Method) { diff --git a/metrics/vocabulary/filterCommon.go b/metrics/vocabulary/filterCommon.go index 39c4698a..1be2623b 100644 --- a/metrics/vocabulary/filterCommon.go +++ b/metrics/vocabulary/filterCommon.go @@ -15,7 +15,7 @@ package vocabulary import ( - metrics "github.com/google/gnostic/metrics" + metrics "github.com/eqlabs/gnostic/metrics" ) // FilterCommon implements the difference operation amongst a slice of Vocabularies. diff --git a/metrics/vocabulary/intersection.go b/metrics/vocabulary/intersection.go index 58b22718..fc15de33 100644 --- a/metrics/vocabulary/intersection.go +++ b/metrics/vocabulary/intersection.go @@ -15,7 +15,7 @@ package vocabulary import ( - metrics "github.com/google/gnostic/metrics" + metrics "github.com/eqlabs/gnostic/metrics" ) // mapIntersection finds the intersection between two Vocabularies. diff --git a/metrics/vocabulary/openapiv2.go b/metrics/vocabulary/openapiv2.go index 38875cbc..ec4f9163 100644 --- a/metrics/vocabulary/openapiv2.go +++ b/metrics/vocabulary/openapiv2.go @@ -15,8 +15,8 @@ package vocabulary import ( - metrics "github.com/google/gnostic/metrics" - openapi_v2 "github.com/google/gnostic/openapiv2" + metrics "github.com/eqlabs/gnostic/metrics" + openapi_v2 "github.com/eqlabs/gnostic/openapiv2" ) func (vocab *Vocabulary) processOperationV2(operation *openapi_v2.Operation) { diff --git a/metrics/vocabulary/openapiv3.go b/metrics/vocabulary/openapiv3.go index ab94df51..861a0f18 100644 --- a/metrics/vocabulary/openapiv3.go +++ b/metrics/vocabulary/openapiv3.go @@ -17,8 +17,8 @@ package vocabulary import ( "sort" - metrics "github.com/google/gnostic/metrics" - openapi_v3 "github.com/google/gnostic/openapiv3" + metrics "github.com/eqlabs/gnostic/metrics" + openapi_v3 "github.com/eqlabs/gnostic/openapiv3" ) func fillProtoStructures(m map[string]int) []*metrics.WordCount { diff --git a/metrics/vocabulary/union.go b/metrics/vocabulary/union.go index 57d05b8a..448e8c06 100644 --- a/metrics/vocabulary/union.go +++ b/metrics/vocabulary/union.go @@ -15,7 +15,7 @@ package vocabulary import ( - metrics "github.com/google/gnostic/metrics" + metrics "github.com/eqlabs/gnostic/metrics" ) // Union implements the union operation between multiple Vocabularies. diff --git a/metrics/vocabulary/version.go b/metrics/vocabulary/version.go index 7dd0de55..6e7a158f 100644 --- a/metrics/vocabulary/version.go +++ b/metrics/vocabulary/version.go @@ -15,7 +15,7 @@ package vocabulary import ( - metrics "github.com/google/gnostic/metrics" + metrics "github.com/eqlabs/gnostic/metrics" ) // fillVersionProto takes a newer and older version of a vocabularies and utilizes the diff --git a/metrics/vocabulary/vocabulary.go b/metrics/vocabulary/vocabulary.go index cbca53f9..66c2f690 100644 --- a/metrics/vocabulary/vocabulary.go +++ b/metrics/vocabulary/vocabulary.go @@ -26,7 +26,7 @@ import ( "google.golang.org/protobuf/proto" - metrics "github.com/google/gnostic/metrics" + metrics "github.com/eqlabs/gnostic/metrics" ) type Vocabulary struct { diff --git a/metrics/vocabulary/vocabulary_test.go b/metrics/vocabulary/vocabulary_test.go index 90d93868..5317e281 100644 --- a/metrics/vocabulary/vocabulary_test.go +++ b/metrics/vocabulary/vocabulary_test.go @@ -22,10 +22,10 @@ import ( "github.com/golang/protobuf/jsonpb" - discovery "github.com/google/gnostic/discovery" - metrics "github.com/google/gnostic/metrics" - openapiv2 "github.com/google/gnostic/openapiv2" - openapiv3 "github.com/google/gnostic/openapiv3" + discovery "github.com/eqlabs/gnostic/discovery" + metrics "github.com/eqlabs/gnostic/metrics" + openapiv2 "github.com/eqlabs/gnostic/openapiv2" + openapiv3 "github.com/eqlabs/gnostic/openapiv3" ) func fillTestProtoStructure(words []string, count []int) []*metrics.WordCount { diff --git a/openapiv2/OpenAPIv2.go b/openapiv2/OpenAPIv2.go index 0dc5ed52..676cf098 100644 --- a/openapiv2/OpenAPIv2.go +++ b/openapiv2/OpenAPIv2.go @@ -23,7 +23,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/google/gnostic/compiler" + "github.com/eqlabs/gnostic/compiler" ) // Version returns the package name (and OpenAPI version). diff --git a/openapiv2/document.go b/openapiv2/document.go index dd43221b..86018f58 100644 --- a/openapiv2/document.go +++ b/openapiv2/document.go @@ -17,7 +17,7 @@ package openapi_v2 import ( "errors" - "github.com/google/gnostic/compiler" + "github.com/eqlabs/gnostic/compiler" ) // ParseDocument reads an OpenAPI v2 description from a YAML/JSON representation. diff --git a/openapiv3/OpenAPIv3.go b/openapiv3/OpenAPIv3.go index 2d5092fe..96f1993f 100644 --- a/openapiv3/OpenAPIv3.go +++ b/openapiv3/OpenAPIv3.go @@ -23,7 +23,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/google/gnostic/compiler" + "github.com/eqlabs/gnostic/compiler" ) // Version returns the package name (and OpenAPI version). diff --git a/openapiv3/OpenAPIv3.proto b/openapiv3/OpenAPIv3.proto index 7aede5ed..7d905074 100644 --- a/openapiv3/OpenAPIv3.proto +++ b/openapiv3/OpenAPIv3.proto @@ -42,7 +42,7 @@ option java_package = "org.openapi_v3"; option objc_class_prefix = "OAS"; // The Go package name. -option go_package = "github.com/google/gnostic/openapiv3;openapi_v3"; +option go_package = "github.com/eqlabs/gnostic/openapiv3;openapi_v3"; message AdditionalPropertiesItem { oneof oneof { diff --git a/openapiv3/annotations.proto b/openapiv3/annotations.proto index 0bd87810..f9c44494 100644 --- a/openapiv3/annotations.proto +++ b/openapiv3/annotations.proto @@ -41,7 +41,7 @@ option java_package = "org.openapi_v3"; option objc_class_prefix = "OAS"; // The Go package name. -option go_package = "github.com/google/gnostic/openapiv3;openapi_v3"; +option go_package = "github.com/eqlabs/gnostic/openapiv3;openapi_v3"; extend google.protobuf.FileOptions { Document document = 1143; diff --git a/openapiv3/document.go b/openapiv3/document.go index e5b305ec..6aa66a42 100644 --- a/openapiv3/document.go +++ b/openapiv3/document.go @@ -17,7 +17,7 @@ package openapi_v3 import ( "errors" - "github.com/google/gnostic/compiler" + "github.com/eqlabs/gnostic/compiler" ) // ParseDocument reads an OpenAPI v3 description from a YAML/JSON representation. diff --git a/openapiv3/schema-generator/main.go b/openapiv3/schema-generator/main.go index a75002ff..6d19dff8 100644 --- a/openapiv3/schema-generator/main.go +++ b/openapiv3/schema-generator/main.go @@ -29,7 +29,7 @@ import ( "unicode" "unicode/utf8" - "github.com/google/gnostic/jsonschema" + "github.com/eqlabs/gnostic/jsonschema" ) // convert the first character of a string to lower case diff --git a/plugins/environment.go b/plugins/environment.go index 3a935295..5fe430e8 100644 --- a/plugins/environment.go +++ b/plugins/environment.go @@ -14,10 +14,10 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/any" - discovery "github.com/google/gnostic/discovery" - openapiv2 "github.com/google/gnostic/openapiv2" - openapiv3 "github.com/google/gnostic/openapiv3" - surface "github.com/google/gnostic/surface" + discovery "github.com/eqlabs/gnostic/discovery" + openapiv2 "github.com/eqlabs/gnostic/openapiv2" + openapiv3 "github.com/eqlabs/gnostic/openapiv3" + surface "github.com/eqlabs/gnostic/surface" ) // Environment contains the environment of a plugin call. diff --git a/plugins/gnostic-analyze/main.go b/plugins/gnostic-analyze/main.go index f2e6918f..970489af 100644 --- a/plugins/gnostic-analyze/main.go +++ b/plugins/gnostic-analyze/main.go @@ -16,11 +16,12 @@ // // It scans an API description and evaluates properties // that influence the ease and quality of code generation. -// - The number of HTTP operations of each method (GET, POST, etc). -// - The number of HTTP operations with no OperationId value. -// - The parameter types used and their frequencies. -// - The response types used and their frequencies. -// - The types used in definition objects and arrays and their frequencies. +// - The number of HTTP operations of each method (GET, POST, etc). +// - The number of HTTP operations with no OperationId value. +// - The parameter types used and their frequencies. +// - The response types used and their frequencies. +// - The types used in definition objects and arrays and their frequencies. +// // Results are returned in a JSON structure. package main @@ -30,13 +31,13 @@ import ( "path" "strings" - "github.com/google/gnostic/plugins/gnostic-analyze/statistics" + "github.com/eqlabs/gnostic/plugins/gnostic-analyze/statistics" "github.com/golang/protobuf/proto" - openapiv2 "github.com/google/gnostic/openapiv2" - openapiv3 "github.com/google/gnostic/openapiv3" - plugins "github.com/google/gnostic/plugins" + openapiv2 "github.com/eqlabs/gnostic/openapiv2" + openapiv3 "github.com/eqlabs/gnostic/openapiv3" + plugins "github.com/eqlabs/gnostic/plugins" ) // Record an error, then serialize and return a response. diff --git a/plugins/gnostic-analyze/statistics/statsv2.go b/plugins/gnostic-analyze/statistics/statsv2.go index 7f64e81d..ff4d7e3a 100644 --- a/plugins/gnostic-analyze/statistics/statsv2.go +++ b/plugins/gnostic-analyze/statistics/statsv2.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - openapi "github.com/google/gnostic/openapiv2" + openapi "github.com/eqlabs/gnostic/openapiv2" ) // DocumentStatistics contains information collected about an API description. diff --git a/plugins/gnostic-analyze/statistics/statsv3.go b/plugins/gnostic-analyze/statistics/statsv3.go index e7f8f0c9..ff546c36 100644 --- a/plugins/gnostic-analyze/statistics/statsv3.go +++ b/plugins/gnostic-analyze/statistics/statsv3.go @@ -15,7 +15,7 @@ package statistics import ( - openapi "github.com/google/gnostic/openapiv3" + openapi "github.com/eqlabs/gnostic/openapiv3" ) // NewDocumentStatistics builds a new DocumentStatistics object. diff --git a/plugins/gnostic-analyze/summarize/main.go b/plugins/gnostic-analyze/summarize/main.go index 7056ee82..d4ec2b0e 100644 --- a/plugins/gnostic-analyze/summarize/main.go +++ b/plugins/gnostic-analyze/summarize/main.go @@ -24,7 +24,7 @@ import ( "path/filepath" "sort" - "github.com/google/gnostic/plugins/gnostic-analyze/statistics" + "github.com/eqlabs/gnostic/plugins/gnostic-analyze/statistics" ) // Results are collected in this global slice. diff --git a/plugins/gnostic-complexity/main.go b/plugins/gnostic-complexity/main.go index fbffc45c..c2839347 100644 --- a/plugins/gnostic-complexity/main.go +++ b/plugins/gnostic-complexity/main.go @@ -21,10 +21,10 @@ import ( "github.com/golang/protobuf/proto" - metrics "github.com/google/gnostic/metrics" - openapiv2 "github.com/google/gnostic/openapiv2" - openapiv3 "github.com/google/gnostic/openapiv3" - plugins "github.com/google/gnostic/plugins" + metrics "github.com/eqlabs/gnostic/metrics" + openapiv2 "github.com/eqlabs/gnostic/openapiv2" + openapiv3 "github.com/eqlabs/gnostic/openapiv3" + plugins "github.com/eqlabs/gnostic/plugins" ) // This is the main function for the plugin. diff --git a/plugins/gnostic-linter/main.go b/plugins/gnostic-linter/main.go index 116f80b6..69c172d4 100644 --- a/plugins/gnostic-linter/main.go +++ b/plugins/gnostic-linter/main.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -20,10 +20,10 @@ import ( "github.com/golang/protobuf/proto" - lint "github.com/google/gnostic/metrics/lint" - openapiv2 "github.com/google/gnostic/openapiv2" - openapiv3 "github.com/google/gnostic/openapiv3" - plugins "github.com/google/gnostic/plugins" + lint "github.com/eqlabs/gnostic/metrics/lint" + openapiv2 "github.com/eqlabs/gnostic/openapiv2" + openapiv3 "github.com/eqlabs/gnostic/openapiv3" + plugins "github.com/eqlabs/gnostic/plugins" ) // Record an error, then serialize and return a response. diff --git a/plugins/gnostic-plugin-request/main.go b/plugins/gnostic-plugin-request/main.go index 0c42af60..68bda438 100644 --- a/plugins/gnostic-plugin-request/main.go +++ b/plugins/gnostic-plugin-request/main.go @@ -22,10 +22,10 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - openapiv2 "github.com/google/gnostic/openapiv2" - openapiv3 "github.com/google/gnostic/openapiv3" - plugins "github.com/google/gnostic/plugins" - surface "github.com/google/gnostic/surface" + openapiv2 "github.com/eqlabs/gnostic/openapiv2" + openapiv3 "github.com/eqlabs/gnostic/openapiv3" + plugins "github.com/eqlabs/gnostic/plugins" + surface "github.com/eqlabs/gnostic/surface" ) func main() { diff --git a/plugins/gnostic-process-plugin-response/main.go b/plugins/gnostic-process-plugin-response/main.go index 294b97b0..2ff13198 100644 --- a/plugins/gnostic-process-plugin-response/main.go +++ b/plugins/gnostic-process-plugin-response/main.go @@ -25,7 +25,7 @@ import ( "github.com/golang/protobuf/proto" - plugins "github.com/google/gnostic/plugins" + plugins "github.com/eqlabs/gnostic/plugins" ) func exitIfError(err error) { diff --git a/plugins/gnostic-summary/main.go b/plugins/gnostic-summary/main.go index 846e2904..98673b38 100644 --- a/plugins/gnostic-summary/main.go +++ b/plugins/gnostic-summary/main.go @@ -22,10 +22,10 @@ import ( "github.com/golang/protobuf/proto" - openapiv2 "github.com/google/gnostic/openapiv2" - openapiv3 "github.com/google/gnostic/openapiv3" - plugins "github.com/google/gnostic/plugins" - "github.com/google/gnostic/printer" + openapiv2 "github.com/eqlabs/gnostic/openapiv2" + openapiv3 "github.com/eqlabs/gnostic/openapiv3" + plugins "github.com/eqlabs/gnostic/plugins" + "github.com/eqlabs/gnostic/printer" ) // generate a simple report of an OpenAPI document's contents diff --git a/plugins/gnostic-vocabulary/main.go b/plugins/gnostic-vocabulary/main.go index dbfb1125..eff56227 100644 --- a/plugins/gnostic-vocabulary/main.go +++ b/plugins/gnostic-vocabulary/main.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -21,12 +21,12 @@ import ( "github.com/golang/protobuf/proto" - discovery_v1 "github.com/google/gnostic/discovery" - metrics "github.com/google/gnostic/metrics" - vocabulary "github.com/google/gnostic/metrics/vocabulary" - openapiv2 "github.com/google/gnostic/openapiv2" - openapiv3 "github.com/google/gnostic/openapiv3" - plugins "github.com/google/gnostic/plugins" + discovery_v1 "github.com/eqlabs/gnostic/discovery" + metrics "github.com/eqlabs/gnostic/metrics" + vocabulary "github.com/eqlabs/gnostic/metrics/vocabulary" + openapiv2 "github.com/eqlabs/gnostic/openapiv2" + openapiv3 "github.com/eqlabs/gnostic/openapiv3" + plugins "github.com/eqlabs/gnostic/plugins" ) // Record an error, then serialize and return a response. diff --git a/surface/model_openapiv2.go b/surface/model_openapiv2.go index 19878e17..cd62b96a 100644 --- a/surface/model_openapiv2.go +++ b/surface/model_openapiv2.go @@ -18,8 +18,8 @@ import ( "log" "strconv" - "github.com/google/gnostic/compiler" - openapiv2 "github.com/google/gnostic/openapiv2" + "github.com/eqlabs/gnostic/compiler" + openapiv2 "github.com/eqlabs/gnostic/openapiv2" ) type OpenAPI2Builder struct { diff --git a/surface/model_openapiv2_test.go b/surface/model_openapiv2_test.go index 78d002f2..e04ff4f4 100644 --- a/surface/model_openapiv2_test.go +++ b/surface/model_openapiv2_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - openapiv2 "github.com/google/gnostic/openapiv2" + openapiv2 "github.com/eqlabs/gnostic/openapiv2" "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/encoding/protojson" diff --git a/surface/model_openapiv3.go b/surface/model_openapiv3.go index e9ecdfed..2b562550 100644 --- a/surface/model_openapiv3.go +++ b/surface/model_openapiv3.go @@ -18,8 +18,8 @@ import ( "log" "strings" - "github.com/google/gnostic/compiler" - openapiv3 "github.com/google/gnostic/openapiv3" + "github.com/eqlabs/gnostic/compiler" + openapiv3 "github.com/eqlabs/gnostic/openapiv3" ) type OpenAPI3Builder struct { diff --git a/surface/model_openapiv3_test.go b/surface/model_openapiv3_test.go index 863a1614..3fff7ee9 100644 --- a/surface/model_openapiv3_test.go +++ b/surface/model_openapiv3_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - openapiv3 "github.com/google/gnostic/openapiv3" + openapiv3 "github.com/eqlabs/gnostic/openapiv3" "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/encoding/protojson" diff --git a/tools/format-schema/main.go b/tools/format-schema/main.go index 5cc363c3..f8ed2883 100644 --- a/tools/format-schema/main.go +++ b/tools/format-schema/main.go @@ -20,7 +20,7 @@ import ( "os" "path" - "github.com/google/gnostic/jsonschema" + "github.com/eqlabs/gnostic/jsonschema" ) func main() { diff --git a/tools/j2y2j/main.go b/tools/j2y2j/main.go index 3ac75754..fba02acd 100644 --- a/tools/j2y2j/main.go +++ b/tools/j2y2j/main.go @@ -24,7 +24,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/google/gnostic/jsonschema" + "github.com/eqlabs/gnostic/jsonschema" ) func usage() { From 30df53692a6f5bac9d643d45eece2657d836b79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Pa=C5=9Bko?= Date: Wed, 6 Sep 2023 12:51:07 +0200 Subject: [PATCH 3/3] Revert "rename packages" This reverts commit 5f00e0d5c547a6238fb5f920e12d7744479262b7. --- README.md | 2 +- cmd/disco/README.md | 2 +- cmd/disco/main.go | 4 ++-- cmd/parse-linter-output/main.go | 2 +- cmd/petstore-builder/petstore-v2.go | 2 +- cmd/petstore-builder/petstore-v3.go | 2 +- cmd/protoc-gen-jsonschema/README.md | 2 +- .../examples/tests/embedded/message.proto | 2 +- .../examples/tests/jsonoptions/message.proto | 2 +- .../examples/tests/mapfields/message.proto | 2 +- .../tests/protobuftypes/message.proto | 2 +- .../examples/tests/protobuftypes/openapi.yaml | 2 +- .../tests/protobuftypes/openapi_json.yaml | 2 +- .../generator/json-schema.go | 2 +- cmd/protoc-gen-jsonschema/main.go | 2 +- cmd/protoc-gen-openapi/README.md | 2 +- .../google/example/library/v1/openapi.yaml | 2 +- .../library/v1/openapi_default_response.yaml | 2 +- .../library/v1/openapi_fq_schema_naming.yaml | 2 +- .../example/library/v1/openapi_json.yaml | 2 +- .../library/v1/openapi_string_enum.yaml | 2 +- .../tests/additional_bindings/message.proto | 2 +- .../tests/additional_bindings/openapi.yaml | 2 +- .../examples/tests/allofwrap/message.proto | 2 +- .../examples/tests/allofwrap/openapi.yaml | 2 +- .../examples/tests/bodymapping/message.proto | 2 +- .../examples/tests/bodymapping/openapi.yaml | 2 +- .../bodymapping/openapi_default_response.yaml | 2 +- .../bodymapping/openapi_fq_schema_naming.yaml | 2 +- .../tests/bodymapping/openapi_json.yaml | 2 +- .../bodymapping/openapi_string_enum.yaml | 2 +- .../examples/tests/enumoptions/message.proto | 2 +- .../examples/tests/enumoptions/openapi.yaml | 2 +- .../enumoptions/openapi_default_response.yaml | 2 +- .../enumoptions/openapi_fq_schema_naming.yaml | 2 +- .../tests/enumoptions/openapi_json.yaml | 2 +- .../enumoptions/openapi_string_enum.yaml | 2 +- .../examples/tests/jsonoptions/message.proto | 2 +- .../examples/tests/jsonoptions/openapi.yaml | 2 +- .../jsonoptions/openapi_default_response.yaml | 2 +- .../jsonoptions/openapi_fq_schema_naming.yaml | 2 +- .../tests/jsonoptions/openapi_json.yaml | 2 +- .../jsonoptions/openapi_string_enum.yaml | 2 +- .../examples/tests/mapfields/message.proto | 2 +- .../examples/tests/mapfields/openapi.yaml | 2 +- .../mapfields/openapi_default_response.yaml | 2 +- .../mapfields/openapi_fq_schema_naming.yaml | 2 +- .../tests/mapfields/openapi_json.yaml | 2 +- .../tests/mapfields/openapi_string_enum.yaml | 2 +- .../tests/noannotations/message.proto | 2 +- .../examples/tests/noannotations/openapi.yaml | 2 +- .../openapi_default_response.yaml | 2 +- .../openapi_fq_schema_naming.yaml | 2 +- .../tests/noannotations/openapi_json.yaml | 2 +- .../noannotations/openapi_string_enum.yaml | 2 +- .../tests/openapiv3annotations/message.proto | 4 ++-- .../tests/openapiv3annotations/openapi.yaml | 4 ++-- .../openapi_default_response.yaml | 4 ++-- .../openapi_fq_schema_naming.yaml | 4 ++-- .../openapiv3annotations/openapi_json.yaml | 4 ++-- .../openapi_string_enum.yaml | 4 ++-- .../examples/tests/pathparams/message.proto | 2 +- .../examples/tests/pathparams/openapi.yaml | 2 +- .../pathparams/openapi_default_response.yaml | 2 +- .../pathparams/openapi_fq_schema_naming.yaml | 2 +- .../tests/pathparams/openapi_json.yaml | 2 +- .../tests/pathparams/openapi_string_enum.yaml | 2 +- .../tests/protobuftypes/message.proto | 2 +- .../examples/tests/protobuftypes/openapi.yaml | 2 +- .../openapi_default_response.yaml | 2 +- .../openapi_fq_schema_naming.yaml | 2 +- .../tests/protobuftypes/openapi_json.yaml | 2 +- .../protobuftypes/openapi_string_enum.yaml | 2 +- .../examples/tests/rpctypes/message.proto | 2 +- .../examples/tests/rpctypes/openapi.yaml | 2 +- .../rpctypes/openapi_default_response.yaml | 2 +- .../rpctypes/openapi_fq_schema_naming.yaml | 2 +- .../examples/tests/rpctypes/openapi_json.yaml | 2 +- .../tests/rpctypes/openapi_string_enum.yaml | 2 +- cmd/protoc-gen-openapi/generator/generator.go | 6 ++--- cmd/protoc-gen-openapi/generator/reflector.go | 4 ++-- .../generator/wellknown/mediatypes.go | 2 +- .../generator/wellknown/schemas.go | 12 ++++------ cmd/protoc-gen-openapi/main.go | 2 +- cmd/report-messages/main.go | 4 ++-- cmd/report/main.go | 4 ++-- cmd/vocabulary-operations/main.go | 4 ++-- conversions/openapiv2.go | 4 ++-- conversions/openapiv3.go | 4 ++-- discovery/discovery.go | 2 +- discovery/document.go | 2 +- discovery/list.go | 2 +- generate-gnostic/domain.go | 2 +- generate-gnostic/generate-compiler.go | 2 +- generate-gnostic/generate-extension.go | 14 ++++++------ generate-gnostic/generate-proto.go | 2 +- generate-gnostic/main.go | 4 ++-- generate-gnostic/types.go | 2 +- gnostic.go | 2 +- gnostic_test.go | 2 +- go.mod | 3 +-- go.sum | 6 ----- jsonwriter/writer_test.go | 4 ++-- lib/gnostic.go | 22 +++++++++---------- .../go/gnostic-lint-descriptions/linter_v2.go | 4 ++-- .../go/gnostic-lint-descriptions/linter_v3.go | 4 ++-- linters/go/gnostic-lint-descriptions/main.go | 6 ++--- linters/go/gnostic-lint-paths/main.go | 6 ++--- metrics/lint/aip-linterv2.go | 8 +++---- metrics/lint/aip-linterv3.go | 8 +++---- metrics/vocabulary/difference.go | 2 +- metrics/vocabulary/discovery.go | 4 ++-- metrics/vocabulary/filterCommon.go | 2 +- metrics/vocabulary/intersection.go | 2 +- metrics/vocabulary/openapiv2.go | 4 ++-- metrics/vocabulary/openapiv3.go | 4 ++-- metrics/vocabulary/union.go | 2 +- metrics/vocabulary/version.go | 2 +- metrics/vocabulary/vocabulary.go | 2 +- metrics/vocabulary/vocabulary_test.go | 8 +++---- openapiv2/OpenAPIv2.go | 2 +- openapiv2/document.go | 2 +- openapiv3/OpenAPIv3.go | 2 +- openapiv3/OpenAPIv3.proto | 2 +- openapiv3/annotations.proto | 2 +- openapiv3/document.go | 2 +- openapiv3/schema-generator/main.go | 2 +- plugins/environment.go | 8 +++---- plugins/gnostic-analyze/main.go | 19 ++++++++-------- plugins/gnostic-analyze/statistics/statsv2.go | 2 +- plugins/gnostic-analyze/statistics/statsv3.go | 2 +- plugins/gnostic-analyze/summarize/main.go | 2 +- plugins/gnostic-complexity/main.go | 8 +++---- plugins/gnostic-linter/main.go | 10 ++++----- plugins/gnostic-plugin-request/main.go | 8 +++---- .../gnostic-process-plugin-response/main.go | 2 +- plugins/gnostic-summary/main.go | 8 +++---- plugins/gnostic-vocabulary/main.go | 14 ++++++------ surface/model_openapiv2.go | 4 ++-- surface/model_openapiv2_test.go | 2 +- surface/model_openapiv3.go | 4 ++-- surface/model_openapiv3_test.go | 2 +- tools/format-schema/main.go | 2 +- tools/j2y2j/main.go | 2 +- 144 files changed, 228 insertions(+), 242 deletions(-) diff --git a/README.md b/README.md index f5a1993b..9052de3f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Go Actions Status](https://github.com/eqlabs/gnostic/workflows/Go/badge.svg)](https://github.com/eqlabs/gnostic/actions) +[![Go Actions Status](https://github.com/google/gnostic/workflows/Go/badge.svg)](https://github.com/google/gnostic/actions) # ⨁ gnostic diff --git a/cmd/disco/README.md b/cmd/disco/README.md index 08665b15..6b87b7e5 100644 --- a/cmd/disco/README.md +++ b/cmd/disco/README.md @@ -6,7 +6,7 @@ descriptions to OpenAPI. Installation: - go install github.com/eqlabs/gnostic/cmd/disco + go install github.com/google/gnostic/cmd/disco Usage: diff --git a/cmd/disco/main.go b/cmd/disco/main.go index e201ae1c..ec5a067e 100644 --- a/cmd/disco/main.go +++ b/cmd/disco/main.go @@ -24,8 +24,8 @@ import ( "github.com/docopt/docopt-go" "github.com/golang/protobuf/proto" - "github.com/eqlabs/gnostic/conversions" - discovery "github.com/eqlabs/gnostic/discovery" + "github.com/google/gnostic/conversions" + discovery "github.com/google/gnostic/discovery" ) func main() { diff --git a/cmd/parse-linter-output/main.go b/cmd/parse-linter-output/main.go index 869f4b27..c310f296 100644 --- a/cmd/parse-linter-output/main.go +++ b/cmd/parse-linter-output/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - lint "github.com/eqlabs/gnostic/metrics/lint" + lint "github.com/google/gnostic/metrics/lint" ) func main() { diff --git a/cmd/petstore-builder/petstore-v2.go b/cmd/petstore-builder/petstore-v2.go index 785cf462..ec2cd6e2 100644 --- a/cmd/petstore-builder/petstore-v2.go +++ b/cmd/petstore-builder/petstore-v2.go @@ -15,7 +15,7 @@ package main import ( - v2 "github.com/eqlabs/gnostic/openapiv2" + v2 "github.com/google/gnostic/openapiv2" ) func buildDocumentV2() *v2.Document { diff --git a/cmd/petstore-builder/petstore-v3.go b/cmd/petstore-builder/petstore-v3.go index e5d1bb57..9042ff95 100644 --- a/cmd/petstore-builder/petstore-v3.go +++ b/cmd/petstore-builder/petstore-v3.go @@ -15,7 +15,7 @@ package main import ( - v3 "github.com/eqlabs/gnostic/openapiv3" + v3 "github.com/google/gnostic/openapiv3" ) func buildDocumentV3() *v3.Document { diff --git a/cmd/protoc-gen-jsonschema/README.md b/cmd/protoc-gen-jsonschema/README.md index 231d7a6d..62e87d01 100644 --- a/cmd/protoc-gen-jsonschema/README.md +++ b/cmd/protoc-gen-jsonschema/README.md @@ -5,7 +5,7 @@ JSON Schemas for Protocol Buffer messages. Installation: - go install github.com/eqlabs/gnostic/cmd/protoc-gen-jsonschema + go install github.com/google/gnostic/cmd/protoc-gen-jsonschema Usage: diff --git a/cmd/protoc-gen-jsonschema/examples/tests/embedded/message.proto b/cmd/protoc-gen-jsonschema/examples/tests/embedded/message.proto index 3c291752..399b11b3 100644 --- a/cmd/protoc-gen-jsonschema/examples/tests/embedded/message.proto +++ b/cmd/protoc-gen-jsonschema/examples/tests/embedded/message.proto @@ -19,7 +19,7 @@ package tests.embedded.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/embedded/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/embedded/message/v1;message"; service Messaging { rpc UpdateMessage(Message) returns (Message) { diff --git a/cmd/protoc-gen-jsonschema/examples/tests/jsonoptions/message.proto b/cmd/protoc-gen-jsonschema/examples/tests/jsonoptions/message.proto index 5a66c76f..c76a5010 100644 --- a/cmd/protoc-gen-jsonschema/examples/tests/jsonoptions/message.proto +++ b/cmd/protoc-gen-jsonschema/examples/tests/jsonoptions/message.proto @@ -19,7 +19,7 @@ package tests.jsonnames.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/jsonnames/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/jsonnames/message/v1;message"; // Messaging service service Messaging { diff --git a/cmd/protoc-gen-jsonschema/examples/tests/mapfields/message.proto b/cmd/protoc-gen-jsonschema/examples/tests/mapfields/message.proto index d6e923dc..441406ff 100644 --- a/cmd/protoc-gen-jsonschema/examples/tests/mapfields/message.proto +++ b/cmd/protoc-gen-jsonschema/examples/tests/mapfields/message.proto @@ -22,7 +22,7 @@ import "google/api/field_behavior.proto"; import "google/protobuf/struct.proto"; import "google/protobuf/empty.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/mapfields/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/mapfields/message/v1;message"; service Messaging { rpc UpdateMessage(Message) returns (Message) { diff --git a/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/message.proto b/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/message.proto index 169a1400..5489ed1c 100644 --- a/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/message.proto +++ b/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/message.proto @@ -22,7 +22,7 @@ import "google/api/annotations.proto"; import "google/protobuf/struct.proto"; import "google/protobuf/empty.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/protobuftypes/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/protobuftypes/message/v1;message"; service Messaging { option (google.api.default_host) = "foo.googleapi.com"; diff --git a/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi.yaml b/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi.yaml index f79e598e..1a995ce0 100644 --- a/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi.yaml +++ b/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi_json.yaml b/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi_json.yaml index 757975cd..f6e0ebd0 100644 --- a/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi_json.yaml +++ b/cmd/protoc-gen-jsonschema/examples/tests/protobuftypes/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-jsonschema/generator/json-schema.go b/cmd/protoc-gen-jsonschema/generator/json-schema.go index 8e295c02..d1f8c9ac 100644 --- a/cmd/protoc-gen-jsonschema/generator/json-schema.go +++ b/cmd/protoc-gen-jsonschema/generator/json-schema.go @@ -26,7 +26,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" - "github.com/eqlabs/gnostic/jsonschema" + "github.com/google/gnostic/jsonschema" ) var ( diff --git a/cmd/protoc-gen-jsonschema/main.go b/cmd/protoc-gen-jsonschema/main.go index 3f2afb41..93fa54e5 100644 --- a/cmd/protoc-gen-jsonschema/main.go +++ b/cmd/protoc-gen-jsonschema/main.go @@ -18,7 +18,7 @@ package main import ( "flag" - "github.com/eqlabs/gnostic/cmd/protoc-gen-jsonschema/generator" + "github.com/google/gnostic/cmd/protoc-gen-jsonschema/generator" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/types/pluginpb" ) diff --git a/cmd/protoc-gen-openapi/README.md b/cmd/protoc-gen-openapi/README.md index ab8d0dd0..154d7202 100644 --- a/cmd/protoc-gen-openapi/README.md +++ b/cmd/protoc-gen-openapi/README.md @@ -6,7 +6,7 @@ Protocol Buffer service. Installation: - go install github.com/eqlabs/gnostic/cmd/protoc-gen-openapi + go install github.com/google/gnostic/cmd/protoc-gen-openapi Usage: diff --git a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi.yaml b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi.yaml index 862aecc7..219a0b24 100644 --- a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_default_response.yaml index d0a06245..f1ecadb6 100644 --- a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_fq_schema_naming.yaml index 3c8a74a9..2b908fa3 100644 --- a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_json.yaml index 30e767c4..a0ea21f4 100644 --- a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_string_enum.yaml index d0a06245..f1ecadb6 100644 --- a/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/additional_bindings/message.proto b/cmd/protoc-gen-openapi/examples/tests/additional_bindings/message.proto index fe721d0e..ef6928a3 100644 --- a/cmd/protoc-gen-openapi/examples/tests/additional_bindings/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/additional_bindings/message.proto @@ -19,7 +19,7 @@ package tests.additional_bindings.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/additional_bindings/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/additional_bindings/message/v1;message"; service Messaging { rpc UpdateMessage(Message) returns(Message) { diff --git a/cmd/protoc-gen-openapi/examples/tests/additional_bindings/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/additional_bindings/openapi.yaml index 8007f646..15c32d3e 100644 --- a/cmd/protoc-gen-openapi/examples/tests/additional_bindings/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/additional_bindings/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/allofwrap/message.proto b/cmd/protoc-gen-openapi/examples/tests/allofwrap/message.proto index 99aab1f5..55049a70 100644 --- a/cmd/protoc-gen-openapi/examples/tests/allofwrap/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/allofwrap/message.proto @@ -20,7 +20,7 @@ package tests.allofwrap.message.v1; import "google/api/annotations.proto"; import "google/api/field_behavior.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/bodymapping/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/bodymapping/message/v1;message"; service Messaging { rpc UpdateMessage(Message) returns(Message) { diff --git a/cmd/protoc-gen-openapi/examples/tests/allofwrap/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/allofwrap/openapi.yaml index bafbefaf..c9c35391 100644 --- a/cmd/protoc-gen-openapi/examples/tests/allofwrap/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/allofwrap/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/bodymapping/message.proto b/cmd/protoc-gen-openapi/examples/tests/bodymapping/message.proto index 3ce8f812..f8c350fc 100644 --- a/cmd/protoc-gen-openapi/examples/tests/bodymapping/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/bodymapping/message.proto @@ -19,7 +19,7 @@ package tests.bodymappying.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/bodymapping/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/bodymapping/message/v1;message"; service Messaging { rpc UpdateMessage(Message) returns(Message) { diff --git a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi.yaml index bbdbcd8b..261792b4 100644 --- a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_default_response.yaml index 9c802bc2..1643daff 100644 --- a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_fq_schema_naming.yaml index 88be32d2..45edf441 100644 --- a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_json.yaml index 66dcc014..a6caaaee 100644 --- a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_string_enum.yaml index 9c802bc2..1643daff 100644 --- a/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/enumoptions/message.proto b/cmd/protoc-gen-openapi/examples/tests/enumoptions/message.proto index 57645c32..2f4ac65b 100644 --- a/cmd/protoc-gen-openapi/examples/tests/enumoptions/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/enumoptions/message.proto @@ -19,7 +19,7 @@ package tests.enumoptions.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/enumoptions/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/enumoptions/message/v1;message"; // Messaging service service Messaging { diff --git a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi.yaml index 3253356b..11073498 100644 --- a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_default_response.yaml index 3253356b..11073498 100644 --- a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_fq_schema_naming.yaml index df5f17ce..9f162c6b 100644 --- a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_json.yaml index 1eb1f243..9aada7aa 100644 --- a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_string_enum.yaml index dcc7d009..641d2eb8 100644 --- a/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/message.proto b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/message.proto index 6c7b91db..5e83235d 100644 --- a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/message.proto @@ -19,7 +19,7 @@ package tests.jsonnames.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/jsonnames/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/jsonnames/message/v1;message"; // Messaging service service Messaging { diff --git a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi.yaml index 79e8397c..0e7a8f80 100644 --- a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_default_response.yaml index 16f482f9..d653131a 100644 --- a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_fq_schema_naming.yaml index c9eaa548..13ef0fd2 100644 --- a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_json.yaml index 102a0ca1..aa75c871 100644 --- a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_string_enum.yaml index 16f482f9..d653131a 100644 --- a/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/mapfields/message.proto b/cmd/protoc-gen-openapi/examples/tests/mapfields/message.proto index 4c14b9f8..e0b490f1 100644 --- a/cmd/protoc-gen-openapi/examples/tests/mapfields/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/mapfields/message.proto @@ -20,7 +20,7 @@ package tests.mapfields.message.v1; import "google/api/annotations.proto"; import "google/protobuf/struct.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/mapfields/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/mapfields/message/v1;message"; service Messaging { rpc UpdateMessage(Message) returns(Message) { diff --git a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi.yaml index 31c8a84f..c63dc62e 100644 --- a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_default_response.yaml index 7a6890cd..4d510192 100644 --- a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_fq_schema_naming.yaml index 3df0f365..1c343d1e 100644 --- a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_json.yaml index 222ae37f..8e8b796e 100644 --- a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_string_enum.yaml index 7a6890cd..4d510192 100644 --- a/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/noannotations/message.proto b/cmd/protoc-gen-openapi/examples/tests/noannotations/message.proto index 1f91d401..bc554485 100644 --- a/cmd/protoc-gen-openapi/examples/tests/noannotations/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/noannotations/message.proto @@ -19,7 +19,7 @@ package tests.noannotations.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/noannotations/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/noannotations/message/v1;message"; service Messaging1 { rpc UpdateMessage(Message) returns(Message) { diff --git a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi.yaml index c33380e6..d00cbb93 100644 --- a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_default_response.yaml index c33380e6..d00cbb93 100644 --- a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_fq_schema_naming.yaml index 27dbbe11..7f2e9e79 100644 --- a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_json.yaml index 73d5aae5..d7d35208 100644 --- a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_string_enum.yaml index c33380e6..d00cbb93 100644 --- a/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/message.proto b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/message.proto index f3299e62..fa9f6f0f 100644 --- a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/message.proto @@ -20,7 +20,7 @@ package tests.openapiv3annotations.message.v1; import "google/api/annotations.proto"; import "openapiv3/annotations.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/openapiv3annotations/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/openapiv3annotations/message/v1;message"; option (openapi.v3.document) = { info: { @@ -34,7 +34,7 @@ option (openapi.v3.document) = { } license: { name: "Apache License"; - url: "https://github.com/eqlabs/gnostic/blob/master/LICENSE"; + url: "https://github.com/google/gnostic/blob/master/LICENSE"; } } components: { diff --git a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi.yaml index cd5810af..b1e31f0f 100644 --- a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: @@ -11,7 +11,7 @@ info: email: gnostic@google.com license: name: Apache License - url: https://github.com/eqlabs/gnostic/blob/master/LICENSE + url: https://github.com/google/gnostic/blob/master/LICENSE version: Version from annotation paths: /v1/messages/{message_id}: diff --git a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_default_response.yaml index cd5810af..b1e31f0f 100644 --- a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: @@ -11,7 +11,7 @@ info: email: gnostic@google.com license: name: Apache License - url: https://github.com/eqlabs/gnostic/blob/master/LICENSE + url: https://github.com/google/gnostic/blob/master/LICENSE version: Version from annotation paths: /v1/messages/{message_id}: diff --git a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_fq_schema_naming.yaml index 1175153c..5dbbceca 100644 --- a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: @@ -11,7 +11,7 @@ info: email: gnostic@google.com license: name: Apache License - url: https://github.com/eqlabs/gnostic/blob/master/LICENSE + url: https://github.com/google/gnostic/blob/master/LICENSE version: Version from annotation paths: /v1/messages/{message_id}: diff --git a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_json.yaml index cd5810af..b1e31f0f 100644 --- a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: @@ -11,7 +11,7 @@ info: email: gnostic@google.com license: name: Apache License - url: https://github.com/eqlabs/gnostic/blob/master/LICENSE + url: https://github.com/google/gnostic/blob/master/LICENSE version: Version from annotation paths: /v1/messages/{message_id}: diff --git a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_string_enum.yaml index cd5810af..b1e31f0f 100644 --- a/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: @@ -11,7 +11,7 @@ info: email: gnostic@google.com license: name: Apache License - url: https://github.com/eqlabs/gnostic/blob/master/LICENSE + url: https://github.com/google/gnostic/blob/master/LICENSE version: Version from annotation paths: /v1/messages/{message_id}: diff --git a/cmd/protoc-gen-openapi/examples/tests/pathparams/message.proto b/cmd/protoc-gen-openapi/examples/tests/pathparams/message.proto index a5d6732a..7e427134 100644 --- a/cmd/protoc-gen-openapi/examples/tests/pathparams/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/pathparams/message.proto @@ -19,7 +19,7 @@ package tests.pathparams.message.v1; import "google/api/annotations.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/pathparams/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/pathparams/message/v1;message"; service Messaging { rpc GetMessage(GetMessageRequest) returns (Message) { diff --git a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi.yaml index 5fd86e25..f65b66d2 100644 --- a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_default_response.yaml index 05b79112..470bab61 100644 --- a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_fq_schema_naming.yaml index 5d6b0c3c..f682585d 100644 --- a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_json.yaml index 207a31c3..ff7d0a3d 100644 --- a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_string_enum.yaml index 05b79112..470bab61 100644 --- a/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/message.proto b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/message.proto index 40494cd9..51160a14 100644 --- a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/message.proto @@ -26,7 +26,7 @@ import "google/protobuf/wrappers.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/protobuftypes/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/protobuftypes/message/v1;message"; service Messaging { option (google.api.default_host) = "foo.googleapi.com"; diff --git a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi.yaml index 9c671ec0..6cb6b7fb 100644 --- a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_default_response.yaml index 766f0d19..1158893e 100644 --- a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_fq_schema_naming.yaml index a675d32a..bd276315 100644 --- a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_json.yaml index eabb7752..ae946c55 100644 --- a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_string_enum.yaml index 766f0d19..1158893e 100644 --- a/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/rpctypes/message.proto b/cmd/protoc-gen-openapi/examples/tests/rpctypes/message.proto index 63c3b500..0befc838 100644 --- a/cmd/protoc-gen-openapi/examples/tests/rpctypes/message.proto +++ b/cmd/protoc-gen-openapi/examples/tests/rpctypes/message.proto @@ -21,7 +21,7 @@ import "google/protobuf/empty.proto"; import "google/api/annotations.proto"; import "google/rpc/status.proto"; -option go_package = "github.com/eqlabs/gnostic/apps/protoc-gen-openapi/examples/tests/rpctypes/message/v1;message"; +option go_package = "github.com/google/gnostic/apps/protoc-gen-openapi/examples/tests/rpctypes/message/v1;message"; service Status { rpc GetStatus(google.protobuf.Empty) returns (google.rpc.Status) { diff --git a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi.yaml b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi.yaml index 14e9d891..077d2b5a 100644 --- a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_default_response.yaml b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_default_response.yaml index 14e9d891..077d2b5a 100644 --- a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_default_response.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_default_response.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_fq_schema_naming.yaml b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_fq_schema_naming.yaml index dbbdcaf4..15abe7da 100644 --- a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_fq_schema_naming.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_fq_schema_naming.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_json.yaml b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_json.yaml index aa850582..ef2df5f4 100644 --- a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_json.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_json.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_string_enum.yaml b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_string_enum.yaml index 14e9d891..077d2b5a 100644 --- a/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_string_enum.yaml +++ b/cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_string_enum.yaml @@ -1,5 +1,5 @@ # Generated with protoc-gen-openapi -# https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi +# https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi openapi: 3.0.3 info: diff --git a/cmd/protoc-gen-openapi/generator/generator.go b/cmd/protoc-gen-openapi/generator/generator.go index b80918e4..7d80d409 100644 --- a/cmd/protoc-gen-openapi/generator/generator.go +++ b/cmd/protoc-gen-openapi/generator/generator.go @@ -30,8 +30,8 @@ import ( "google.golang.org/protobuf/reflect/protoreflect" any_pb "google.golang.org/protobuf/types/known/anypb" - wk "github.com/eqlabs/gnostic/cmd/protoc-gen-openapi/generator/wellknown" - v3 "github.com/eqlabs/gnostic/openapiv3" + wk "github.com/google/gnostic/cmd/protoc-gen-openapi/generator/wellknown" + v3 "github.com/google/gnostic/openapiv3" ) type Configuration struct { @@ -47,7 +47,7 @@ type Configuration struct { } const ( - infoURL = "https://github.com/eqlabs/gnostic/tree/master/cmd/protoc-gen-openapi" + infoURL = "https://github.com/google/gnostic/tree/master/cmd/protoc-gen-openapi" ) // In order to dynamically add google.rpc.Status responses we need diff --git a/cmd/protoc-gen-openapi/generator/reflector.go b/cmd/protoc-gen-openapi/generator/reflector.go index cd12f071..31a0f930 100644 --- a/cmd/protoc-gen-openapi/generator/reflector.go +++ b/cmd/protoc-gen-openapi/generator/reflector.go @@ -21,8 +21,8 @@ import ( "google.golang.org/protobuf/reflect/protoreflect" - wk "github.com/eqlabs/gnostic/cmd/protoc-gen-openapi/generator/wellknown" - v3 "github.com/eqlabs/gnostic/openapiv3" + wk "github.com/google/gnostic/cmd/protoc-gen-openapi/generator/wellknown" + v3 "github.com/google/gnostic/openapiv3" ) const ( diff --git a/cmd/protoc-gen-openapi/generator/wellknown/mediatypes.go b/cmd/protoc-gen-openapi/generator/wellknown/mediatypes.go index b7c7f185..5b8dfa33 100644 --- a/cmd/protoc-gen-openapi/generator/wellknown/mediatypes.go +++ b/cmd/protoc-gen-openapi/generator/wellknown/mediatypes.go @@ -16,7 +16,7 @@ package wellknown import ( - v3 "github.com/eqlabs/gnostic/openapiv3" + v3 "github.com/google/gnostic/openapiv3" ) func NewGoogleApiHttpBodyMediaType() *v3.MediaTypes { diff --git a/cmd/protoc-gen-openapi/generator/wellknown/schemas.go b/cmd/protoc-gen-openapi/generator/wellknown/schemas.go index 895cb100..8840dde8 100644 --- a/cmd/protoc-gen-openapi/generator/wellknown/schemas.go +++ b/cmd/protoc-gen-openapi/generator/wellknown/schemas.go @@ -16,7 +16,7 @@ package wellknown import ( - v3 "github.com/eqlabs/gnostic/openapiv3" + v3 "github.com/google/gnostic/openapiv3" "google.golang.org/protobuf/reflect/protoreflect" ) @@ -168,12 +168,9 @@ func NewGoogleProtobufStructSchema() *v3.SchemaOrReference { // google.protobuf.Value is handled specially // See here for the details on the JSON mapping: -// -// https://developers.google.com/protocol-buffers/docs/proto3#json -// +// https://developers.google.com/protocol-buffers/docs/proto3#json // and here: -// -// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Value +// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Value func NewGoogleProtobufValueSchema(name string) *v3.NamedSchemaOrReference { return &v3.NamedSchemaOrReference{ Name: name, @@ -189,8 +186,7 @@ func NewGoogleProtobufValueSchema(name string) *v3.NamedSchemaOrReference { // google.protobuf.Any is handled specially // See here for the details on the JSON mapping: -// -// https://developers.google.com/protocol-buffers/docs/proto3#json +// https://developers.google.com/protocol-buffers/docs/proto3#json func NewGoogleProtobufAnySchema(name string) *v3.NamedSchemaOrReference { return &v3.NamedSchemaOrReference{ Name: name, diff --git a/cmd/protoc-gen-openapi/main.go b/cmd/protoc-gen-openapi/main.go index a43314ea..75405aed 100644 --- a/cmd/protoc-gen-openapi/main.go +++ b/cmd/protoc-gen-openapi/main.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "github.com/eqlabs/gnostic/cmd/protoc-gen-openapi/generator" + "github.com/google/gnostic/cmd/protoc-gen-openapi/generator" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/types/pluginpb" ) diff --git a/cmd/report-messages/main.go b/cmd/report-messages/main.go index 0351558a..a308a80f 100644 --- a/cmd/report-messages/main.go +++ b/cmd/report-messages/main.go @@ -23,9 +23,9 @@ import ( "github.com/golang/protobuf/proto" - "github.com/eqlabs/gnostic/printer" + "github.com/google/gnostic/printer" - plugins "github.com/eqlabs/gnostic/plugins" + plugins "github.com/google/gnostic/plugins" ) func readMessagesFromFileWithName(filename string) *plugins.Messages { diff --git a/cmd/report/main.go b/cmd/report/main.go index 8b17f35c..f0b166b3 100644 --- a/cmd/report/main.go +++ b/cmd/report/main.go @@ -25,9 +25,9 @@ import ( "github.com/golang/protobuf/proto" - "github.com/eqlabs/gnostic/printer" + "github.com/google/gnostic/printer" - pb "github.com/eqlabs/gnostic/openapiv2" + pb "github.com/google/gnostic/openapiv2" ) func readDocumentFromFileWithName(filename string) (*pb.Document, error) { diff --git a/cmd/vocabulary-operations/main.go b/cmd/vocabulary-operations/main.go index 40d3e033..8bc22ef2 100644 --- a/cmd/vocabulary-operations/main.go +++ b/cmd/vocabulary-operations/main.go @@ -24,8 +24,8 @@ import ( "github.com/golang/protobuf/proto" - metrics "github.com/eqlabs/gnostic/metrics" - vocabulary "github.com/eqlabs/gnostic/metrics/vocabulary" + metrics "github.com/google/gnostic/metrics" + vocabulary "github.com/google/gnostic/metrics/vocabulary" ) // openVocabularyFiles uses standard input to create a slice of diff --git a/conversions/openapiv2.go b/conversions/openapiv2.go index 2d9dd13f..fb738865 100644 --- a/conversions/openapiv2.go +++ b/conversions/openapiv2.go @@ -18,8 +18,8 @@ import ( "log" "net/url" - discovery "github.com/eqlabs/gnostic/discovery" - openapi2 "github.com/eqlabs/gnostic/openapiv2" + discovery "github.com/google/gnostic/discovery" + openapi2 "github.com/google/gnostic/openapiv2" ) func addOpenAPI2SchemaForSchema(d *openapi2.Document, name string, schema *discovery.Schema) { diff --git a/conversions/openapiv3.go b/conversions/openapiv3.go index 838d7377..576c2ec2 100644 --- a/conversions/openapiv3.go +++ b/conversions/openapiv3.go @@ -19,8 +19,8 @@ import ( "net/url" "strings" - discovery "github.com/eqlabs/gnostic/discovery" - openapi3 "github.com/eqlabs/gnostic/openapiv3" + discovery "github.com/google/gnostic/discovery" + openapi3 "github.com/google/gnostic/openapiv3" ) func pathForMethod(path string) string { diff --git a/discovery/discovery.go b/discovery/discovery.go index 62e7062c..8e7aac11 100644 --- a/discovery/discovery.go +++ b/discovery/discovery.go @@ -23,7 +23,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/eqlabs/gnostic/compiler" + "github.com/google/gnostic/compiler" ) // Version returns the package name (and OpenAPI version). diff --git a/discovery/document.go b/discovery/document.go index d263880f..2745d94c 100644 --- a/discovery/document.go +++ b/discovery/document.go @@ -17,7 +17,7 @@ package discovery_v1 import ( "errors" - "github.com/eqlabs/gnostic/compiler" + "github.com/google/gnostic/compiler" ) // FetchDocumentBytes downloads the bytes of a discovery document from a URL. diff --git a/discovery/list.go b/discovery/list.go index d2370e45..257b67da 100644 --- a/discovery/list.go +++ b/discovery/list.go @@ -19,7 +19,7 @@ import ( "errors" "strings" - "github.com/eqlabs/gnostic/compiler" + "github.com/google/gnostic/compiler" ) // APIsListServiceURL is the URL for the Google APIs Discovery Service diff --git a/generate-gnostic/domain.go b/generate-gnostic/domain.go index b1a38ca5..cb67b677 100644 --- a/generate-gnostic/domain.go +++ b/generate-gnostic/domain.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "github.com/eqlabs/gnostic/jsonschema" + "github.com/google/gnostic/jsonschema" ) // Domain models a collection of types that is defined by a schema. diff --git a/generate-gnostic/generate-compiler.go b/generate-gnostic/generate-compiler.go index 6a52923a..a6241646 100644 --- a/generate-gnostic/generate-compiler.go +++ b/generate-gnostic/generate-compiler.go @@ -20,7 +20,7 @@ import ( "sort" "strings" - "github.com/eqlabs/gnostic/printer" + "github.com/google/gnostic/printer" ) // patternNames hands out unique names for a given string. diff --git a/generate-gnostic/generate-extension.go b/generate-gnostic/generate-extension.go index 55ca3638..b8456185 100644 --- a/generate-gnostic/generate-extension.go +++ b/generate-gnostic/generate-extension.go @@ -26,9 +26,9 @@ import ( "sort" "strings" - "github.com/eqlabs/gnostic/compiler" - "github.com/eqlabs/gnostic/jsonschema" - "github.com/eqlabs/gnostic/printer" + "github.com/google/gnostic/compiler" + "github.com/google/gnostic/jsonschema" + "github.com/google/gnostic/printer" ) var protoOptionsForExtensions = []ProtoOption{ @@ -272,7 +272,7 @@ func generateExtension(schemaFile string, outDir string) error { "fmt", "regexp", "strings", - "github.com/eqlabs/gnostic/compiler", + "github.com/google/gnostic/compiler", "gopkg.in/yaml.v3", }) goFilename := path.Join(protoOutDirectory, outFileBaseName+".go") @@ -287,7 +287,7 @@ func generateExtension(schemaFile string, outDir string) error { // TODO: This path is currently fixed to the location of the samples. // Can we make it relative, perhaps with an option or by generating // a go.mod file for the generated extension handler? - outDirRelativeToPackageRoot := "github.com/eqlabs/gnostic/extensions/sample/" + outDir + outDirRelativeToPackageRoot := "github.com/google/gnostic/extensions/sample/" + outDir var extensionNameKeys []string for k := range extensionNameToMessageName { @@ -314,8 +314,8 @@ func generateExtension(schemaFile string, outDir string) error { } extMainCode := fmt.Sprintf(additionalCompilerCodeWithMain, cases) imports := []string{ - "github.com/eqlabs/gnostic/extensions", - "github.com/eqlabs/gnostic/compiler", + "github.com/google/gnostic/extensions", + "github.com/google/gnostic/compiler", "google.golang.org/protobuf/proto", "gopkg.in/yaml.v3", outDirRelativeToPackageRoot + "/" + "proto", diff --git a/generate-gnostic/generate-proto.go b/generate-gnostic/generate-proto.go index ce69a92d..1fe0eb99 100644 --- a/generate-gnostic/generate-proto.go +++ b/generate-gnostic/generate-proto.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/eqlabs/gnostic/printer" + "github.com/google/gnostic/printer" ) // ProtoOption represents an option to be added to generated .proto files. diff --git a/generate-gnostic/main.go b/generate-gnostic/main.go index bb40188c..59397181 100644 --- a/generate-gnostic/main.go +++ b/generate-gnostic/main.go @@ -28,7 +28,7 @@ import ( "golang.org/x/tools/imports" - "github.com/eqlabs/gnostic/jsonschema" + "github.com/google/gnostic/jsonschema" ) // License is the software license applied to generated code. @@ -193,7 +193,7 @@ func generateOpenAPIModel(version string) error { "gopkg.in/yaml.v3", "strings", "regexp", - "github.com/eqlabs/gnostic/compiler", + "github.com/google/gnostic/compiler", } // generate the compiler log.Printf("Generating compiler support code") diff --git a/generate-gnostic/types.go b/generate-gnostic/types.go index 75e05387..df148d70 100644 --- a/generate-gnostic/types.go +++ b/generate-gnostic/types.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/eqlabs/gnostic/jsonschema" + "github.com/google/gnostic/jsonschema" ) /// Type Modeling diff --git a/gnostic.go b/gnostic.go index 1fcb42de..2de60601 100644 --- a/gnostic.go +++ b/gnostic.go @@ -35,7 +35,7 @@ import ( "fmt" "os" - "github.com/eqlabs/gnostic/lib" + "github.com/google/gnostic/lib" ) func main() { diff --git a/gnostic_test.go b/gnostic_test.go index f8ba1a17..80e2f256 100644 --- a/gnostic_test.go +++ b/gnostic_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/eqlabs/gnostic/lib" + "github.com/google/gnostic/lib" ) func isURL(path string) bool { diff --git a/go.mod b/go.mod index e8abbd7e..69eae40b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/eqlabs/gnostic +module github.com/google/gnostic go 1.12 @@ -6,7 +6,6 @@ require ( github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 github.com/flowstack/go-jsonschema v0.1.1 github.com/golang/protobuf v1.5.3 - github.com/google/gnostic v0.6.9 github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 github.com/google/go-cmp v0.5.9 github.com/stoewer/go-strcase v1.2.0 diff --git a/go.sum b/go.sum index b48fb2f3..41e7e0df 100644 --- a/go.sum +++ b/go.sum @@ -710,8 +710,6 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= -github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= -github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 h1:0VpGH+cDhbDtdcweoyCVsF3fhN8kejK6rFe/2FFX2nU= github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49/go.mod h1:BkkQ4L1KS1xMt2aWSPStnn55ChGC0DPOn2FQYj+f25M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -790,7 +788,6 @@ github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHU github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= @@ -1346,7 +1343,6 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= @@ -1484,14 +1480,12 @@ google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cn google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/jsonwriter/writer_test.go b/jsonwriter/writer_test.go index ecec17d4..b714e609 100644 --- a/jsonwriter/writer_test.go +++ b/jsonwriter/writer_test.go @@ -17,8 +17,8 @@ package jsonwriter_test import ( "testing" - "github.com/eqlabs/gnostic/compiler" - "github.com/eqlabs/gnostic/jsonwriter" + "github.com/google/gnostic/compiler" + "github.com/google/gnostic/jsonwriter" "gopkg.in/yaml.v3" ) diff --git a/lib/gnostic.go b/lib/gnostic.go index 9bc50dd5..cf463530 100644 --- a/lib/gnostic.go +++ b/lib/gnostic.go @@ -31,13 +31,13 @@ import ( "github.com/golang/protobuf/proto" "gopkg.in/yaml.v3" - "github.com/eqlabs/gnostic/compiler" - discovery_v1 "github.com/eqlabs/gnostic/discovery" - "github.com/eqlabs/gnostic/jsonwriter" - openapi_v2 "github.com/eqlabs/gnostic/openapiv2" - openapi_v3 "github.com/eqlabs/gnostic/openapiv3" - plugins "github.com/eqlabs/gnostic/plugins" - surface "github.com/eqlabs/gnostic/surface" + "github.com/google/gnostic/compiler" + discovery_v1 "github.com/google/gnostic/discovery" + "github.com/google/gnostic/jsonwriter" + openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v3 "github.com/google/gnostic/openapiv3" + plugins "github.com/google/gnostic/plugins" + surface "github.com/google/gnostic/surface" ) // UsageError is a response to invalid command-line inputs @@ -241,11 +241,9 @@ func isURL(path string) bool { // Write bytes to a named file. // Certain names have special meaning: -// -// ! writes nothing -// - writes to stdout -// = writes to stderr -// +// ! writes nothing +// - writes to stdout +// = writes to stderr // If a directory name is given, the file is written there with // a name derived from the source and extension arguments. func writeFile(name string, bytes []byte, source string, extension string) { diff --git a/linters/go/gnostic-lint-descriptions/linter_v2.go b/linters/go/gnostic-lint-descriptions/linter_v2.go index b4a3cb95..3e44f300 100644 --- a/linters/go/gnostic-lint-descriptions/linter_v2.go +++ b/linters/go/gnostic-lint-descriptions/linter_v2.go @@ -14,8 +14,8 @@ package main import ( - openapi "github.com/eqlabs/gnostic/openapiv2" - plugins "github.com/eqlabs/gnostic/plugins" + openapi "github.com/google/gnostic/openapiv2" + plugins "github.com/google/gnostic/plugins" ) // DocumentLinter contains information collected about an API description. diff --git a/linters/go/gnostic-lint-descriptions/linter_v3.go b/linters/go/gnostic-lint-descriptions/linter_v3.go index 3d217002..b30ba8c0 100644 --- a/linters/go/gnostic-lint-descriptions/linter_v3.go +++ b/linters/go/gnostic-lint-descriptions/linter_v3.go @@ -15,8 +15,8 @@ package main import ( - openapi "github.com/eqlabs/gnostic/openapiv3" - plugins "github.com/eqlabs/gnostic/plugins" + openapi "github.com/google/gnostic/openapiv3" + plugins "github.com/google/gnostic/plugins" ) // DocumentLinter contains information collected about an API description. diff --git a/linters/go/gnostic-lint-descriptions/main.go b/linters/go/gnostic-lint-descriptions/main.go index dc373106..ea33ce62 100644 --- a/linters/go/gnostic-lint-descriptions/main.go +++ b/linters/go/gnostic-lint-descriptions/main.go @@ -23,9 +23,9 @@ package main import ( "github.com/golang/protobuf/proto" - openapiv2 "github.com/eqlabs/gnostic/openapiv2" - openapiv3 "github.com/eqlabs/gnostic/openapiv3" - plugins "github.com/eqlabs/gnostic/plugins" + openapiv2 "github.com/google/gnostic/openapiv2" + openapiv3 "github.com/google/gnostic/openapiv3" + plugins "github.com/google/gnostic/plugins" ) type DocumentLinter interface { diff --git a/linters/go/gnostic-lint-paths/main.go b/linters/go/gnostic-lint-paths/main.go index 84f1f8a8..56dab5bd 100644 --- a/linters/go/gnostic-lint-paths/main.go +++ b/linters/go/gnostic-lint-paths/main.go @@ -20,9 +20,9 @@ package main import ( "github.com/golang/protobuf/proto" - openapiv2 "github.com/eqlabs/gnostic/openapiv2" - openapiv3 "github.com/eqlabs/gnostic/openapiv3" - plugins "github.com/eqlabs/gnostic/plugins" + openapiv2 "github.com/google/gnostic/openapiv2" + openapiv3 "github.com/google/gnostic/openapiv3" + plugins "github.com/google/gnostic/plugins" ) func checkPathsV2(document *openapiv2.Document, messages []*plugins.Message) []*plugins.Message { diff --git a/metrics/lint/aip-linterv2.go b/metrics/lint/aip-linterv2.go index 0980befe..ee4b17ef 100644 --- a/metrics/lint/aip-linterv2.go +++ b/metrics/lint/aip-linterv2.go @@ -17,8 +17,8 @@ package linter import ( "fmt" - rules "github.com/eqlabs/gnostic/metrics/rules" - pb "github.com/eqlabs/gnostic/openapiv2" + rules "github.com/google/gnostic/metrics/rules" + pb "github.com/google/gnostic/openapiv2" ) // fillProtoStructure takes a slice of rules and coverts them to a slice of @@ -94,8 +94,8 @@ func processParametersV2(operation *pb.Operation, path []string) []rules.Field { return parameters } -// AIPLintV2 accepts an OpenAPI v2 document and will call the individual AIP rules -// on the document. +//AIPLintV2 accepts an OpenAPI v2 document and will call the individual AIP rules +//on the document. func AIPLintV2(document *pb.Document) (*Linter, int) { fields := gatherParametersV2(document) messages := make([]rules.MessageType, 0) diff --git a/metrics/lint/aip-linterv3.go b/metrics/lint/aip-linterv3.go index 141e4427..c2737836 100644 --- a/metrics/lint/aip-linterv3.go +++ b/metrics/lint/aip-linterv3.go @@ -18,8 +18,8 @@ import ( "fmt" "os" - rules "github.com/eqlabs/gnostic/metrics/rules" - openapi_v3 "github.com/eqlabs/gnostic/openapiv3" + rules "github.com/google/gnostic/metrics/rules" + openapi_v3 "github.com/google/gnostic/openapiv3" ) // processParametersV2 loops over the parameters of component and creates a @@ -89,8 +89,8 @@ func gatherParameters(document *openapi_v3.Document) []rules.Field { return p } -// AIPLintV3 accepts an OpenAPI v2 document and will call the individual AIP rules -// on the document. +//AIPLintV3 accepts an OpenAPI v2 document and will call the individual AIP rules +//on the document. func AIPLintV3(document *openapi_v3.Document) (*Linter, int) { fields := gatherParameters(document) messages := make([]rules.MessageType, 0) diff --git a/metrics/vocabulary/difference.go b/metrics/vocabulary/difference.go index 1d624b69..9745099c 100644 --- a/metrics/vocabulary/difference.go +++ b/metrics/vocabulary/difference.go @@ -15,7 +15,7 @@ package vocabulary import ( - metrics "github.com/eqlabs/gnostic/metrics" + metrics "github.com/google/gnostic/metrics" ) // mapDifference finds the difference between two Vocabularies. diff --git a/metrics/vocabulary/discovery.go b/metrics/vocabulary/discovery.go index 5892f61e..3e8d8032 100644 --- a/metrics/vocabulary/discovery.go +++ b/metrics/vocabulary/discovery.go @@ -15,8 +15,8 @@ package vocabulary import ( - discovery_v1 "github.com/eqlabs/gnostic/discovery" - metrics "github.com/eqlabs/gnostic/metrics" + discovery_v1 "github.com/google/gnostic/discovery" + metrics "github.com/google/gnostic/metrics" ) func (vocab *Vocabulary) processMethodDiscovery(operation *discovery_v1.Method) { diff --git a/metrics/vocabulary/filterCommon.go b/metrics/vocabulary/filterCommon.go index 1be2623b..39c4698a 100644 --- a/metrics/vocabulary/filterCommon.go +++ b/metrics/vocabulary/filterCommon.go @@ -15,7 +15,7 @@ package vocabulary import ( - metrics "github.com/eqlabs/gnostic/metrics" + metrics "github.com/google/gnostic/metrics" ) // FilterCommon implements the difference operation amongst a slice of Vocabularies. diff --git a/metrics/vocabulary/intersection.go b/metrics/vocabulary/intersection.go index fc15de33..58b22718 100644 --- a/metrics/vocabulary/intersection.go +++ b/metrics/vocabulary/intersection.go @@ -15,7 +15,7 @@ package vocabulary import ( - metrics "github.com/eqlabs/gnostic/metrics" + metrics "github.com/google/gnostic/metrics" ) // mapIntersection finds the intersection between two Vocabularies. diff --git a/metrics/vocabulary/openapiv2.go b/metrics/vocabulary/openapiv2.go index ec4f9163..38875cbc 100644 --- a/metrics/vocabulary/openapiv2.go +++ b/metrics/vocabulary/openapiv2.go @@ -15,8 +15,8 @@ package vocabulary import ( - metrics "github.com/eqlabs/gnostic/metrics" - openapi_v2 "github.com/eqlabs/gnostic/openapiv2" + metrics "github.com/google/gnostic/metrics" + openapi_v2 "github.com/google/gnostic/openapiv2" ) func (vocab *Vocabulary) processOperationV2(operation *openapi_v2.Operation) { diff --git a/metrics/vocabulary/openapiv3.go b/metrics/vocabulary/openapiv3.go index 861a0f18..ab94df51 100644 --- a/metrics/vocabulary/openapiv3.go +++ b/metrics/vocabulary/openapiv3.go @@ -17,8 +17,8 @@ package vocabulary import ( "sort" - metrics "github.com/eqlabs/gnostic/metrics" - openapi_v3 "github.com/eqlabs/gnostic/openapiv3" + metrics "github.com/google/gnostic/metrics" + openapi_v3 "github.com/google/gnostic/openapiv3" ) func fillProtoStructures(m map[string]int) []*metrics.WordCount { diff --git a/metrics/vocabulary/union.go b/metrics/vocabulary/union.go index 448e8c06..57d05b8a 100644 --- a/metrics/vocabulary/union.go +++ b/metrics/vocabulary/union.go @@ -15,7 +15,7 @@ package vocabulary import ( - metrics "github.com/eqlabs/gnostic/metrics" + metrics "github.com/google/gnostic/metrics" ) // Union implements the union operation between multiple Vocabularies. diff --git a/metrics/vocabulary/version.go b/metrics/vocabulary/version.go index 6e7a158f..7dd0de55 100644 --- a/metrics/vocabulary/version.go +++ b/metrics/vocabulary/version.go @@ -15,7 +15,7 @@ package vocabulary import ( - metrics "github.com/eqlabs/gnostic/metrics" + metrics "github.com/google/gnostic/metrics" ) // fillVersionProto takes a newer and older version of a vocabularies and utilizes the diff --git a/metrics/vocabulary/vocabulary.go b/metrics/vocabulary/vocabulary.go index 66c2f690..cbca53f9 100644 --- a/metrics/vocabulary/vocabulary.go +++ b/metrics/vocabulary/vocabulary.go @@ -26,7 +26,7 @@ import ( "google.golang.org/protobuf/proto" - metrics "github.com/eqlabs/gnostic/metrics" + metrics "github.com/google/gnostic/metrics" ) type Vocabulary struct { diff --git a/metrics/vocabulary/vocabulary_test.go b/metrics/vocabulary/vocabulary_test.go index 5317e281..90d93868 100644 --- a/metrics/vocabulary/vocabulary_test.go +++ b/metrics/vocabulary/vocabulary_test.go @@ -22,10 +22,10 @@ import ( "github.com/golang/protobuf/jsonpb" - discovery "github.com/eqlabs/gnostic/discovery" - metrics "github.com/eqlabs/gnostic/metrics" - openapiv2 "github.com/eqlabs/gnostic/openapiv2" - openapiv3 "github.com/eqlabs/gnostic/openapiv3" + discovery "github.com/google/gnostic/discovery" + metrics "github.com/google/gnostic/metrics" + openapiv2 "github.com/google/gnostic/openapiv2" + openapiv3 "github.com/google/gnostic/openapiv3" ) func fillTestProtoStructure(words []string, count []int) []*metrics.WordCount { diff --git a/openapiv2/OpenAPIv2.go b/openapiv2/OpenAPIv2.go index 676cf098..0dc5ed52 100644 --- a/openapiv2/OpenAPIv2.go +++ b/openapiv2/OpenAPIv2.go @@ -23,7 +23,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/eqlabs/gnostic/compiler" + "github.com/google/gnostic/compiler" ) // Version returns the package name (and OpenAPI version). diff --git a/openapiv2/document.go b/openapiv2/document.go index 86018f58..dd43221b 100644 --- a/openapiv2/document.go +++ b/openapiv2/document.go @@ -17,7 +17,7 @@ package openapi_v2 import ( "errors" - "github.com/eqlabs/gnostic/compiler" + "github.com/google/gnostic/compiler" ) // ParseDocument reads an OpenAPI v2 description from a YAML/JSON representation. diff --git a/openapiv3/OpenAPIv3.go b/openapiv3/OpenAPIv3.go index 96f1993f..2d5092fe 100644 --- a/openapiv3/OpenAPIv3.go +++ b/openapiv3/OpenAPIv3.go @@ -23,7 +23,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/eqlabs/gnostic/compiler" + "github.com/google/gnostic/compiler" ) // Version returns the package name (and OpenAPI version). diff --git a/openapiv3/OpenAPIv3.proto b/openapiv3/OpenAPIv3.proto index 7d905074..7aede5ed 100644 --- a/openapiv3/OpenAPIv3.proto +++ b/openapiv3/OpenAPIv3.proto @@ -42,7 +42,7 @@ option java_package = "org.openapi_v3"; option objc_class_prefix = "OAS"; // The Go package name. -option go_package = "github.com/eqlabs/gnostic/openapiv3;openapi_v3"; +option go_package = "github.com/google/gnostic/openapiv3;openapi_v3"; message AdditionalPropertiesItem { oneof oneof { diff --git a/openapiv3/annotations.proto b/openapiv3/annotations.proto index f9c44494..0bd87810 100644 --- a/openapiv3/annotations.proto +++ b/openapiv3/annotations.proto @@ -41,7 +41,7 @@ option java_package = "org.openapi_v3"; option objc_class_prefix = "OAS"; // The Go package name. -option go_package = "github.com/eqlabs/gnostic/openapiv3;openapi_v3"; +option go_package = "github.com/google/gnostic/openapiv3;openapi_v3"; extend google.protobuf.FileOptions { Document document = 1143; diff --git a/openapiv3/document.go b/openapiv3/document.go index 6aa66a42..e5b305ec 100644 --- a/openapiv3/document.go +++ b/openapiv3/document.go @@ -17,7 +17,7 @@ package openapi_v3 import ( "errors" - "github.com/eqlabs/gnostic/compiler" + "github.com/google/gnostic/compiler" ) // ParseDocument reads an OpenAPI v3 description from a YAML/JSON representation. diff --git a/openapiv3/schema-generator/main.go b/openapiv3/schema-generator/main.go index 6d19dff8..a75002ff 100644 --- a/openapiv3/schema-generator/main.go +++ b/openapiv3/schema-generator/main.go @@ -29,7 +29,7 @@ import ( "unicode" "unicode/utf8" - "github.com/eqlabs/gnostic/jsonschema" + "github.com/google/gnostic/jsonschema" ) // convert the first character of a string to lower case diff --git a/plugins/environment.go b/plugins/environment.go index 5fe430e8..3a935295 100644 --- a/plugins/environment.go +++ b/plugins/environment.go @@ -14,10 +14,10 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/any" - discovery "github.com/eqlabs/gnostic/discovery" - openapiv2 "github.com/eqlabs/gnostic/openapiv2" - openapiv3 "github.com/eqlabs/gnostic/openapiv3" - surface "github.com/eqlabs/gnostic/surface" + discovery "github.com/google/gnostic/discovery" + openapiv2 "github.com/google/gnostic/openapiv2" + openapiv3 "github.com/google/gnostic/openapiv3" + surface "github.com/google/gnostic/surface" ) // Environment contains the environment of a plugin call. diff --git a/plugins/gnostic-analyze/main.go b/plugins/gnostic-analyze/main.go index 970489af..f2e6918f 100644 --- a/plugins/gnostic-analyze/main.go +++ b/plugins/gnostic-analyze/main.go @@ -16,12 +16,11 @@ // // It scans an API description and evaluates properties // that influence the ease and quality of code generation. -// - The number of HTTP operations of each method (GET, POST, etc). -// - The number of HTTP operations with no OperationId value. -// - The parameter types used and their frequencies. -// - The response types used and their frequencies. -// - The types used in definition objects and arrays and their frequencies. -// +// - The number of HTTP operations of each method (GET, POST, etc). +// - The number of HTTP operations with no OperationId value. +// - The parameter types used and their frequencies. +// - The response types used and their frequencies. +// - The types used in definition objects and arrays and their frequencies. // Results are returned in a JSON structure. package main @@ -31,13 +30,13 @@ import ( "path" "strings" - "github.com/eqlabs/gnostic/plugins/gnostic-analyze/statistics" + "github.com/google/gnostic/plugins/gnostic-analyze/statistics" "github.com/golang/protobuf/proto" - openapiv2 "github.com/eqlabs/gnostic/openapiv2" - openapiv3 "github.com/eqlabs/gnostic/openapiv3" - plugins "github.com/eqlabs/gnostic/plugins" + openapiv2 "github.com/google/gnostic/openapiv2" + openapiv3 "github.com/google/gnostic/openapiv3" + plugins "github.com/google/gnostic/plugins" ) // Record an error, then serialize and return a response. diff --git a/plugins/gnostic-analyze/statistics/statsv2.go b/plugins/gnostic-analyze/statistics/statsv2.go index ff4d7e3a..7f64e81d 100644 --- a/plugins/gnostic-analyze/statistics/statsv2.go +++ b/plugins/gnostic-analyze/statistics/statsv2.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - openapi "github.com/eqlabs/gnostic/openapiv2" + openapi "github.com/google/gnostic/openapiv2" ) // DocumentStatistics contains information collected about an API description. diff --git a/plugins/gnostic-analyze/statistics/statsv3.go b/plugins/gnostic-analyze/statistics/statsv3.go index ff546c36..e7f8f0c9 100644 --- a/plugins/gnostic-analyze/statistics/statsv3.go +++ b/plugins/gnostic-analyze/statistics/statsv3.go @@ -15,7 +15,7 @@ package statistics import ( - openapi "github.com/eqlabs/gnostic/openapiv3" + openapi "github.com/google/gnostic/openapiv3" ) // NewDocumentStatistics builds a new DocumentStatistics object. diff --git a/plugins/gnostic-analyze/summarize/main.go b/plugins/gnostic-analyze/summarize/main.go index d4ec2b0e..7056ee82 100644 --- a/plugins/gnostic-analyze/summarize/main.go +++ b/plugins/gnostic-analyze/summarize/main.go @@ -24,7 +24,7 @@ import ( "path/filepath" "sort" - "github.com/eqlabs/gnostic/plugins/gnostic-analyze/statistics" + "github.com/google/gnostic/plugins/gnostic-analyze/statistics" ) // Results are collected in this global slice. diff --git a/plugins/gnostic-complexity/main.go b/plugins/gnostic-complexity/main.go index c2839347..fbffc45c 100644 --- a/plugins/gnostic-complexity/main.go +++ b/plugins/gnostic-complexity/main.go @@ -21,10 +21,10 @@ import ( "github.com/golang/protobuf/proto" - metrics "github.com/eqlabs/gnostic/metrics" - openapiv2 "github.com/eqlabs/gnostic/openapiv2" - openapiv3 "github.com/eqlabs/gnostic/openapiv3" - plugins "github.com/eqlabs/gnostic/plugins" + metrics "github.com/google/gnostic/metrics" + openapiv2 "github.com/google/gnostic/openapiv2" + openapiv3 "github.com/google/gnostic/openapiv3" + plugins "github.com/google/gnostic/plugins" ) // This is the main function for the plugin. diff --git a/plugins/gnostic-linter/main.go b/plugins/gnostic-linter/main.go index 69c172d4..116f80b6 100644 --- a/plugins/gnostic-linter/main.go +++ b/plugins/gnostic-linter/main.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -20,10 +20,10 @@ import ( "github.com/golang/protobuf/proto" - lint "github.com/eqlabs/gnostic/metrics/lint" - openapiv2 "github.com/eqlabs/gnostic/openapiv2" - openapiv3 "github.com/eqlabs/gnostic/openapiv3" - plugins "github.com/eqlabs/gnostic/plugins" + lint "github.com/google/gnostic/metrics/lint" + openapiv2 "github.com/google/gnostic/openapiv2" + openapiv3 "github.com/google/gnostic/openapiv3" + plugins "github.com/google/gnostic/plugins" ) // Record an error, then serialize and return a response. diff --git a/plugins/gnostic-plugin-request/main.go b/plugins/gnostic-plugin-request/main.go index 68bda438..0c42af60 100644 --- a/plugins/gnostic-plugin-request/main.go +++ b/plugins/gnostic-plugin-request/main.go @@ -22,10 +22,10 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - openapiv2 "github.com/eqlabs/gnostic/openapiv2" - openapiv3 "github.com/eqlabs/gnostic/openapiv3" - plugins "github.com/eqlabs/gnostic/plugins" - surface "github.com/eqlabs/gnostic/surface" + openapiv2 "github.com/google/gnostic/openapiv2" + openapiv3 "github.com/google/gnostic/openapiv3" + plugins "github.com/google/gnostic/plugins" + surface "github.com/google/gnostic/surface" ) func main() { diff --git a/plugins/gnostic-process-plugin-response/main.go b/plugins/gnostic-process-plugin-response/main.go index 2ff13198..294b97b0 100644 --- a/plugins/gnostic-process-plugin-response/main.go +++ b/plugins/gnostic-process-plugin-response/main.go @@ -25,7 +25,7 @@ import ( "github.com/golang/protobuf/proto" - plugins "github.com/eqlabs/gnostic/plugins" + plugins "github.com/google/gnostic/plugins" ) func exitIfError(err error) { diff --git a/plugins/gnostic-summary/main.go b/plugins/gnostic-summary/main.go index 98673b38..846e2904 100644 --- a/plugins/gnostic-summary/main.go +++ b/plugins/gnostic-summary/main.go @@ -22,10 +22,10 @@ import ( "github.com/golang/protobuf/proto" - openapiv2 "github.com/eqlabs/gnostic/openapiv2" - openapiv3 "github.com/eqlabs/gnostic/openapiv3" - plugins "github.com/eqlabs/gnostic/plugins" - "github.com/eqlabs/gnostic/printer" + openapiv2 "github.com/google/gnostic/openapiv2" + openapiv3 "github.com/google/gnostic/openapiv3" + plugins "github.com/google/gnostic/plugins" + "github.com/google/gnostic/printer" ) // generate a simple report of an OpenAPI document's contents diff --git a/plugins/gnostic-vocabulary/main.go b/plugins/gnostic-vocabulary/main.go index eff56227..dbfb1125 100644 --- a/plugins/gnostic-vocabulary/main.go +++ b/plugins/gnostic-vocabulary/main.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -21,12 +21,12 @@ import ( "github.com/golang/protobuf/proto" - discovery_v1 "github.com/eqlabs/gnostic/discovery" - metrics "github.com/eqlabs/gnostic/metrics" - vocabulary "github.com/eqlabs/gnostic/metrics/vocabulary" - openapiv2 "github.com/eqlabs/gnostic/openapiv2" - openapiv3 "github.com/eqlabs/gnostic/openapiv3" - plugins "github.com/eqlabs/gnostic/plugins" + discovery_v1 "github.com/google/gnostic/discovery" + metrics "github.com/google/gnostic/metrics" + vocabulary "github.com/google/gnostic/metrics/vocabulary" + openapiv2 "github.com/google/gnostic/openapiv2" + openapiv3 "github.com/google/gnostic/openapiv3" + plugins "github.com/google/gnostic/plugins" ) // Record an error, then serialize and return a response. diff --git a/surface/model_openapiv2.go b/surface/model_openapiv2.go index cd62b96a..19878e17 100644 --- a/surface/model_openapiv2.go +++ b/surface/model_openapiv2.go @@ -18,8 +18,8 @@ import ( "log" "strconv" - "github.com/eqlabs/gnostic/compiler" - openapiv2 "github.com/eqlabs/gnostic/openapiv2" + "github.com/google/gnostic/compiler" + openapiv2 "github.com/google/gnostic/openapiv2" ) type OpenAPI2Builder struct { diff --git a/surface/model_openapiv2_test.go b/surface/model_openapiv2_test.go index e04ff4f4..78d002f2 100644 --- a/surface/model_openapiv2_test.go +++ b/surface/model_openapiv2_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - openapiv2 "github.com/eqlabs/gnostic/openapiv2" + openapiv2 "github.com/google/gnostic/openapiv2" "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/encoding/protojson" diff --git a/surface/model_openapiv3.go b/surface/model_openapiv3.go index 2b562550..e9ecdfed 100644 --- a/surface/model_openapiv3.go +++ b/surface/model_openapiv3.go @@ -18,8 +18,8 @@ import ( "log" "strings" - "github.com/eqlabs/gnostic/compiler" - openapiv3 "github.com/eqlabs/gnostic/openapiv3" + "github.com/google/gnostic/compiler" + openapiv3 "github.com/google/gnostic/openapiv3" ) type OpenAPI3Builder struct { diff --git a/surface/model_openapiv3_test.go b/surface/model_openapiv3_test.go index 3fff7ee9..863a1614 100644 --- a/surface/model_openapiv3_test.go +++ b/surface/model_openapiv3_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - openapiv3 "github.com/eqlabs/gnostic/openapiv3" + openapiv3 "github.com/google/gnostic/openapiv3" "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/encoding/protojson" diff --git a/tools/format-schema/main.go b/tools/format-schema/main.go index f8ed2883..5cc363c3 100644 --- a/tools/format-schema/main.go +++ b/tools/format-schema/main.go @@ -20,7 +20,7 @@ import ( "os" "path" - "github.com/eqlabs/gnostic/jsonschema" + "github.com/google/gnostic/jsonschema" ) func main() { diff --git a/tools/j2y2j/main.go b/tools/j2y2j/main.go index fba02acd..3ac75754 100644 --- a/tools/j2y2j/main.go +++ b/tools/j2y2j/main.go @@ -24,7 +24,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/eqlabs/gnostic/jsonschema" + "github.com/google/gnostic/jsonschema" ) func usage() {