From 6c7744a4ce225fd9ab40d63b88fb319748fd0e29 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 17:40:02 +0000 Subject: [PATCH] fix: Fixing PHP, Ruby and C# package names for the CloudDMS API (#4) Committer: @jmpfar PiperOrigin-RevId: 373087373 Source-Link: https://github.com/googleapis/googleapis/commit/6c96d191b31797c48f7383940e7f8422098cf6f5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/92a9c9beab8f878d6f0a4cae9a0b9285c7d21a3e --- .../google/cloud/clouddms/v1/ClouddmsProto.java | 10 ++++++---- .../cloud/clouddms/v1/ClouddmsResourcesProto.java | 12 +++++++----- .../com/google/cloud/clouddms/v1/SqlIpConfig.java | 14 +++++++------- .../cloud/clouddms/v1/SqlIpConfigOrBuilder.java | 4 ++-- .../proto/google/cloud/clouddms/v1/clouddms.proto | 3 +++ .../cloud/clouddms/v1/clouddms_resources.proto | 5 ++++- 6 files changed, 29 insertions(+), 19 deletions(-) diff --git a/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/ClouddmsProto.java b/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/ClouddmsProto.java index d53dad43..ba258453 100644 --- a/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/ClouddmsProto.java +++ b/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/ClouddmsProto.java @@ -313,10 +313,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ionProfiles/*}\332A\004name\312A*\n\025google.protobu" + "f.Empty\022\021OperationMetadata\032P\312A\034datamigra" + "tion.googleapis.com\322A.https://www.google" - + "apis.com/auth/cloud-platformBq\n\034com.goog" - + "le.cloud.clouddms.v1B\rClouddmsProtoP\001Z@g" - + "oogle.golang.org/genproto/googleapis/clo" - + "ud/clouddms/v1;clouddmsb\006proto3" + + "apis.com/auth/cloud-platformB\305\001\n\034com.goo" + + "gle.cloud.clouddms.v1B\rClouddmsProtoP\001Z@" + + "google.golang.org/genproto/googleapis/cl" + + "oud/clouddms/v1;clouddms\252\002\030Google.Cloud." + + "CloudDms.V1\312\002\030Google\\Cloud\\CloudDms\\V1\352\002" + + "\033Google::Cloud::CloudDMS::V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/ClouddmsResourcesProto.java b/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/ClouddmsResourcesProto.java index 0dbcee14..15d628b1 100644 --- a/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/ClouddmsResourcesProto.java +++ b/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/ClouddmsResourcesProto.java @@ -274,11 +274,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\016DatabaseEngine\022\037\n\033DATABASE_ENGINE_UNSPE" + "CIFIED\020\000\022\t\n\005MYSQL\020\001\022\016\n\nPOSTGRESQL\020\002*L\n\020D" + "atabaseProvider\022!\n\035DATABASE_PROVIDER_UNS" - + "PECIFIED\020\000\022\014\n\010CLOUDSQL\020\001\022\007\n\003RDS\020\002Bz\n\034com" - + ".google.cloud.clouddms.v1B\026ClouddmsResou" - + "rcesProtoP\001Z@google.golang.org/genproto/" - + "googleapis/cloud/clouddms/v1;clouddmsb\006p" - + "roto3" + + "PECIFIED\020\000\022\014\n\010CLOUDSQL\020\001\022\007\n\003RDS\020\002B\316\001\n\034co" + + "m.google.cloud.clouddms.v1B\026ClouddmsReso" + + "urcesProtoP\001Z@google.golang.org/genproto" + + "/googleapis/cloud/clouddms/v1;clouddms\252\002" + + "\030Google.Cloud.CloudDms.V1\312\002\030Google\\Cloud" + + "\\CloudDms\\V1\352\002\033Google::Cloud::CloudDMS::" + + "V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/SqlIpConfig.java b/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/SqlIpConfig.java index 5fd04bd0..822d98db 100644 --- a/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/SqlIpConfig.java +++ b/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/SqlIpConfig.java @@ -212,7 +212,7 @@ public com.google.protobuf.BoolValueOrBuilder getEnableIpv4OrBuilder() { *
    * The resource link for the VPC network from which the Cloud SQL instance is
    * accessible for private IP. For example,
-   * `/projects/myProject/global/networks/default`. This setting can
+   * `projects/myProject/global/networks/default`. This setting can
    * be updated, but it cannot be removed after it is set.
    * 
