diff --git a/ydb/public/api/client/yc_private/vpc/address.proto b/ydb/public/api/client/yc_private/vpc/address.proto index b16551ef8e6b..cabaee88c7dd 100644 --- a/ydb/public/api/client/yc_private/vpc/address.proto +++ b/ydb/public/api/client/yc_private/vpc/address.proto @@ -5,7 +5,7 @@ package yandex.cloud.priv.vpc.v1; import "google/protobuf/timestamp.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PVA"; message Address { diff --git a/ydb/public/api/client/yc_private/vpc/address_service.proto b/ydb/public/api/client/yc_private/vpc/address_service.proto index d6cd246b2021..15cba1b7e69d 100644 --- a/ydb/public/api/client/yc_private/vpc/address_service.proto +++ b/ydb/public/api/client/yc_private/vpc/address_service.proto @@ -7,9 +7,9 @@ import "ydb/public/api/client/yc_common/api/operation.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; import "ydb/public/api/client/yc_private/reference/reference.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/address.proto"; +import "ydb/public/api/client/yc_private/vpc/address.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PVAS"; service AddressService { diff --git a/ydb/public/api/client/yc_private/vpc/admin/admin_service.proto b/ydb/public/api/client/yc_private/vpc/admin/admin_service.proto index abbf3c573035..9c376d66700a 100644 --- a/ydb/public/api/client/yc_private/vpc/admin/admin_service.proto +++ b/ydb/public/api/client/yc_private/vpc/admin/admin_service.proto @@ -3,12 +3,12 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.admin; import "ydb/public/api/client/yc_common/api/operation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/address_service.proto"; +import "ydb/public/api/client/yc_private/vpc/address_service.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/address.proto"; +import "ydb/public/api/client/yc_private/vpc/address.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/admin;admin"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/admin;admin"; option java_outer_classname = "PVADMS"; service AdminService { diff --git a/ydb/public/api/client/yc_private/vpc/admin/ya.make b/ydb/public/api/client/yc_private/vpc/admin/ya.make index 2fcb5323133a..79ce148d9d27 100644 --- a/ydb/public/api/client/yc_private/vpc/admin/ya.make +++ b/ydb/public/api/client/yc_private/vpc/admin/ya.make @@ -20,7 +20,7 @@ PEERDIR( ydb/public/api/client/yc_common/api ydb/public/api/client/yc_private/common ydb/public/api/client/yc_private/operation - ydb/public/api/client/yc_private/vpc/v1 + ydb/public/api/client/yc_private/vpc ) END() diff --git a/ydb/public/api/client/yc_private/vpc/gateway.proto b/ydb/public/api/client/yc_private/vpc/gateway.proto index 8e98d04c8dd2..769e40b0e3ba 100644 --- a/ydb/public/api/client/yc_private/vpc/gateway.proto +++ b/ydb/public/api/client/yc_private/vpc/gateway.proto @@ -4,7 +4,7 @@ package yandex.cloud.priv.vpc.v1; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PVG"; message Gateway { diff --git a/ydb/public/api/client/yc_private/vpc/gateway_service.proto b/ydb/public/api/client/yc_private/vpc/gateway_service.proto index b4a9e13a8987..52f34b052343 100644 --- a/ydb/public/api/client/yc_private/vpc/gateway_service.proto +++ b/ydb/public/api/client/yc_private/vpc/gateway_service.proto @@ -6,9 +6,9 @@ import "google/protobuf/field_mask.proto"; import "ydb/public/api/client/yc_common/api/operation.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/gateway.proto"; +import "ydb/public/api/client/yc_private/vpc/gateway.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PVGS"; service GatewayService { diff --git a/ydb/public/api/client/yc_private/vpc/inner/accounting.proto b/ydb/public/api/client/yc_private/vpc/inner/accounting.proto index f5dad5ae3897..fe9cd0e062e6 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/accounting.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/accounting.proto @@ -2,11 +2,11 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.inner; -import "ydb/public/api/client/yc_private/loadbalancer/v1/network_load_balancer.proto"; -import "ydb/public/api/client/yc_private/loadbalancer/v1/target_group.proto"; -import "ydb/public/api/client/yc_private/loadbalancer/v1/health_check.proto"; +import "ydb/public/api/client/yc_private/loadbalancer/network_load_balancer.proto"; +import "ydb/public/api/client/yc_private/loadbalancer/target_group.proto"; +import "ydb/public/api/client/yc_private/loadbalancer/health_check.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PAC"; message Resource { diff --git a/ydb/public/api/client/yc_private/vpc/inner/accounting_service.proto b/ydb/public/api/client/yc_private/vpc/inner/accounting_service.proto index 4d896b88372b..3cbad1bbcb2d 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/accounting_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/accounting_service.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.inner; -import "ydb/public/api/client/yc_private/vpc/v1/inner/accounting.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/accounting.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PACS"; service AccountingService { diff --git a/ydb/public/api/client/yc_private/vpc/inner/address.proto b/ydb/public/api/client/yc_private/vpc/inner/address.proto index f32069f40b39..49e5d612773c 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/address.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/address.proto @@ -4,7 +4,7 @@ package yandex.cloud.priv.vpc.v1.inner; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PA"; //TODO: add users, ptr, fqdns diff --git a/ydb/public/api/client/yc_private/vpc/inner/address_service.proto b/ydb/public/api/client/yc_private/vpc/inner/address_service.proto index f51f796a9c50..fd97f6e8edbd 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/address_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/address_service.proto @@ -5,12 +5,12 @@ package yandex.cloud.priv.vpc.v1.inner; import "google/api/annotations.proto"; import "google/protobuf/field_mask.proto"; import "ydb/public/api/client/yc_common/api/operation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/address.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/address.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; import "ydb/public/api/client/yc_common/api/tools/options.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PAS"; // Only for static IPs. Ephemeral IP addresses are not managed by this service @@ -19,15 +19,15 @@ service AddressService { option (cloud.api.tools.service).skip_generate = true; //todo: not implemented yet! rpc Get (GetAddressRequest) returns (Address) { - option (google.api.http) = { get: "/compute/v1/addresses/{address_id}" }; + option (google.api.http) = { get: "/compute/addresses/{address_id}" }; } rpc List (ListAddressesRequest) returns (ListAddressesResponse) { - option (google.api.http) = { get: "/compute/v1/addresses" }; + option (google.api.http) = { get: "/compute/addresses" }; } rpc Create (CreateAddressRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/addresses" body: "*" }; + option (google.api.http) = { post: "/compute/addresses" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "CreateAddressMetadata" response: "Address" @@ -35,7 +35,7 @@ service AddressService { } rpc Update (UpdateAddressRequest) returns (operation.Operation) { - option (google.api.http) = { patch: "/compute/v1/addresses/{address_id}" body: "*" }; + option (google.api.http) = { patch: "/compute/addresses/{address_id}" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "UpdateAddressMetadata" response: "Address" @@ -43,7 +43,7 @@ service AddressService { } rpc Delete (DeleteAddressRequest) returns (operation.Operation) { - option (google.api.http) = { delete: "/compute/v1/addresses/{address_id}" }; + option (google.api.http) = { delete: "/compute/addresses/{address_id}" }; option (yandex.cloud.api.operation) = { metadata: "DeleteAddressMetadata" response: "google.protobuf.Empty" @@ -51,7 +51,7 @@ service AddressService { } rpc ListOperations (ListAddressOperationsRequest) returns (ListAddressOperationsResponse) { - option (google.api.http) = { get: "/compute/v1/addresses/{address_id}/operations" }; + option (google.api.http) = { get: "/compute/addresses/{address_id}/operations" }; } } diff --git a/ydb/public/api/client/yc_private/vpc/inner/backoffice_service.proto b/ydb/public/api/client/yc_private/vpc/inner/backoffice_service.proto index 2568ff77b220..1d9184844bc0 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/backoffice_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/backoffice_service.proto @@ -4,7 +4,7 @@ package yandex.cloud.priv.vpc.v1.inner; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PBO"; service BackofficeService { diff --git a/ydb/public/api/client/yc_private/vpc/inner/cms_service.proto b/ydb/public/api/client/yc_private/vpc/inner/cms_service.proto index 0e678b8a408c..05a766cd09be 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/cms_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/cms_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.inner; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; service CMSService { rpc Acquire(AcquireRequest) returns (AcquireResponse); diff --git a/ydb/public/api/client/yc_private/vpc/inner/common.proto b/ydb/public/api/client/yc_private/vpc/inner/common.proto index fa1924e666ab..57677f527aee 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/common.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/common.proto @@ -4,7 +4,7 @@ package yandex.cloud.priv.vpc.v1.inner; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "VpcInnerCommon"; // public-api events.common diff --git a/ydb/public/api/client/yc_private/vpc/inner/compute_internal_service.proto b/ydb/public/api/client/yc_private/vpc/inner/compute_internal_service.proto index eea3f9b7da25..4fc0fc7785c5 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/compute_internal_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/compute_internal_service.proto @@ -6,7 +6,7 @@ import "ydb/public/api/client/yc_common/api/operation.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; // Private VPC inner compute internal service. option java_outer_classname = "PVICIS"; diff --git a/ydb/public/api/client/yc_private/vpc/inner/console_vpc_service.proto b/ydb/public/api/client/yc_private/vpc/inner/console_vpc_service.proto index e9e58639c6ba..f0e3728bcbf7 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/console_vpc_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/console_vpc_service.proto @@ -4,14 +4,14 @@ package yandex.cloud.priv.vpc.v1.inner; import "ydb/public/api/client/yc_private/operation/operation.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/network.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/subnet.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/route_table.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/security_group.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/address.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/gateway.proto"; - -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +import "ydb/public/api/client/yc_private/vpc/network.proto"; +import "ydb/public/api/client/yc_private/vpc/subnet.proto"; +import "ydb/public/api/client/yc_private/vpc/route_table.proto"; +import "ydb/public/api/client/yc_private/vpc/security_group.proto"; +import "ydb/public/api/client/yc_private/vpc/address.proto"; +import "ydb/public/api/client/yc_private/vpc/gateway.proto"; + +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PVCS"; diff --git a/ydb/public/api/client/yc_private/vpc/inner/discovery.proto b/ydb/public/api/client/yc_private/vpc/inner/discovery.proto index e0667c67eb98..34ab020d9800 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/discovery.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/discovery.proto @@ -5,7 +5,7 @@ package yandex.cloud.priv.vpc.v1.inner; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PVID"; message Host { diff --git a/ydb/public/api/client/yc_private/vpc/inner/discovery_service.proto b/ydb/public/api/client/yc_private/vpc/inner/discovery_service.proto index bc6b957fbfb9..4647246ce1f8 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/discovery_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/discovery_service.proto @@ -5,9 +5,9 @@ package yandex.cloud.priv.vpc.v1.inner; import "google/protobuf/duration.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/discovery.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/discovery.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PVIDS"; service DiscoveryService { diff --git a/ydb/public/api/client/yc_private/vpc/inner/feature_flag.proto b/ydb/public/api/client/yc_private/vpc/inner/feature_flag.proto index df478377dca9..0c0780c0335c 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/feature_flag.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/feature_flag.proto @@ -4,7 +4,7 @@ package yandex.cloud.priv.vpc.v1.inner; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PFF"; message FeatureFlag { diff --git a/ydb/public/api/client/yc_private/vpc/inner/feature_flag_service.proto b/ydb/public/api/client/yc_private/vpc/inner/feature_flag_service.proto index a4e451558da4..8362795fda3f 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/feature_flag_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/feature_flag_service.proto @@ -5,12 +5,12 @@ package yandex.cloud.priv.vpc.v1.inner; import "google/protobuf/field_mask.proto"; import "google/protobuf/duration.proto"; import "ydb/public/api/client/yc_common/api/operation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/feature_flag.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/feature_flag.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; -import "ydb/public/api/client/yc_private/servicecontrol/v1/resource.proto"; +import "ydb/public/api/client/yc_private/servicecontrol/resource.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PFFS"; service FeatureFlagService { diff --git a/ydb/public/api/client/yc_private/vpc/inner/fip_bucket.proto b/ydb/public/api/client/yc_private/vpc/inner/fip_bucket.proto index 76d46f86fc92..94dc3f12b140 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/fip_bucket.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/fip_bucket.proto @@ -4,7 +4,7 @@ package yandex.cloud.priv.vpc.v1.inner; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PFB"; message FipBucket { diff --git a/ydb/public/api/client/yc_private/vpc/inner/fip_bucket_service.proto b/ydb/public/api/client/yc_private/vpc/inner/fip_bucket_service.proto index 192ff9c5d035..c03e5307b507 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/fip_bucket_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/fip_bucket_service.proto @@ -5,25 +5,25 @@ package yandex.cloud.priv.vpc.v1.inner; import "google/api/annotations.proto"; import "google/protobuf/field_mask.proto"; import "ydb/public/api/client/yc_common/api/operation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/fip_bucket.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/fip_bucket.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PFBS"; service FipBucketService { rpc Get (GetFipBucketRequest) returns (FipBucket) { - option (google.api.http) = { get: "/compute/v1/fipBuckets/{bucket_id}" }; + option (google.api.http) = { get: "/compute/fipBuckets/{bucket_id}" }; } rpc List (ListFipBucketsRequest) returns (ListFipBucketsResponse) { - option (google.api.http) = { get: "/compute/v1/fipBuckets" }; + option (google.api.http) = { get: "/compute/fipBuckets" }; } rpc Create (CreateFipBucketRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/fipBuckets" body: "*" }; + option (google.api.http) = { post: "/compute/fipBuckets" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "CreateFipBucketMetadata" response: "FipBucket" @@ -31,7 +31,7 @@ service FipBucketService { } rpc Update (UpdateFipBucketRequest) returns (operation.Operation) { - option (google.api.http) = { patch: "/compute/v1/fipBuckets/{bucket_id}" body: "*" }; + option (google.api.http) = { patch: "/compute/fipBuckets/{bucket_id}" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "UpdateFipBucketMetadata" response: "FipBucket" @@ -39,7 +39,7 @@ service FipBucketService { } rpc Resize (ResizeFipBucketRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/fipBuckets/{bucket_id}" body: "*" }; + option (google.api.http) = { post: "/compute/fipBuckets/{bucket_id}" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "ResizeFipBucketMetadata" response: "FipBucket" @@ -47,7 +47,7 @@ service FipBucketService { } rpc Delete (DeleteFipBucketRequest) returns (operation.Operation) { - option (google.api.http) = { delete: "/compute/v1/fipBuckets/{bucket_id}" }; + option (google.api.http) = { delete: "/compute/fipBuckets/{bucket_id}" }; option (yandex.cloud.api.operation) = { metadata: "DeleteFipBucketMetadata" response: "google.protobuf.Empty" @@ -55,7 +55,7 @@ service FipBucketService { } rpc AddCidrs (AddFipBucketCidrsRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/fipBuckets/{bucket_id}/add-cidrs" body: "*" }; + option (google.api.http) = { post: "/compute/fipBuckets/{bucket_id}/add-cidrs" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "AddFipBucketCidrsMetadata" response: "FipBucket" @@ -63,7 +63,7 @@ service FipBucketService { } rpc RemoveCidrs (RemoveFipBucketCidrsRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/fipBuckets/{bucket_id}/delete-cidrs" body: "*" }; + option (google.api.http) = { post: "/compute/fipBuckets/{bucket_id}/delete-cidrs" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "RemoveFipBucketCidrsMetadata" response: "FipBucket" diff --git a/ydb/public/api/client/yc_private/vpc/inner/internal_operation_service.proto b/ydb/public/api/client/yc_private/vpc/inner/internal_operation_service.proto index b4b760a47fc5..ad3b54ef9542 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/internal_operation_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/internal_operation_service.proto @@ -5,7 +5,7 @@ package yandex.cloud.priv.vpc.v1.inner; import "ydb/public/api/client/yc_private/operation/operation.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; // Private VPC inner internal operation service. option java_outer_classname = "PVIIOS"; diff --git a/ydb/public/api/client/yc_private/vpc/inner/network_dns_service.proto b/ydb/public/api/client/yc_private/vpc/inner/network_dns_service.proto index 21f79005aa77..aff31b484306 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/network_dns_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/network_dns_service.proto @@ -7,17 +7,17 @@ import "ydb/public/api/client/yc_common/api/operation.proto"; import "ydb/public/api/client/yc_common/api/tools/options.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PNDS"; service NetworkDnsService { rpc ListDnsRecords (NetworkListDnsRecordsRequest) returns (NetworkListDnsRecordsResponse) { - option (google.api.http) = { get: "/compute/v1/networks/{network_id}/dnsRecords" }; + option (google.api.http) = { get: "/compute/networks/{network_id}/dnsRecords" }; } rpc SetDnsRecord (NetworkSetDnsRecordRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/networks/{network_id}/setDnsRecord" body: "*" }; + option (google.api.http) = { post: "/compute/networks/{network_id}/setDnsRecord" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "NetworkSetDnsRecordMetadata" response: "google.protobuf.Empty" @@ -25,7 +25,7 @@ service NetworkDnsService { } rpc DeleteDnsRecord (NetworkDeleteDnsRecordRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/networks/{network_id}/deleteDnsRecord" body: "*" }; + option (google.api.http) = { post: "/compute/networks/{network_id}/deleteDnsRecord" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "NetworkDeleteDnsRecordMetadata" response: "google.protobuf.Empty" diff --git a/ydb/public/api/client/yc_private/vpc/inner/network_interface_attachment_service.proto b/ydb/public/api/client/yc_private/vpc/inner/network_interface_attachment_service.proto index 184355613bdf..bfd05956c039 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/network_interface_attachment_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/network_interface_attachment_service.proto @@ -5,15 +5,15 @@ package yandex.cloud.priv.vpc.v1.inner; import "google/protobuf/empty.proto"; import "ydb/public/api/client/yc_common/api/operation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/common.proto"; -import "ydb/public/api/client/yc_private/billing/v1/light_metric.proto"; -import "ydb/public/api/client/yc_private/compute/v1/instance.proto"; -import "ydb/public/api/client/yc_private/compute/v1/instance_service.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/common.proto"; +import "ydb/public/api/client/yc_private/billing/light_metric.proto"; +import "ydb/public/api/client/yc_private/compute/instance.proto"; +import "ydb/public/api/client/yc_private/compute/instance_service.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; import "ydb/public/api/client/yc_private/quota/quota.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; // Private VPC inner network interface attachments service. option java_outer_classname = "PVINIAS"; diff --git a/ydb/public/api/client/yc_private/vpc/inner/network_service.proto b/ydb/public/api/client/yc_private/vpc/inner/network_service.proto index f6dc7204c480..d04f2c401ce4 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/network_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/network_service.proto @@ -2,10 +2,10 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.inner; -import "ydb/public/api/client/yc_private/vpc/v1/network.proto"; +import "ydb/public/api/client/yc_private/vpc/network.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "IPES"; service NetworkService { diff --git a/ydb/public/api/client/yc_private/vpc/inner/node_registry.proto b/ydb/public/api/client/yc_private/vpc/inner/node_registry.proto index dbb183b22a16..f1965101319c 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/node_registry.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/node_registry.proto @@ -4,7 +4,7 @@ package yandex.cloud.priv.vpc.v1.inner; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PVNR"; enum DataplaneType { diff --git a/ydb/public/api/client/yc_private/vpc/inner/node_registry_service.proto b/ydb/public/api/client/yc_private/vpc/inner/node_registry_service.proto index 15f2d84ffb80..50d9e3d0d47f 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/node_registry_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/node_registry_service.proto @@ -3,9 +3,9 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.inner; import "ydb/public/api/client/yc_private/common/validation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/node_registry.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/node_registry.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PVNRS"; service NodeRegistryService { diff --git a/ydb/public/api/client/yc_private/vpc/inner/port_state.proto b/ydb/public/api/client/yc_private/vpc/inner/port_state.proto index 8b3c7114e490..1fae03e73a72 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/port_state.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/port_state.proto @@ -3,10 +3,10 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.inner; import "ydb/public/api/client/yc_private/common/validation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/fip_bucket.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/node_registry.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/fip_bucket.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/node_registry.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PVPS"; message PortState { diff --git a/ydb/public/api/client/yc_private/vpc/inner/port_state_service.proto b/ydb/public/api/client/yc_private/vpc/inner/port_state_service.proto index 0ec3d0aad3ed..d0aef9003f2d 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/port_state_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/port_state_service.proto @@ -3,9 +3,9 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.inner; import "ydb/public/api/client/yc_private/common/validation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/port_state.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/port_state.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PVPSS"; service PortStateService { diff --git a/ydb/public/api/client/yc_private/vpc/inner/semaphore.proto b/ydb/public/api/client/yc_private/vpc/inner/semaphore.proto index 5353978c8c0f..a961a53436c6 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/semaphore.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/semaphore.proto @@ -4,7 +4,7 @@ import "google/protobuf/timestamp.proto"; package yandex.cloud.priv.vpc.v1.inner; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PVIS"; message Semaphore { diff --git a/ydb/public/api/client/yc_private/vpc/inner/semaphore_service.proto b/ydb/public/api/client/yc_private/vpc/inner/semaphore_service.proto index 7127af916bca..578dc9f589e7 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/semaphore_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/semaphore_service.proto @@ -3,10 +3,10 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.inner; import "ydb/public/api/client/yc_private/common/validation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/discovery.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/semaphore.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/discovery.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/semaphore.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PVISS"; service SemaphoreService { diff --git a/ydb/public/api/client/yc_private/vpc/inner/statistic_service.proto b/ydb/public/api/client/yc_private/vpc/inner/statistic_service.proto index 67aa6a792ca0..c52fbf02f761 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/statistic_service.proto +++ b/ydb/public/api/client/yc_private/vpc/inner/statistic_service.proto @@ -4,7 +4,7 @@ package yandex.cloud.priv.vpc.v1.inner; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/inner;vpcinnerpb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/inner;vpcinnerpb"; option java_outer_classname = "PVSS"; service StatisticService { diff --git a/ydb/public/api/client/yc_private/vpc/inner/ya.make b/ydb/public/api/client/yc_private/vpc/inner/ya.make index fe413bd10f48..cb76bf8bee16 100644 --- a/ydb/public/api/client/yc_private/vpc/inner/ya.make +++ b/ydb/public/api/client/yc_private/vpc/inner/ya.make @@ -45,13 +45,13 @@ PEERDIR( ydb/public/api/client/yc_common/api ydb/public/api/client/yc_common/api/tools ydb/public/api/client/yc_private/common - ydb/public/api/client/yc_private/billing/v1 - ydb/public/api/client/yc_private/compute/v1 - ydb/public/api/client/yc_private/loadbalancer/v1 + ydb/public/api/client/yc_private/billing + ydb/public/api/client/yc_private/compute + ydb/public/api/client/yc_private/loadbalancer ydb/public/api/client/yc_private/operation ydb/public/api/client/yc_private/quota - ydb/public/api/client/yc_private/servicecontrol/v1 - ydb/public/api/client/yc_private/vpc/v1 + ydb/public/api/client/yc_private/servicecontrol + ydb/public/api/client/yc_private/vpc ) END() diff --git a/ydb/public/api/client/yc_private/vpc/network.proto b/ydb/public/api/client/yc_private/vpc/network.proto index 5be9d988052f..acb2e14cc51a 100644 --- a/ydb/public/api/client/yc_private/vpc/network.proto +++ b/ydb/public/api/client/yc_private/vpc/network.proto @@ -4,7 +4,7 @@ package yandex.cloud.priv.vpc.v1; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PE"; message Network { diff --git a/ydb/public/api/client/yc_private/vpc/network_service.proto b/ydb/public/api/client/yc_private/vpc/network_service.proto index 6b8bb0ec2a09..c882ad12d966 100644 --- a/ydb/public/api/client/yc_private/vpc/network_service.proto +++ b/ydb/public/api/client/yc_private/vpc/network_service.proto @@ -7,28 +7,28 @@ import "google/protobuf/field_mask.proto"; import "ydb/public/api/client/yc_common/api/operation.proto"; import "ydb/public/api/client/yc_common/api/tools/options.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/network.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/subnet.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/security_group.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/route_table.proto"; +import "ydb/public/api/client/yc_private/vpc/network.proto"; +import "ydb/public/api/client/yc_private/vpc/subnet.proto"; +import "ydb/public/api/client/yc_private/vpc/security_group.proto"; +import "ydb/public/api/client/yc_private/vpc/route_table.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; import "ydb/public/api/client/yc_private/reference/reference.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PES"; service NetworkService { rpc Get (GetNetworkRequest) returns (Network) { - option (google.api.http) = { get: "/compute/v1/networks/{network_id}" }; + option (google.api.http) = { get: "/compute/networks/{network_id}" }; } rpc List (ListNetworksRequest) returns (ListNetworksResponse) { - option (google.api.http) = { get: "/compute/v1/networks" }; + option (google.api.http) = { get: "/compute/networks" }; } rpc Create (CreateNetworkRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/networks" body: "*" }; + option (google.api.http) = { post: "/compute/networks" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "CreateNetworkMetadata" response: "Network" @@ -36,7 +36,7 @@ service NetworkService { } rpc Update (UpdateNetworkRequest) returns (operation.Operation) { - option (google.api.http) = { patch: "/compute/v1/networks/{network_id}" body: "*" }; + option (google.api.http) = { patch: "/compute/networks/{network_id}" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "UpdateNetworkMetadata" response: "Network" @@ -44,7 +44,7 @@ service NetworkService { } rpc Delete (DeleteNetworkRequest) returns (operation.Operation) { - option (google.api.http) = { delete: "/compute/v1/networks/{network_id}" }; + option (google.api.http) = { delete: "/compute/networks/{network_id}" }; option (yandex.cloud.api.operation) = { metadata: "DeleteNetworkMetadata" response: "google.protobuf.Empty" @@ -52,23 +52,23 @@ service NetworkService { } rpc ListSubnets (ListNetworkSubnetsRequest) returns (ListNetworkSubnetsResponse) { - option (google.api.http) = { get: "/compute/v1/networks/{network_id}/subnets" }; + option (google.api.http) = { get: "/compute/networks/{network_id}/subnets" }; } rpc ListSecurityGroups (ListNetworkSecurityGroupsRequest) returns (ListNetworkSecurityGroupsResponse) { - option (google.api.http) = { get: "/compute/v1/networks/{network_id}/security_groups" }; + option (google.api.http) = { get: "/compute/networks/{network_id}/security_groups" }; } rpc ListRouteTables (ListNetworkRouteTablesRequest) returns (ListNetworkRouteTablesResponse) { - option (google.api.http) = { get: "/compute/v1/networks/{network_id}/route_tables" }; + option (google.api.http) = { get: "/compute/networks/{network_id}/route_tables" }; } rpc ListOperations (ListNetworkOperationsRequest) returns (ListNetworkOperationsResponse) { - option (google.api.http) = { get: "/compute/v1/networks/{network_id}/operations" }; + option (google.api.http) = { get: "/compute/networks/{network_id}/operations" }; } rpc CreateDefaultNetwork (CreateDefaultNetworkRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/defaultNetwork" body: "*" }; + option (google.api.http) = { post: "/compute/defaultNetwork" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "CreateDefaultNetworkMetadata" response: "google.protobuf.Empty" @@ -77,7 +77,7 @@ service NetworkService { } rpc CreateNetworkSystemRouteTable (CreateNetworkSystemRouteTableRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/networks/{network_id}/systemRouteTable" }; + option (google.api.http) = { post: "/compute/networks/{network_id}/systemRouteTable" }; option (yandex.cloud.api.operation) = { metadata: "CreateNetworkSystemRouteTableMetadata" response: "google.protobuf.Empty" @@ -86,7 +86,7 @@ service NetworkService { } rpc Move (MoveNetworkRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/networks/{network_id}/move" body: "*" }; + option (google.api.http) = { post: "/compute/networks/{network_id}/move" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "MoveNetworkMetadata" response: "Network" @@ -94,7 +94,7 @@ service NetworkService { } rpc CreateDefaultSecurityGroup (CreateDefaultSecurityGroupRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/networks/{network_id}/defaultSecurityGroup" body: "*" }; + option (google.api.http) = { post: "/compute/networks/{network_id}/defaultSecurityGroup" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "CreateDefaultSecurityGroupMetadata" response: "google.protobuf.Empty" @@ -102,7 +102,7 @@ service NetworkService { } rpc DeleteDefaultSecurityGroup (DeleteDefaultSecurityGroupRequest) returns (operation.Operation) { - option (google.api.http) = { delete: "/compute/v1/networks/{network_id}/defaultSecurityGroup" }; + option (google.api.http) = { delete: "/compute/networks/{network_id}/defaultSecurityGroup" }; option (yandex.cloud.api.operation) = { metadata: "DeleteDefaultSecurityGroupMetadata" response: "google.protobuf.Empty" diff --git a/ydb/public/api/client/yc_private/vpc/node/port_controller_service.proto b/ydb/public/api/client/yc_private/vpc/node/port_controller_service.proto index 6ae2ef4e8ae9..262c66d2aa34 100644 --- a/ydb/public/api/client/yc_private/vpc/node/port_controller_service.proto +++ b/ydb/public/api/client/yc_private/vpc/node/port_controller_service.proto @@ -4,10 +4,10 @@ package yandex.cloud.priv.vpc.v1.node; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/node;vpcnodepb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/node;vpcnodepb"; option java_outer_classname = "PVNPCS"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/port_state.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/port_state.proto"; // PortControllerService implements interface to allow manipulate with port states. service PortControllerService { diff --git a/ydb/public/api/client/yc_private/vpc/node/port_device.proto b/ydb/public/api/client/yc_private/vpc/node/port_device.proto index 7ff0b11e5492..2205e2385fc0 100644 --- a/ydb/public/api/client/yc_private/vpc/node/port_device.proto +++ b/ydb/public/api/client/yc_private/vpc/node/port_device.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.node; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/node;vpcnodepb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/node;vpcnodepb"; option java_outer_classname = "PVNPD"; enum PortDeviceRole { diff --git a/ydb/public/api/client/yc_private/vpc/node/port_device_service.proto b/ydb/public/api/client/yc_private/vpc/node/port_device_service.proto index af2c53f31033..b2750e89863d 100644 --- a/ydb/public/api/client/yc_private/vpc/node/port_device_service.proto +++ b/ydb/public/api/client/yc_private/vpc/node/port_device_service.proto @@ -4,10 +4,10 @@ package yandex.cloud.priv.vpc.v1.node; import "ydb/public/api/client/yc_private/common/validation.proto"; import "ydb/public/api/client/yc_private/common/sensitive.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/node/port_device.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/port_state.proto"; +import "ydb/public/api/client/yc_private/vpc/node/port_device.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/port_state.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/node;vpcnodepb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/node;vpcnodepb"; option java_outer_classname = "PVNPDS"; // PortDeviceService implements interface to manipulate with port devices. diff --git a/ydb/public/api/client/yc_private/vpc/node/vrouter_slot.proto b/ydb/public/api/client/yc_private/vpc/node/vrouter_slot.proto index 3be79bee296c..95a494dbfcd6 100644 --- a/ydb/public/api/client/yc_private/vpc/node/vrouter_slot.proto +++ b/ydb/public/api/client/yc_private/vpc/node/vrouter_slot.proto @@ -2,10 +2,10 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.node; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/node;vpcnodepb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/node;vpcnodepb"; option java_outer_classname = "PVNVS"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/node_registry.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/node_registry.proto"; enum SlotReleaseStatus { SLOT_RELEASE_STATUS_UNSPECIFIED = 0; diff --git a/ydb/public/api/client/yc_private/vpc/node/vrouter_slot_service.proto b/ydb/public/api/client/yc_private/vpc/node/vrouter_slot_service.proto index 846888b96046..980d203f7fc1 100644 --- a/ydb/public/api/client/yc_private/vpc/node/vrouter_slot_service.proto +++ b/ydb/public/api/client/yc_private/vpc/node/vrouter_slot_service.proto @@ -3,10 +3,10 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.node; import "ydb/public/api/client/yc_private/common/validation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/inner/node_registry.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/node/vrouter_slot.proto"; +import "ydb/public/api/client/yc_private/vpc/inner/node_registry.proto"; +import "ydb/public/api/client/yc_private/vpc/node/vrouter_slot.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/node;vpcnodepb"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/node;vpcnodepb"; option java_outer_classname = "PVNVSS"; // VRouterSlotService just implements interface to allow the bootstrapper manipulate with slots, diff --git a/ydb/public/api/client/yc_private/vpc/node/ya.make b/ydb/public/api/client/yc_private/vpc/node/ya.make index 553bb40dfde2..c2c3e81c816f 100644 --- a/ydb/public/api/client/yc_private/vpc/node/ya.make +++ b/ydb/public/api/client/yc_private/vpc/node/ya.make @@ -22,7 +22,7 @@ USE_COMMON_GOOGLE_APIS( PEERDIR( ydb/public/api/client/yc_private/common - ydb/public/api/client/yc_private/vpc/v1/inner + ydb/public/api/client/yc_private/vpc/inner ) END() diff --git a/ydb/public/api/client/yc_private/vpc/operation_service.proto b/ydb/public/api/client/yc_private/vpc/operation_service.proto index cacd1de9ef92..b83615641746 100644 --- a/ydb/public/api/client/yc_private/vpc/operation_service.proto +++ b/ydb/public/api/client/yc_private/vpc/operation_service.proto @@ -5,12 +5,12 @@ package yandex.cloud.priv.vpc.v1; import "google/api/annotations.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "POS"; service OperationService { rpc Get (GetOperationRequest) returns (operation.Operation) { - option (google.api.http) = {get: "/compute/v1/operations/{operation_id}"}; + option (google.api.http) = {get: "/compute/operations/{operation_id}"}; } } diff --git a/ydb/public/api/client/yc_private/vpc/quota_service.proto b/ydb/public/api/client/yc_private/vpc/quota_service.proto index abf8476988a4..f8f3aac47625 100644 --- a/ydb/public/api/client/yc_private/vpc/quota_service.proto +++ b/ydb/public/api/client/yc_private/vpc/quota_service.proto @@ -5,7 +5,7 @@ package yandex.cloud.priv.vpc.v1; import "google/protobuf/empty.proto"; import "ydb/public/api/client/yc_private/quota/quota.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PQS"; service QuotaService { diff --git a/ydb/public/api/client/yc_private/vpc/route_table.proto b/ydb/public/api/client/yc_private/vpc/route_table.proto index 32cfa79ff15f..51c6b667eedb 100644 --- a/ydb/public/api/client/yc_private/vpc/route_table.proto +++ b/ydb/public/api/client/yc_private/vpc/route_table.proto @@ -4,7 +4,7 @@ package yandex.cloud.priv.vpc.v1; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PSRS"; message RouteTable { diff --git a/ydb/public/api/client/yc_private/vpc/route_table_service.proto b/ydb/public/api/client/yc_private/vpc/route_table_service.proto index 67045b3edfe9..96d7bca2af6f 100644 --- a/ydb/public/api/client/yc_private/vpc/route_table_service.proto +++ b/ydb/public/api/client/yc_private/vpc/route_table_service.proto @@ -7,24 +7,24 @@ import "google/protobuf/field_mask.proto"; import "ydb/public/api/client/yc_common/api/operation.proto"; import "ydb/public/api/client/yc_common/api/tools/options.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/route_table.proto"; +import "ydb/public/api/client/yc_private/vpc/route_table.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PSRSS"; service RouteTableService { rpc Get (GetRouteTableRequest) returns (RouteTable) { - option (google.api.http) = { get: "/compute/v1/routeTables/{route_table_id}" }; + option (google.api.http) = { get: "/compute/routeTables/{route_table_id}" }; } rpc List (ListRouteTablesRequest) returns (ListRouteTablesResponse) { - option (google.api.http) = { get: "/compute/v1/routeTables" }; + option (google.api.http) = { get: "/compute/routeTables" }; } rpc Create (CreateRouteTableRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/routeTables" body: "*" }; + option (google.api.http) = { post: "/compute/routeTables" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "CreateRouteTableMetadata" response: "RouteTable" @@ -32,7 +32,7 @@ service RouteTableService { } rpc Update (UpdateRouteTableRequest) returns (operation.Operation) { - option (google.api.http) = { patch: "/compute/v1/routeTables/{route_table_id}" body: "*" }; + option (google.api.http) = { patch: "/compute/routeTables/{route_table_id}" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "UpdateRouteTableMetadata" response: "RouteTable" @@ -40,7 +40,7 @@ service RouteTableService { } rpc Delete (DeleteRouteTableRequest) returns (operation.Operation) { - option (google.api.http) = { delete: "/compute/v1/routeTables/{route_table_id}" }; + option (google.api.http) = { delete: "/compute/routeTables/{route_table_id}" }; option (yandex.cloud.api.operation) = { metadata: "DeleteRouteTableMetadata" response: "google.protobuf.Empty" @@ -48,7 +48,7 @@ service RouteTableService { } rpc UpdateStaticRoutes (UpdateStaticRoutesRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/routeTables/{route_table_id}/updateStaticRoutes" body: "*" }; + option (google.api.http) = { post: "/compute/routeTables/{route_table_id}/updateStaticRoutes" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "UpdateStaticRoutesMetadata" response: "RouteTable" @@ -57,11 +57,11 @@ service RouteTableService { } rpc ListOperations (ListRouteTableOperationsRequest) returns (ListRouteTableOperationsResponse) { - option (google.api.http) = { get: "/compute/v1/routeTables/{route_table_id}/operations" }; + option (google.api.http) = { get: "/compute/routeTables/{route_table_id}/operations" }; } rpc Move (MoveRouteTableRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/routeTables/{route_table_id}/move" body: "*" }; + option (google.api.http) = { post: "/compute/routeTables/{route_table_id}/move" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "MoveRouteTableMetadata" response: "RouteTable" diff --git a/ydb/public/api/client/yc_private/vpc/security_group.proto b/ydb/public/api/client/yc_private/vpc/security_group.proto index c85154c55137..e611629553a0 100644 --- a/ydb/public/api/client/yc_private/vpc/security_group.proto +++ b/ydb/public/api/client/yc_private/vpc/security_group.proto @@ -5,7 +5,7 @@ package yandex.cloud.priv.vpc.v1; import "google/protobuf/timestamp.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PSG"; message SecurityGroup { diff --git a/ydb/public/api/client/yc_private/vpc/security_group_service.proto b/ydb/public/api/client/yc_private/vpc/security_group_service.proto index 90101629bee2..f756d2cfcdcf 100644 --- a/ydb/public/api/client/yc_private/vpc/security_group_service.proto +++ b/ydb/public/api/client/yc_private/vpc/security_group_service.proto @@ -4,12 +4,12 @@ package yandex.cloud.priv.vpc.v1; import "google/protobuf/field_mask.proto"; import "ydb/public/api/client/yc_common/api/operation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/security_group.proto"; +import "ydb/public/api/client/yc_private/vpc/security_group.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; import "ydb/public/api/client/yc_private/reference/reference.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PSSG"; service SecurityGroupService { diff --git a/ydb/public/api/client/yc_private/vpc/subnet.proto b/ydb/public/api/client/yc_private/vpc/subnet.proto index 4fd915bb663e..13b3d1dac2e4 100644 --- a/ydb/public/api/client/yc_private/vpc/subnet.proto +++ b/ydb/public/api/client/yc_private/vpc/subnet.proto @@ -5,7 +5,7 @@ package yandex.cloud.priv.vpc.v1; import "google/protobuf/timestamp.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PS"; message Subnet { diff --git a/ydb/public/api/client/yc_private/vpc/subnet_service.proto b/ydb/public/api/client/yc_private/vpc/subnet_service.proto index f7514a62263f..a7c7539732f7 100644 --- a/ydb/public/api/client/yc_private/vpc/subnet_service.proto +++ b/ydb/public/api/client/yc_private/vpc/subnet_service.proto @@ -5,26 +5,26 @@ package yandex.cloud.priv.vpc.v1; import "google/api/annotations.proto"; import "google/protobuf/field_mask.proto"; import "ydb/public/api/client/yc_common/api/operation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/subnet.proto"; +import "ydb/public/api/client/yc_private/vpc/subnet.proto"; import "ydb/public/api/client/yc_private/operation/operation.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; import "ydb/public/api/client/yc_private/reference/reference.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1;vpc"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc;vpc"; option java_outer_classname = "PSS"; service SubnetService { rpc Get (GetSubnetRequest) returns (Subnet) { - option (google.api.http) = { get: "/compute/v1/subnets/{subnet_id}" }; + option (google.api.http) = { get: "/compute/subnets/{subnet_id}" }; } rpc List (ListSubnetsRequest) returns (ListSubnetsResponse) { - option (google.api.http) = { get: "/compute/v1/subnets" }; + option (google.api.http) = { get: "/compute/subnets" }; } rpc Create (CreateSubnetRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/subnets" body: "*" }; + option (google.api.http) = { post: "/compute/subnets" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "CreateSubnetMetadata" response: "Subnet" @@ -32,7 +32,7 @@ service SubnetService { } rpc Update (UpdateSubnetRequest) returns (operation.Operation) { - option (google.api.http) = {patch: "/compute/v1/subnets/{subnet_id}" body: "*"}; + option (google.api.http) = {patch: "/compute/subnets/{subnet_id}" body: "*"}; option (yandex.cloud.api.operation) = { metadata: "UpdateSubnetMetadata" response: "Subnet" @@ -40,7 +40,7 @@ service SubnetService { } rpc AddCidrBlocks (AddSubnetCidrBlocksRequest) returns (operation.Operation) { - option (google.api.http) = {post: "/compute/v1/subnets/{subnet_id}/add-cidr-blocks" body: "*"}; + option (google.api.http) = {post: "/compute/subnets/{subnet_id}/add-cidr-blocks" body: "*"}; option (yandex.cloud.api.operation) = { metadata: "UpdateSubnetMetadata" response: "Subnet" @@ -48,7 +48,7 @@ service SubnetService { } rpc RemoveCidrBlocks (RemoveSubnetCidrBlocksRequest) returns (operation.Operation) { - option (google.api.http) = {post: "/compute/v1/subnets/{subnet_id}/delete-cidr-blocks" body: "*"}; + option (google.api.http) = {post: "/compute/subnets/{subnet_id}/delete-cidr-blocks" body: "*"}; option (yandex.cloud.api.operation) = { metadata: "UpdateSubnetMetadata" response: "Subnet" @@ -63,7 +63,7 @@ service SubnetService { } rpc Delete (DeleteSubnetRequest) returns (operation.Operation) { - option (google.api.http) = {delete: "/compute/v1/subnets/{subnet_id}"}; + option (google.api.http) = {delete: "/compute/subnets/{subnet_id}"}; option (yandex.cloud.api.operation) = { metadata: "DeleteSubnetMetadata" response: "google.protobuf.Empty" @@ -71,11 +71,11 @@ service SubnetService { } rpc ListOperations (ListSubnetOperationsRequest) returns (ListSubnetOperationsResponse) { - option (google.api.http) = { get: "/compute/v1/subnets/{subnet_id}/operations" }; + option (google.api.http) = { get: "/compute/subnets/{subnet_id}/operations" }; } rpc Move (MoveSubnetRequest) returns (operation.Operation) { - option (google.api.http) = { post: "/compute/v1/subnets/{subnet_id}/move" body: "*" }; + option (google.api.http) = { post: "/compute/subnets/{subnet_id}/move" body: "*" }; option (yandex.cloud.api.operation) = { metadata: "MoveSubnetMetadata" response: "Subnet" diff --git a/ydb/public/api/client/yc_private/vpc/vrouter/flow.proto b/ydb/public/api/client/yc_private/vpc/vrouter/flow.proto index 264bfc722c45..317a0bd5afb8 100644 --- a/ydb/public/api/client/yc_private/vpc/vrouter/flow.proto +++ b/ydb/public/api/client/yc_private/vpc/vrouter/flow.proto @@ -2,10 +2,10 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.vrouter; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/vrouter;vrouter"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/vrouter;vrouter"; option java_outer_classname = "PVRF"; -import "ydb/public/api/client/yc_private/vpc/v1/vrouter/routing_instance.proto"; +import "ydb/public/api/client/yc_private/vpc/vrouter/routing_instance.proto"; message RouteWithRoutingInstance { // Short VRF name and suffix diff --git a/ydb/public/api/client/yc_private/vpc/vrouter/flow_service.proto b/ydb/public/api/client/yc_private/vpc/vrouter/flow_service.proto index 33c3389fd0e8..46116a75b5f9 100644 --- a/ydb/public/api/client/yc_private/vpc/vrouter/flow_service.proto +++ b/ydb/public/api/client/yc_private/vpc/vrouter/flow_service.proto @@ -2,11 +2,11 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.vrouter; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/vrouter;vrouter"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/vrouter;vrouter"; option java_outer_classname = "PVRFS"; import "ydb/public/api/client/yc_private/common/validation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/vrouter/flow.proto"; +import "ydb/public/api/client/yc_private/vpc/vrouter/flow.proto"; service FlowService { rpc List (ListFlowsRequest) returns (ListFlowsResponse); diff --git a/ydb/public/api/client/yc_private/vpc/vrouter/routing_instance.proto b/ydb/public/api/client/yc_private/vpc/vrouter/routing_instance.proto index d40d4b9fc729..62423a8ecb13 100644 --- a/ydb/public/api/client/yc_private/vpc/vrouter/routing_instance.proto +++ b/ydb/public/api/client/yc_private/vpc/vrouter/routing_instance.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package yandex.cloud.priv.vpc.v1.vrouter; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/vrouter;vrouter"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/vrouter;vrouter"; option java_outer_classname = "PVRRI"; message Route { diff --git a/ydb/public/api/client/yc_private/vpc/vrouter/routing_instance_service.proto b/ydb/public/api/client/yc_private/vpc/vrouter/routing_instance_service.proto index d5b972543a41..c7a51a055696 100644 --- a/ydb/public/api/client/yc_private/vpc/vrouter/routing_instance_service.proto +++ b/ydb/public/api/client/yc_private/vpc/vrouter/routing_instance_service.proto @@ -4,9 +4,9 @@ package yandex.cloud.priv.vpc.v1.vrouter; import "ydb/public/api/client/yc_common/api/tools/options.proto"; import "ydb/public/api/client/yc_private/common/validation.proto"; -import "ydb/public/api/client/yc_private/vpc/v1/vrouter/routing_instance.proto"; +import "ydb/public/api/client/yc_private/vpc/vrouter/routing_instance.proto"; -option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/v1/vrouter;vrouter"; +option go_package = "github.com/ydb-platform/ydb/ydb/public/api/client/yc_private/vpc/vrouter;vrouter"; option java_outer_classname = "PVRRIS"; service RoutingInstanceService {