Skip to content

Commit

Permalink
PMM-9060 Add connected_to_platform in settings and endpoint for conne…
Browse files Browse the repository at this point in the history
…cting (#792)

* PMM-9060 Add connected_to_portal in settings and endpoint for connecting

* change the comment on connect

* Update api/serverpb/json/serverpb.json

Co-authored-by: Alex Tymchuk <[email protected]>

* fix

* PMM-8993: Require TLS (#796)

* PMM-9169: Add primitive binary type (#797)

* PMM-9169: Add primitive binary type

* add test cases

* marshal binary value

* fix tests

* Update api/agentpb/query.go

Co-authored-by: Artem Gavrilov <[email protected]>

* review fixes

Co-authored-by: Artem Gavrilov <[email protected]>

* add new service definition; modify Makefile

* Add other files related to platform

* remove the signup; use v1 because v0 does not go through nginx

Co-authored-by: Alex Tymchuk <[email protected]>
Co-authored-by: Maksym <[email protected]>
Co-authored-by: Artem Gavrilov <[email protected]>
Co-authored-by: Jiri Ctvrtka <[email protected]>
  • Loading branch information
5 people authored Dec 3, 2021
1 parent b8eb4d5 commit 9a6e4ff
Show file tree
Hide file tree
Showing 28 changed files with 1,518 additions and 2,816 deletions.
7 changes: 4 additions & 3 deletions api/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ gen: clean ## Generate files.

./prototool all

for API in agentlocalpb serverpb inventorypb managementpb managementpb/dbaas managementpb/ia managementpb/backup managementpb/azure qanpb ; do \
for API in agentlocalpb serverpb inventorypb managementpb managementpb/dbaas managementpb/ia managementpb/backup managementpb/azure qanpb platformpb ; do \
set -x ; \
$(BIN_PATH)/swagger mixin $$API/json/header.json $$API/*.swagger.json --output=$$API/json/$$(basename $$API).json --keep-spec-order; \
$(BIN_PATH)/swagger flatten --with-flatten=expand --with-flatten=remove-unused $$API/json/$$(basename $$API).json --output=$$API/json/$$(basename $$API).json ; \
Expand Down Expand Up @@ -78,7 +78,8 @@ gen: clean ## Generate files.
managementpb/ia/json/ia.json \
managementpb/backup/json/backup.json \
managementpb/azure/json/azure.json \
qanpb/json/qanpb.json
qanpb/json/qanpb.json \
platformpb/json/platformpb.json
$(BIN_PATH)/swagger validate swagger/swagger-dev.json

$(BIN_PATH)/swagger-order --output=swagger/swagger-dev.json swagger/swagger-dev.json
Expand All @@ -101,7 +102,7 @@ clean: clean_swagger ## Remove generated files.
find . -name '*.pb.go' -print -delete
find . -name '*.pb.gw.go' -print -delete

for API in agentlocalpb serverpb inventorypb managementpb managementpb/dbaas managementpb/ia managementpb/backup qanpb ; do \
for API in agentlocalpb serverpb inventorypb managementpb managementpb/dbaas managementpb/ia managementpb/backup qanpb platformpb ; do \
rm -fr $$API/json/client $$API/json/models $$API/json/$$(basename $$API).json ; \
done
rm -f swagger/swagger.json swagger/swagger-dev.json
Expand Down
Binary file modified api/api.descriptor
Binary file not shown.
131 changes: 131 additions & 0 deletions api/platformpb/json/client/platform/connect_parameters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9a6e4ff

Please sign in to comment.