update test data

sudorandom · Aug 20, 2024 · e5a7f7d · e5a7f7d
1 parent e4bd50f
commit e5a7f7d
Show file tree

Hide file tree

Showing 39 changed files with 1,316 additions and 644 deletions.
diff --git a/internal/converter/converter.go b/internal/converter/converter.go
@@ -114,15 +114,13 @@ func Convert(req *pluginpb.CodeGeneratorRequest) (*pluginpb.CodeGeneratorRespons
 		return nil, err
 	}
 
-	logLevel := slog.LevelInfo
 	if opts.Debug {
-		logLevel = slog.LevelDebug
+		slog.SetDefault(slog.New(
+			tint.NewHandler(os.Stderr, &tint.Options{
+				Level: slog.LevelDebug,
+			}),
+		))
 	}
-	slog.SetDefault(slog.New(
-		tint.NewHandler(os.Stderr, &tint.Options{
-			Level: logLevel,
-		}),
-	))
 
 	files := []*pluginpb.CodeGeneratorResponse_File{}
 	genFiles := make(map[string]struct{}, len(req.FileToGenerate))

diff --git a/internal/converter/fixtures/fileset.binpb b/internal/converter/fixtures/fileset.binpb
diff --git a/internal/converter/fixtures/flex.cases.yaml b/internal/converter/fixtures/flex.cases.yaml
@@ -4,6 +4,7 @@ cases:
     body: '{}'
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
 
   - name: "normalrpc-full"
     path: "flex.FlexService/NormalRPC"
@@ -31,6 +32,7 @@ cases:
       }
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
 
   # 64bit numeric types can use strings (as they must if they're large enough)
   - name: "normalrpc-strings"
@@ -48,3 +50,4 @@ cases:
       }
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
diff --git a/internal/converter/fixtures/google_value.cases.yaml b/internal/converter/fixtures/google_value.cases.yaml
@@ -4,11 +4,13 @@ cases:
     body: '"kevin"'
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
 
   - name: "healthcheck with object"
     path: "samples.Test/HealthCheck"
     body: '{"value": "kevin"}'
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
     errors:
       - ".*Reason: expected string, but got object, Location: /type.*"
diff --git a/internal/converter/fixtures/helloworld.cases.yaml b/internal/converter/fixtures/helloworld.cases.yaml
@@ -5,13 +5,15 @@ cases:
     query: 'message=%7B%22name%22%3A%20%22kevin%22%7D'
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
 
   - name: "hello-wrong-value-type"
     method: GET
     path: "helloworld.Greeter/SayHello"
     query: 'message=%7B%22name%22%3A%201%7D'
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
     errors:
       - ".*Reason: expected string, but got number, Location: /properties/name/type.*"
 
@@ -21,6 +23,7 @@ cases:
     query: 'message=%7B%22nane%22%3A%20%22kevin%22%7D'
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
     errors:
       - ".*additionalProperties 'nane' not allowed, Location: /additionalProperties.*"
 
@@ -30,6 +33,7 @@ cases:
     query: 'message=%7B%22name%22%3A%20%22kevin%22%2C%20%22extra%22%3A%201234%7D'
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
     errors:
       - ".*additionalProperties 'extra' not allowed, Location: /additionalProperties.*"
 
@@ -38,12 +42,14 @@ cases:
     body: '{"name": "kevin"}'
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
 
   - name: "writehello-wrong-value-type"
     path: "helloworld.Greeter/WriteHello"
     body: '{"name": 1}'
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
     errors:
       - ".*Reason: expected string, but got number, Location: /properties/name/type.*"
 
@@ -52,6 +58,7 @@ cases:
     body: '{"nane": "kevin"}'
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
     errors:
       - ".*additionalProperties 'nane' not allowed, Location: /additionalProperties.*"
 
@@ -60,5 +67,6 @@ cases:
     body: '{"name": "kevin", "extra": 1234}'
     headers:
       Content-Type: application/json
+      Connect-Protocol-Version: 1
     errors:
       - ".*additionalProperties 'extra' not allowed, Location: /additionalProperties.*"
diff --git a/internal/converter/fixtures/output/array_of_enums.openapi.json b/internal/converter/fixtures/output/array_of_enums.openapi.json
@@ -32,6 +32,20 @@
         "title": "ArrayOfEnums",
         "additionalProperties": false
       },