* @@ -238,7 +238,7 @@ public java.lang.String getPrivateNetwork() { *
    * The resource link for the VPC network from which the Cloud SQL instance is
    * accessible for private IP. For example,
-   * `/projects/myProject/global/networks/default`. This setting can
+   * `projects/myProject/global/networks/default`. This setting can
    * be updated, but it cannot be removed after it is set.
    * 
* @@ -1010,7 +1010,7 @@ public com.google.protobuf.BoolValueOrBuilder getEnableIpv4OrBuilder() { *
      * The resource link for the VPC network from which the Cloud SQL instance is
      * accessible for private IP. For example,
-     * `/projects/myProject/global/networks/default`. This setting can
+     * `projects/myProject/global/networks/default`. This setting can
      * be updated, but it cannot be removed after it is set.
      * 
* @@ -1035,7 +1035,7 @@ public java.lang.String getPrivateNetwork() { *
      * The resource link for the VPC network from which the Cloud SQL instance is
      * accessible for private IP. For example,
-     * `/projects/myProject/global/networks/default`. This setting can
+     * `projects/myProject/global/networks/default`. This setting can
      * be updated, but it cannot be removed after it is set.
      * 
* @@ -1060,7 +1060,7 @@ public com.google.protobuf.ByteString getPrivateNetworkBytes() { *
      * The resource link for the VPC network from which the Cloud SQL instance is
      * accessible for private IP. For example,
-     * `/projects/myProject/global/networks/default`. This setting can
+     * `projects/myProject/global/networks/default`. This setting can
      * be updated, but it cannot be removed after it is set.
      * 
* @@ -1084,7 +1084,7 @@ public Builder setPrivateNetwork(java.lang.String value) { *
      * The resource link for the VPC network from which the Cloud SQL instance is
      * accessible for private IP. For example,
-     * `/projects/myProject/global/networks/default`. This setting can
+     * `projects/myProject/global/networks/default`. This setting can
      * be updated, but it cannot be removed after it is set.
      * 
* @@ -1104,7 +1104,7 @@ public Builder clearPrivateNetwork() { *
      * The resource link for the VPC network from which the Cloud SQL instance is
      * accessible for private IP. For example,
-     * `/projects/myProject/global/networks/default`. This setting can
+     * `projects/myProject/global/networks/default`. This setting can
      * be updated, but it cannot be removed after it is set.
      * 
* diff --git a/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/SqlIpConfigOrBuilder.java b/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/SqlIpConfigOrBuilder.java index 0999da0c..60926fe5 100644 --- a/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/SqlIpConfigOrBuilder.java +++ b/proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/SqlIpConfigOrBuilder.java @@ -64,7 +64,7 @@ public interface SqlIpConfigOrBuilder *
    * The resource link for the VPC network from which the Cloud SQL instance is
    * accessible for private IP. For example,
-   * `/projects/myProject/global/networks/default`. This setting can
+   * `projects/myProject/global/networks/default`. This setting can
    * be updated, but it cannot be removed after it is set.
    * 
* @@ -79,7 +79,7 @@ public interface SqlIpConfigOrBuilder *
    * The resource link for the VPC network from which the Cloud SQL instance is
    * accessible for private IP. For example,
-   * `/projects/myProject/global/networks/default`. This setting can
+   * `projects/myProject/global/networks/default`. This setting can
    * be updated, but it cannot be removed after it is set.
    * 
* diff --git a/proto-google-cloud-dms-v1/src/main/proto/google/cloud/clouddms/v1/clouddms.proto b/proto-google-cloud-dms-v1/src/main/proto/google/cloud/clouddms/v1/clouddms.proto index a17a4eb5..44281b62 100644 --- a/proto-google-cloud-dms-v1/src/main/proto/google/cloud/clouddms/v1/clouddms.proto +++ b/proto-google-cloud-dms-v1/src/main/proto/google/cloud/clouddms/v1/clouddms.proto @@ -25,10 +25,13 @@ import "google/longrunning/operations.proto"; import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; +option csharp_namespace = "Google.Cloud.CloudDms.V1"; option go_package = "google.golang.org/genproto/googleapis/cloud/clouddms/v1;clouddms"; option java_multiple_files = true; option java_outer_classname = "ClouddmsProto"; option java_package = "com.google.cloud.clouddms.v1"; +option php_namespace = "Google\\Cloud\\CloudDms\\V1"; +option ruby_package = "Google::Cloud::CloudDMS::V1"; // Database Migration service service DataMigrationService { diff --git a/proto-google-cloud-dms-v1/src/main/proto/google/cloud/clouddms/v1/clouddms_resources.proto b/proto-google-cloud-dms-v1/src/main/proto/google/cloud/clouddms/v1/clouddms_resources.proto index f50a5496..9095a02d 100644 --- a/proto-google-cloud-dms-v1/src/main/proto/google/cloud/clouddms/v1/clouddms_resources.proto +++ b/proto-google-cloud-dms-v1/src/main/proto/google/cloud/clouddms/v1/clouddms_resources.proto @@ -24,10 +24,13 @@ import "google/protobuf/wrappers.proto"; import "google/rpc/status.proto"; import "google/api/annotations.proto"; +option csharp_namespace = "Google.Cloud.CloudDms.V1"; option go_package = "google.golang.org/genproto/googleapis/cloud/clouddms/v1;clouddms"; option java_multiple_files = true; option java_outer_classname = "ClouddmsResourcesProto"; option java_package = "com.google.cloud.clouddms.v1"; +option php_namespace = "Google\\Cloud\\CloudDms\\V1"; +option ruby_package = "Google::Cloud::CloudDMS::V1"; // SSL configuration information. message SslConfig { @@ -173,7 +176,7 @@ message SqlIpConfig { // The resource link for the VPC network from which the Cloud SQL instance is // accessible for private IP. For example, - // `/projects/myProject/global/networks/default`. This setting can + // `projects/myProject/global/networks/default`. This setting can // be updated, but it cannot be removed after it is set. string private_network = 2;