Add server additions to resources

Author: Josh

api/oapi/v1/method.pb.go

@@ -69,4 +69,8 @@ message MethodOptions {
   // The servers to add to the method. This overrides all servers defined above
   // for the method.
   repeated Server servers = 17;
+
+  // The servers to add to the existing server list. This will combine higher
+  // level defined servers with the ones defined here.
+  repeated Server add_servers = 18;
 }

api/oapi/v1/method.proto

@@ -54,4 +54,9 @@ message ServiceOptions {
   // The servers to add to the service. These are used on all routes of the
   // service by default and overrides the file-defined ones.
   repeated Server servers = 12;
+
+  // The servers to add to the existing server list. This will combine higher
+  // level defined servers, ones defined in "servers", and the ones defined
+  // here.
+  repeated Server add_servers = 13;
 }

api/oapi/v1/service.pb.go

@@ -86,6 +86,17 @@ func (g *Generator) addPathsToDoc(doc *openapi3.T, services []*protogen.Service)
 			}
 		}
 
+		if len(serviceOptions.AddServers) > 0 {
+			for _, addServer := range serviceOptions.AddServers {
+				server, err := NewServer(addServer.Url)
+				if err != nil {
+					return err
+				}
+
+				servers = append(servers, server)
+			}
+		}
+
 		if serviceOptions.Prefix != "" {
 			// Use service defined prefix.
 			pathPrefix = serviceOptions.Prefix
@@ -309,6 +320,17 @@ func (g *Generator) addOperation(p addOperationParams) error {
 		}
 	}
 
+	if len(methodOptions.AddServers) > 0 {
+		for _, addServer := range methodOptions.AddServers {
+			server, err := NewServer(addServer.Url)
+			if err != nil {
+				return err
+			}
+
+			servers = append(servers, server)
+		}
+	}
+
 	if methodOptions.ContentType != "" {
 		// Use method defined content type.
 		contentType = methodOptions.ContentType

api/oapi/v1/service.proto

@@ -30,6 +30,9 @@ service TestService {
       servers {
         url: "test.swagger.io"
       }
+      add_servers: {
+        url: "test.added.io"
+      }
     };
   };
 }

internal/generator/path.go

@@ -25,6 +25,7 @@ paths:
           $ref: '#/components/responses/default'
       servers:
         - url: https://test.swagger.io
+        - url: https://test.added.io
       tags:
         - TestService
 

test/method_test.proto

@@ -34,6 +34,9 @@ service TestService {
     servers {
       url: "api.swagger.io"
     }
+    add_servers {
+      url: "api.added.io"
+    }
     x_display_name: "Test Service"
     x_tag_group: "Test Group"
   };

test/method_test_openapi.yaml

@@ -22,6 +22,7 @@ paths:
           $ref: '#/components/responses/default'
       servers:
         - url: https://api.swagger.io
+        - url: https://api.added.io
       tags:
         - TestService
   /v1/TestPost:
@@ -43,6 +44,7 @@ paths:
           $ref: '#/components/responses/default'
       servers:
         - url: https://api.swagger.io
+        - url: https://api.added.io
       tags:
         - TestService
       security: [ ]