+      "connect-protocol-version": {
+        "type": "number",
+        "title": "Connect-Protocol-Version",
+        "enum": [
+          1
+        ],
+        "description": "Define the version of the Connect protocol",
+        "const": 1
+      },
+      "connect-timeout-header": {
+        "type": "number",
+        "title": "Connect-Timeout-Ms",
+        "description": "Define the timeout, in ms"
+      },
       "connect.error": {
         "type": "object",
         "properties": {

diff --git a/internal/converter/fixtures/output/array_of_enums.openapi.yaml b/internal/converter/fixtures/output/array_of_enums.openapi.yaml
@@ -23,6 +23,17 @@ components:
             $ref: '#/components/schemas/enums.ArrayOfEnums.inline'
       title: ArrayOfEnums
       additionalProperties: false
+    connect-protocol-version:
+      type: number
+      title: Connect-Protocol-Version
+      enum:
+        - 1
+      description: Define the version of the Connect protocol
+      const: 1
+    connect-timeout-header:
+      type: number
+      title: Connect-Timeout-Ms
+      description: Define the timeout, in ms
     connect.error:
       type: object
       properties:

diff --git a/internal/converter/fixtures/output/array_of_messages.openapi.json b/internal/converter/fixtures/output/array_of_messages.openapi.json
@@ -36,6 +36,20 @@
         "title": "Thing",
         "additionalProperties": false
       },
+      "connect-protocol-version": {
+        "type": "number",
+        "title": "Connect-Protocol-Version",
+        "enum": [
+          1
+        ],
+        "description": "Define the version of the Connect protocol",
+        "const": 1
+      },
+      "connect-timeout-header": {
+        "type": "number",
+        "title": "Connect-Timeout-Ms",
+        "description": "Define the timeout, in ms"
+      },
       "connect.error": {
         "type": "object",
         "properties": {

diff --git a/internal/converter/fixtures/output/array_of_messages.openapi.yaml b/internal/converter/fixtures/output/array_of_messages.openapi.yaml
@@ -26,6 +26,17 @@ components:
           additionalProperties: false
       title: Thing
       additionalProperties: false
+    connect-protocol-version:
+      type: number
+      title: Connect-Protocol-Version
+      enum:
+        - 1
+      description: Define the version of the Connect protocol
+      const: 1
+    connect-timeout-header:
+      type: number
+      title: Connect-Timeout-Ms
+      description: Define the timeout, in ms
     connect.error:
       type: object
       properties:

diff --git a/internal/converter/fixtures/output/editions_2023.openapi.json b/internal/converter/fixtures/output/editions_2023.openapi.json
@@ -1,10 +1,12 @@
 {
   "openapi": "3.1.0",
-  "info": {},
+  "info": {
+    "title": "editions"
+  },
   "paths": {},
   "components": {
     "schemas": {
-      "Person.Employment": {
+      "editions.Person.Employment": {
         "type": "string",
         "title": "Employment",
         "enum": [
@@ -13,7 +15,7 @@
           "EMPLOYMENT_PARTTIME"
         ]
       },
-      "Person.Pay_Type": {
+      "editions.Person.Pay_Type": {
         "type": "string",
         "title": "Pay_Type",
         "enum": [
@@ -22,7 +24,7 @@
           "PAY_TYPE_HOURLY"
         ]
       },
-      "Person": {
+      "editions.Person": {
         "type": "object",
         "properties": {
           "name": {
@@ -36,12 +38,26 @@
             "additionalProperties": false
           },
           "employment": {
-            "$ref": "#/components/schemas/Person.Employment"
+            "$ref": "#/components/schemas/editions.Person.Employment"
           }
         },
         "title": "Person",
         "additionalProperties": false
       },
+      "connect-protocol-version": {
+        "type": "number",
+        "title": "Connect-Protocol-Version",
+        "enum": [
+          1
+        ],
+        "description": "Define the version of the Connect protocol",
+        "const": 1
+      },
+      "connect-timeout-header": {
+        "type": "number",
+        "title": "Connect-Timeout-Ms",
+        "description": "Define the timeout, in ms"
+      },
       "connect.error": {
         "type": "object",
         "properties": {

diff --git a/internal/converter/fixtures/output/editions_2023.openapi.yaml b/internal/converter/fixtures/output/editions_2023.openapi.yaml
@@ -1,23 +1,24 @@
 openapi: 3.1.0
-info: {}
+info:
+  title: editions
 paths: {}
 components:
   schemas:
-    Person.Employment:
+    editions.Person.Employment:
       type: string
       title: Employment
       enum:
         - EMPLOYMENT_UNSPECIFIED
         - EMPLOYMENT_FULLTIME
         - EMPLOYMENT_PARTTIME
-    Person.Pay_Type:
+    editions.Person.Pay_Type:
       type: string
       title: Pay_Type
       enum:
         - PAY_TYPE_UNSPECIFIED
         - PAY_TYPE_SALARY
         - PAY_TYPE_HOURLY
-    Person:
+    editions.Person:
       type: object
       properties:
         name:
@@ -29,9 +30,20 @@ components:
           title: id
           additionalProperties: false
         employment:
-          $ref: '#/components/schemas/Person.Employment'
+          $ref: '#/components/schemas/editions.Person.Employment'
       title: Person
       additionalProperties: false
+    connect-protocol-version:
+      type: number
+      title: Connect-Protocol-Version
+      enum:
+        - 1
+      description: Define the version of the Connect protocol
+      const: 1
+    connect-timeout-header:
+      type: number
+      title: Connect-Timeout-Ms
+      description: Define the timeout, in ms
     connect.error:
       type: object
       properties: