Skip to content

Commit

Permalink
PMM-12913 refactor /v1/backups/locations
Browse files Browse the repository at this point in the history
  • Loading branch information
ademidoff committed Apr 8, 2024
1 parent 908b241 commit ee58c1e
Show file tree
Hide file tree
Showing 35 changed files with 3,885 additions and 3,942 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ jobs:
exit $code
else
echo
# suppress passing to reviewdog because of https://github.com/reviewdog/reviewdog/issues/1696
# Suppress passing to reviewdog because of https://github.com/reviewdog/reviewdog/issues/1696
# TODO: re-enable before merging to v3
# echo "$out" | bin/reviewdog -f=buf -reporter=github-pr-review -fail-on-error=true
fi
else
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/managed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ jobs:
run: |
# Note: launching the container with --wait fails for an unknown reason.
# A temporary workaround is to run it manually. To be reverted once the issue is resolved.
# make env-compose-up # the container workdir is /root/go/src/github.com/percona/pmm
docker compose --profile pmm up -d
sleep 100s
make env-compose-up # the container workdir is /root/go/src/github.com/percona/pmm
# docker compose --profile pmm up -d
# sleep 100s
docker logs pmm-server
- name: Restore Go build cache
Expand Down
10 changes: 5 additions & 5 deletions api/MIGRATION_TO_V3.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ POST /v1/backup/Backups/Schedule POST /v1/backups:schedule
POST /v1/backup/Backups/Start POST /v1/backups:start

**LocationsService** **LocationsService**
POST /v1/backup/Locations/Add POST /v1/backups/locations
POST /v1/backup/Locations/Change PUT /v1/backups/locations/{id} Extract the location_id from the body to {id}
POST /v1/backup/Locations/List GET /v1/backups/locations
POST /v1/backup/Locations/Remove DELETE /v1/backups/locations/{id} ?force=true
POST /v1/backup/Locations/TestConfig POST /v1/backups/locations:testConfig
POST /v1/backup/Locations/Add POST /v1/backups/locations
POST /v1/backup/Locations/Change PUT /v1/backups/locations/{location_id}
POST /v1/backup/Locations/List GET /v1/backups/locations
POST /v1/backup/Locations/Remove DELETE /v1/backups/locations/{location_id} ?force=true
POST /v1/backup/Locations/TestConfig POST /v1/backups/locations:testConfig

**RestoreHistoryService** **RestoreService**
POST /v1/backup/RestoreHistory/List GET /v1/backups/restores
Expand Down
188 changes: 93 additions & 95 deletions api/backup/v1/backup.pb.go

Large diffs are not rendered by default.

168 changes: 123 additions & 45 deletions api/backup/v1/backup.pb.gw.go

Large diffs are not rendered by default.

12 changes: 3 additions & 9 deletions api/backup/v1/backup.proto
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,7 @@ service BackupService {
}
// ListArtifactCompatibleServices lists compatible services for restoring a backup.
rpc ListArtifactCompatibleServices(ListArtifactCompatibleServicesRequest) returns (ListArtifactCompatibleServicesResponse) {
option (google.api.http) = {
get: "/v1/backups/{artifact_id}/compatible-services"
};
option (google.api.http) = {get: "/v1/backups/{artifact_id}/compatible-services"};
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
summary: "List Compatible Services"
description: "List services that are compatible with the backup artifact."
Expand All @@ -206,9 +204,7 @@ service BackupService {
}
// ListScheduledBackups returns all scheduled backups.
rpc ListScheduledBackups(ListScheduledBackupsRequest) returns (ListScheduledBackupsResponse) {
option (google.api.http) = {
get: "/v1/backups/scheduled"
};
option (google.api.http) = {get: "/v1/backups/scheduled"};
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
summary: "List Scheduled Backups"
description: "List all scheduled backups."
Expand All @@ -227,9 +223,7 @@ service BackupService {
}
// RemoveScheduledBackup removes existing scheduled backup.
rpc RemoveScheduledBackup(RemoveScheduledBackupRequest) returns (RemoveScheduledBackupResponse) {
option (google.api.http) = {
delete: "/v1/backups/{scheduled_backup_id}"
};
option (google.api.http) = {delete: "/v1/backups/{scheduled_backup_id}"};
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
summary: "Remove a Scheduled Backup"
description: "Remove a scheduled backup."
Expand Down
22 changes: 11 additions & 11 deletions api/backup/v1/json/client/backup_service/backup_service_client.go

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

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

19 changes: 19 additions & 0 deletions api/backup/v1/json/client/backup_service/get_logs_parameters.go

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

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

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

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

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

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

Loading

0 comments on commit ee58c1e

Please sign in to comment.