test: fix tests

.github/workflows/test.yml

@@ -19,19 +19,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2
 
-      - name: "test: no change to generated files."
+      - name: "test: all tests"
         run: |
           go install github.com/bufbuild/buf/cmd/buf@v1.42.0
-          ./scripts/verify-goldens.sh
-
-      - name: "test: example server function"
-        run: |
-          ./scripts/test_http_api.sh
-
-      - name: run OAS api-linter
-        run: |
-          ./scripts/run-oas-linter.sh
-
-      - name: run protobuf api-linter
-        run: |
-          ./scripts/run-proto-linter.sh
+          ./scripts/test-all.sh

example/bookstore/v1/bookstore.proto

@@ -272,11 +272,11 @@ message Book {
 
   // A Author.
   message Author {
-    // Field for first_name.
-    string first_name = 1 [json_name = "first_name"];
+    // Field for given_name.
+    string given_name = 1 [json_name = "given_name"];
 
-    // Field for last_name.
-    string last_name = 2 [json_name = "last_name"];
+    // Field for family_name.
+    string family_name = 2 [json_name = "family_name"];
   }
 
   // Field for isbn.

example/bookstore/v1/bookstore.swagger.json

@@ -1376,13 +1376,13 @@
     "BookAuthor": {
       "type": "object",
       "properties": {
-        "first_name": {
+        "given_name": {
           "type": "string",
-          "description": "Field for first_name."
+          "description": "Field for given_name."
         },
-        "last_name": {
+        "family_name": {
           "type": "string",
-          "description": "Field for last_name."
+          "description": "Field for family_name."
         }
       },
       "description": "A Author."

example/bookstore/v1/bookstore.yaml

@@ -54,10 +54,10 @@ resources:
           items:
             type: object
             properties:
-              first_name:
+              given_name:
                 type: string
                 x-aep-field-number: 1
-              last_name:
+              family_name:
                 type: string
                 x-aep-field-number: 2
     methods:

example/bookstore/v1/bookstore_openapi.json

@@ -1348,13 +1348,13 @@
             "items": {
               "type": "object",
               "properties": {
-                "first_name": {
+                "family_name": {
                   "type": "string",
-                  "x-aep-field-number": 1
+                  "x-aep-field-number": 2
                 },
-                "last_name": {
+                "given_name": {
                   "type": "string",
-                  "x-aep-field-number": 2
+                  "x-aep-field-number": 1
                 }
               }
             },

example/bookstore/v1/bookstore_openapi.yaml

@@ -5,12 +5,12 @@ components:
         author:
           items:
             properties:
-              first_name:
-                type: string
-                x-aep-field-number: 1
-              last_name:
+              family_name:
                 type: string
                 x-aep-field-number: 2
+              given_name:
+                type: string
+                x-aep-field-number: 1
             type: object
           type: array
           x-aep-field-number: 5

scripts/test-all.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -ex
+
+SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd)
+
+"${SCRIPT_DIR}"/verify-goldens.sh
+"${SCRIPT_DIR}"/test_http_api.sh
+"${SCRIPT_DIR}"/run-oas-linter.sh
+"${SCRIPT_DIR}"/run-proto-linter.sh