Skip to content

Commit 00acf87

Browse files
author
Josh
committed
Fix servers overriding
1 parent 885e25a commit 00acf87

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

internal/generator/path.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ func (g *Generator) addPathsToDoc(doc *openapi3.T, services []*protogen.Service)
8282
return err
8383
}
8484

85-
doc.Servers = append(doc.Servers, server)
8685
servers = append(servers, server)
8786
}
8887
}
@@ -306,7 +305,6 @@ func (g *Generator) addOperation(p addOperationParams) error {
306305
return err
307306
}
308307

309-
p.doc.Servers = append(p.doc.Servers, server)
310308
servers = append(servers, server)
311309
}
312310
}

test/method_test.proto

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,27 @@ import "oapi/v1/method.proto";
99
option go_package = "github.com/technicallyjosh/protoc-gen-openapi/test_api";
1010

1111
option (oapi.v1.file) = {
12-
host: "swagger.io"
12+
servers {
13+
url: "swagger.io"
14+
}
1315
prefix: "/v1"
1416
};
1517

1618
service TestService {
1719
option (oapi.v1.service) = {
18-
host: "api.swagger.io"
20+
servers {
21+
url: "api.swagger.io"
22+
}
1923
x_display_name: "Test Service"
2024
x_tag_group: "Test Group"
2125
};
2226

2327
rpc TestEmptyPost(TestEmptyPostRequest) returns (TestEmptyPostResponse) {
2428
option (oapi.v1.method) = {
2529
post: "TestEmptyPost"
26-
servers: [
27-
{
28-
url: "test.swagger.io"
29-
}
30-
]
30+
servers {
31+
url: "test.swagger.io"
32+
}
3133
};
3234
};
3335
}

test/method_test_openapi.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ components:
4646

4747
servers:
4848
- url: https://swagger.io
49-
- url: https://api.swagger.io
50-
- url: https://test.swagger.io
5149

5250
tags:
5351
- name: TestService

test/service_test.proto

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ import "oapi/v1/method.proto";
99
option go_package = "github.com/technicallyjosh/protoc-gen-openapi/test_api";
1010

1111
option (oapi.v1.file) = {
12-
host: "swagger.io"
12+
servers {
13+
url: "swagger.io"
14+
}
1315
prefix: "/v1"
1416

1517
security_schemes: {
@@ -29,7 +31,9 @@ option (oapi.v1.file) = {
2931

3032
service TestService {
3133
option (oapi.v1.service) = {
32-
host: "api.swagger.io"
34+
servers {
35+
url: "api.swagger.io"
36+
}
3337
x_display_name: "Test Service"
3438
x_tag_group: "Test Group"
3539
};

test/service_test_openapi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ components:
7070

7171
servers:
7272
- url: https://swagger.io
73-
- url: https://api.swagger.io
7473

7574
tags:
7675
- name: TestService

0 commit comments

Comments
 (0)