chore: update import paths for Go targets to match open source location (#2358)

gcf-owl-bot[bot] · web-flow · commit bbc3e8d2e577 · 2023-03-31T11:31:03.000+05:30
* chore: update import paths for Go targets to match open source location chore: update go_package in protos to match open source location chore: add explicit release levels to Go gapic targets PiperOrigin-RevId: 520705454 Source-Link: googleapis/googleapis@1cfcea4 Source-Link: https://github.com/googleapis/googleapis-gen/commit/15732ab75211b0255433d6f87415e8a3ce466826 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTU3MzJhYjc1MjExYjAyNTU0MzNkNmY4NzQxNWU4YTNjZTQ2NjgyNiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupProto.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupProto.java
@@ -194,14 +194,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\033ENCRYPTION_TYPE_UNSPECIFIED\020\000\022+\n\'USE_CO"
           + "NFIG_DEFAULT_OR_BACKUP_ENCRYPTION\020\001\022\035\n\031G"
           + "OOGLE_DEFAULT_ENCRYPTION\020\002\022\037\n\033CUSTOMER_M"
-          + "ANAGED_ENCRYPTION\020\003B\377\001\n$com.google.spann"
-          + "er.admin.database.v1B\013BackupProtoP\001ZHgoo"
-          + "gle.golang.org/genproto/googleapis/spann"
-          + "er/admin/database/v1;database\252\002&Google.C"
-          + "loud.Spanner.Admin.Database.V1\312\002&Google\\"
-          + "Cloud\\Spanner\\Admin\\Database\\V1\352\002+Google"
-          + "::Cloud::Spanner::Admin::Database::V1b\006p"
-          + "roto3"
+          + "ANAGED_ENCRYPTION\020\003B\375\001\n$com.google.spann"
+          + "er.admin.database.v1B\013BackupProtoP\001ZFclo"
+          + "ud.google.com/go/spanner/admin/database/"
+          + "apiv1/databasepb;databasepb\252\002&Google.Clo"
+          + "ud.Spanner.Admin.Database.V1\312\002&Google\\Cl"
+          + "oud\\Spanner\\Admin\\Database\\V1\352\002+Google::"
+          + "Cloud::Spanner::Admin::Database::V1b\006pro"
+          + "to3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CommonProto.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CommonProto.java
@@ -69,21 +69,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "USTOMER_MANAGED_ENCRYPTION\020\002*\\\n\017Database"
           + "Dialect\022 \n\034DATABASE_DIALECT_UNSPECIFIED\020"
           + "\000\022\027\n\023GOOGLE_STANDARD_SQL\020\001\022\016\n\nPOSTGRESQL"
-          + "\020\002B\244\004\n$com.google.spanner.admin.database"
-          + ".v1B\013CommonProtoP\001ZHgoogle.golang.org/ge"
-          + "nproto/googleapis/spanner/admin/database"
-          + "/v1;database\252\002&Google.Cloud.Spanner.Admi"
-          + "n.Database.V1\312\002&Google\\Cloud\\Spanner\\Adm"
-          + "in\\Database\\V1\352\002+Google::Cloud::Spanner:"
-          + ":Admin::Database::V1\352Ax\n!cloudkms.google"
-          + "apis.com/CryptoKey\022Sprojects/{project}/l"
-          + "ocations/{location}/keyRings/{key_ring}/"
-          + "cryptoKeys/{crypto_key}\352A\246\001\n(cloudkms.go"
-          + "ogleapis.com/CryptoKeyVersion\022zprojects/"
-          + "{project}/locations/{location}/keyRings/"
-          + "{key_ring}/cryptoKeys/{crypto_key}/crypt"
-          + "oKeyVersions/{crypto_key_version}b\006proto"
-          + "3"
+          + "\020\002B\242\004\n$com.google.spanner.admin.database"
+          + ".v1B\013CommonProtoP\001ZFcloud.google.com/go/"
+          + "spanner/admin/database/apiv1/databasepb;"
+          + "databasepb\252\002&Google.Cloud.Spanner.Admin."
+          + "Database.V1\312\002&Google\\Cloud\\Spanner\\Admin"
+          + "\\Database\\V1\352\002+Google::Cloud::Spanner::A"
+          + "dmin::Database::V1\352Ax\n!cloudkms.googleap"
+          + "is.com/CryptoKey\022Sprojects/{project}/loc"
+          + "ations/{location}/keyRings/{key_ring}/cr"
+          + "yptoKeys/{crypto_key}\352A\246\001\n(cloudkms.goog"
+          + "leapis.com/CryptoKeyVersion\022zprojects/{p"
+          + "roject}/locations/{location}/keyRings/{k"
+          + "ey_ring}/cryptoKeys/{crypto_key}/cryptoK"
+          + "eyVersions/{crypto_key_version}b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/SpannerDatabaseAdminProto.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/SpannerDatabaseAdminProto.java
@@ -351,16 +351,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "/*}/databaseRoles\332A\006parent\032x\312A\026spanner.g"
           + "oogleapis.com\322A\\https://www.googleapis.c"
           + "om/auth/cloud-platform,https://www.googl"
-          + "eapis.com/auth/spanner.adminB\332\002\n$com.goo"
+          + "eapis.com/auth/spanner.adminB\330\002\n$com.goo"
           + "gle.spanner.admin.database.v1B\031SpannerDa"
-          + "tabaseAdminProtoP\001ZHgoogle.golang.org/ge"
-          + "nproto/googleapis/spanner/admin/database"
-          + "/v1;database\252\002&Google.Cloud.Spanner.Admi"
-          + "n.Database.V1\312\002&Google\\Cloud\\Spanner\\Adm"
-          + "in\\Database\\V1\352\002+Google::Cloud::Spanner:"
-          + ":Admin::Database::V1\352AJ\n\037spanner.googlea"
-          + "pis.com/Instance\022\'projects/{project}/ins"
-          + "tances/{instance}b\006proto3"
+          + "tabaseAdminProtoP\001ZFcloud.google.com/go/"
+          + "spanner/admin/database/apiv1/databasepb;"
+          + "databasepb\252\002&Google.Cloud.Spanner.Admin."
+          + "Database.V1\312\002&Google\\Cloud\\Spanner\\Admin"
+          + "\\Database\\V1\352\002+Google::Cloud::Spanner::A"
+          + "dmin::Database::V1\352AJ\n\037spanner.googleapi"
+          + "s.com/Instance\022\'projects/{project}/insta"
+          + "nces/{instance}b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup.proto b/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup.proto
@@ -24,7 +24,7 @@ import "google/protobuf/timestamp.proto";
 import "google/spanner/admin/database/v1/common.proto";
 
 option csharp_namespace = "Google.Cloud.Spanner.Admin.Database.V1";
-option go_package = "google.golang.org/genproto/googleapis/spanner/admin/database/v1;database";
+option go_package = "cloud.google.com/go/spanner/admin/database/apiv1/databasepb;databasepb";
 option java_multiple_files = true;
 option java_outer_classname = "BackupProto";
 option java_package = "com.google.spanner.admin.database.v1";
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/common.proto b/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/common.proto
@@ -22,7 +22,7 @@ import "google/protobuf/timestamp.proto";
 import "google/rpc/status.proto";
 
 option csharp_namespace = "Google.Cloud.Spanner.Admin.Database.V1";
-option go_package = "google.golang.org/genproto/googleapis/spanner/admin/database/v1;database";
+option go_package = "cloud.google.com/go/spanner/admin/database/apiv1/databasepb;databasepb";
 option java_multiple_files = true;
 option java_outer_classname = "CommonProto";
 option java_package = "com.google.spanner.admin.database.v1";
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/spanner_database_admin.proto b/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/spanner_database_admin.proto
@@ -29,7 +29,7 @@ import "google/spanner/admin/database/v1/backup.proto";
 import "google/spanner/admin/database/v1/common.proto";
 
 option csharp_namespace = "Google.Cloud.Spanner.Admin.Database.V1";
-option go_package = "google.golang.org/genproto/googleapis/spanner/admin/database/v1;database";
+option go_package = "cloud.google.com/go/spanner/admin/database/apiv1/databasepb;databasepb";
 option java_multiple_files = true;
 option java_outer_classname = "SpannerDatabaseAdminProto";
 option java_package = "com.google.spanner.admin.database.v1";
diff --git a/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CommonProto.java b/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CommonProto.java
@@ -46,14 +46,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "perationProgress\022\030\n\020progress_percent\030\001 \001"
           + "(\005\022.\n\nstart_time\030\002 \001(\0132\032.google.protobuf"
           + ".Timestamp\022,\n\010end_time\030\003 \001(\0132\032.google.pr"
-          + "otobuf.TimestampB\377\001\n$com.google.spanner."
-          + "admin.instance.v1B\013CommonProtoP\001ZHgoogle"
-          + ".golang.org/genproto/googleapis/spanner/"
-          + "admin/instance/v1;instance\252\002&Google.Clou"
-          + "d.Spanner.Admin.Instance.V1\312\002&Google\\Clo"
-          + "ud\\Spanner\\Admin\\Instance\\V1\352\002+Google::C"
-          + "loud::Spanner::Admin::Instance::V1b\006prot"
-          + "o3"
+          + "otobuf.TimestampB\375\001\n$com.google.spanner."
+          + "admin.instance.v1B\013CommonProtoP\001ZFcloud."
+          + "google.com/go/spanner/admin/instance/api"
+          + "v1/instancepb;instancepb\252\002&Google.Cloud."
+          + "Spanner.Admin.Instance.V1\312\002&Google\\Cloud"
+          + "\\Spanner\\Admin\\Instance\\V1\352\002+Google::Clo"
+          + "ud::Spanner::Admin::Instance::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java b/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java
@@ -333,14 +333,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "missions:\001*\332A\024resource,permissions\032x\312A\026s"
           + "panner.googleapis.com\322A\\https://www.goog"
           + "leapis.com/auth/cloud-platform,https://w"
-          + "ww.googleapis.com/auth/spanner.adminB\215\002\n"
+          + "ww.googleapis.com/auth/spanner.adminB\213\002\n"
           + "$com.google.spanner.admin.instance.v1B\031S"
-          + "pannerInstanceAdminProtoP\001ZHgoogle.golan"
-          + "g.org/genproto/googleapis/spanner/admin/"
-          + "instance/v1;instance\252\002&Google.Cloud.Span"
-          + "ner.Admin.Instance.V1\312\002&Google\\Cloud\\Spa"
-          + "nner\\Admin\\Instance\\V1\352\002+Google::Cloud::"
-          + "Spanner::Admin::Instance::V1b\006proto3"
+          + "pannerInstanceAdminProtoP\001ZFcloud.google"
+          + ".com/go/spanner/admin/instance/apiv1/ins"
+          + "tancepb;instancepb\252\002&Google.Cloud.Spanne"
+          + "r.Admin.Instance.V1\312\002&Google\\Cloud\\Spann"
+          + "er\\Admin\\Instance\\V1\352\002+Google::Cloud::Sp"
+          + "anner::Admin::Instance::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-admin-instance-v1/src/main/proto/google/spanner/admin/instance/v1/common.proto b/proto-google-cloud-spanner-admin-instance-v1/src/main/proto/google/spanner/admin/instance/v1/common.proto
@@ -19,7 +19,7 @@ package google.spanner.admin.instance.v1;
 import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "Google.Cloud.Spanner.Admin.Instance.V1";
-option go_package = "google.golang.org/genproto/googleapis/spanner/admin/instance/v1;instance";
+option go_package = "cloud.google.com/go/spanner/admin/instance/apiv1/instancepb;instancepb";
 option java_multiple_files = true;
 option java_outer_classname = "CommonProto";
 option java_package = "com.google.spanner.admin.instance.v1";
diff --git a/proto-google-cloud-spanner-admin-instance-v1/src/main/proto/google/spanner/admin/instance/v1/spanner_instance_admin.proto b/proto-google-cloud-spanner-admin-instance-v1/src/main/proto/google/spanner/admin/instance/v1/spanner_instance_admin.proto
@@ -29,7 +29,7 @@ import "google/protobuf/timestamp.proto";
 import "google/spanner/admin/instance/v1/common.proto";
 
 option csharp_namespace = "Google.Cloud.Spanner.Admin.Instance.V1";
-option go_package = "google.golang.org/genproto/googleapis/spanner/admin/instance/v1;instance";
+option go_package = "cloud.google.com/go/spanner/admin/instance/apiv1/instancepb;instancepb";
 option java_multiple_files = true;
 option java_outer_classname = "SpannerInstanceAdminProto";
 option java_package = "com.google.spanner.admin.instance.v1";
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponseProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponseProto.java
@@ -50,12 +50,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "it_timestamp\030\001 \001(\0132\032.google.protobuf.Tim"
           + "estamp\022C\n\014commit_stats\030\002 \001(\0132-.google.sp"
           + "anner.v1.CommitResponse.CommitStats\032%\n\013C"
-          + "ommitStats\022\026\n\016mutation_count\030\001 \001(\003B\271\001\n\025c"
+          + "ommitStats\022\026\n\016mutation_count\030\001 \001(\003B\266\001\n\025c"
           + "om.google.spanner.v1B\023CommitResponseProt"
-          + "oP\001Z8google.golang.org/genproto/googleap"
-          + "is/spanner/v1;spanner\252\002\027Google.Cloud.Spa"
-          + "nner.V1\312\002\027Google\\Cloud\\Spanner\\V1\352\002\032Goog"
-          + "le::Cloud::Spanner::V1b\006proto3"
+          + "oP\001Z5cloud.google.com/go/spanner/apiv1/s"
+          + "pannerpb;spannerpb\252\002\027Google.Cloud.Spanne"
+          + "r.V1\312\002\027Google\\Cloud\\Spanner\\V1\352\002\032Google:"
+          + ":Cloud::Spanner::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
@@ -54,12 +54,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + ".ListValueH\001B\020\n\016start_key_typeB\016\n\014end_ke"
           + "y_type\"l\n\006KeySet\022(\n\004keys\030\001 \003(\0132\032.google."
           + "protobuf.ListValue\022+\n\006ranges\030\002 \003(\0132\033.goo"
-          + "gle.spanner.v1.KeyRange\022\013\n\003all\030\003 \001(\010B\257\001\n"
-          + "\025com.google.spanner.v1B\tKeysProtoP\001Z8goo"
-          + "gle.golang.org/genproto/googleapis/spann"
-          + "er/v1;spanner\252\002\027Google.Cloud.Spanner.V1\312"
-          + "\002\027Google\\Cloud\\Spanner\\V1\352\002\032Google::Clou"
-          + "d::Spanner::V1b\006proto3"
+          + "gle.spanner.v1.KeyRange\022\013\n\003all\030\003 \001(\010B\254\001\n"
+          + "\025com.google.spanner.v1B\tKeysProtoP\001Z5clo"
+          + "ud.google.com/go/spanner/apiv1/spannerpb"
+          + ";spannerpb\252\002\027Google.Cloud.Spanner.V1\312\002\027G"
+          + "oogle\\Cloud\\Spanner\\V1\352\002\032Google::Cloud::"
+          + "Spanner::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
@@ -63,12 +63,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "(\t\022*\n\006values\030\003 \003(\0132\032.google.protobuf.Lis"
           + "tValue\032M\n\006Delete\022\022\n\005table\030\001 \001(\tB\003\340A\002\022/\n\007"
           + "key_set\030\002 \001(\0132\031.google.spanner.v1.KeySet"
-          + "B\003\340A\002B\013\n\toperationB\263\001\n\025com.google.spanne"
-          + "r.v1B\rMutationProtoP\001Z8google.golang.org"
-          + "/genproto/googleapis/spanner/v1;spanner\252"
-          + "\002\027Google.Cloud.Spanner.V1\312\002\027Google\\Cloud"
-          + "\\Spanner\\V1\352\002\032Google::Cloud::Spanner::V1"
-          + "b\006proto3"
+          + "B\003\340A\002B\013\n\toperationB\260\001\n\025com.google.spanne"
+          + "r.v1B\rMutationProtoP\001Z5cloud.google.com/"
+          + "go/spanner/apiv1/spannerpb;spannerpb\252\002\027G"
+          + "oogle.Cloud.Spanner.V1\312\002\027Google\\Cloud\\Sp"
+          + "anner\\V1\352\002\032Google::Cloud::Spanner::V1b\006p"
+          + "roto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
@@ -75,12 +75,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\001(\t\022\r\n\005value\030\002 \001(\005:\0028\001\"8\n\004Kind\022\024\n\020KIND_U"
           + "NSPECIFIED\020\000\022\016\n\nRELATIONAL\020\001\022\n\n\006SCALAR\020\002"
           + "\"<\n\tQueryPlan\022/\n\nplan_nodes\030\001 \003(\0132\033.goog"
-          + "le.spanner.v1.PlanNodeB\264\001\n\025com.google.sp"
-          + "anner.v1B\016QueryPlanProtoP\001Z8google.golan"
-          + "g.org/genproto/googleapis/spanner/v1;spa"
-          + "nner\252\002\027Google.Cloud.Spanner.V1\312\002\027Google\\"
-          + "Cloud\\Spanner\\V1\352\002\032Google::Cloud::Spanne"
-          + "r::V1b\006proto3"
+          + "le.spanner.v1.PlanNodeB\261\001\n\025com.google.sp"
+          + "anner.v1B\016QueryPlanProtoP\001Z5cloud.google"
+          + ".com/go/spanner/apiv1/spannerpb;spannerp"
+          + "b\252\002\027Google.Cloud.Spanner.V1\312\002\027Google\\Clo"
+          + "ud\\Spanner\\V1\352\002\032Google::Cloud::Spanner::"
+          + "V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
@@ -75,12 +75,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "nner.v1.QueryPlan\022,\n\013query_stats\030\002 \001(\0132\027"
           + ".google.protobuf.Struct\022\031\n\017row_count_exa"
           + "ct\030\003 \001(\003H\000\022\037\n\025row_count_lower_bound\030\004 \001("
-          + "\003H\000B\013\n\trow_countB\267\001\n\025com.google.spanner."
-          + "v1B\016ResultSetProtoP\001Z8google.golang.org/"
-          + "genproto/googleapis/spanner/v1;spanner\370\001"
-          + "\001\252\002\027Google.Cloud.Spanner.V1\312\002\027Google\\Clo"
-          + "ud\\Spanner\\V1\352\002\032Google::Cloud::Spanner::"
-          + "V1b\006proto3"
+          + "\003H\000B\013\n\trow_countB\264\001\n\025com.google.spanner."
+          + "v1B\016ResultSetProtoP\001Z5cloud.google.com/g"
+          + "o/spanner/apiv1/spannerpb;spannerpb\370\001\001\252\002"
+          + "\027Google.Cloud.Spanner.V1\312\002\027Google\\Cloud\\"
+          + "Spanner\\V1\352\002\032Google::Cloud::Spanner::V1b"
+          + "\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
@@ -348,14 +348,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ssions/*}:partitionRead:\001*\032w\312A\026spanner.g"
           + "oogleapis.com\322A[https://www.googleapis.c"
           + "om/auth/cloud-platform,https://www.googl"
-          + "eapis.com/auth/spanner.dataB\224\002\n\025com.goog"
-          + "le.spanner.v1B\014SpannerProtoP\001Z8google.go"
-          + "lang.org/genproto/googleapis/spanner/v1;"
-          + "spanner\252\002\027Google.Cloud.Spanner.V1\312\002\027Goog"
-          + "le\\Cloud\\Spanner\\V1\352\002\032Google::Cloud::Spa"
-          + "nner::V1\352A_\n\037spanner.googleapis.com/Data"
-          + "base\022<projects/{project}/instances/{inst"
-          + "ance}/databases/{database}P\010b\006proto3"
+          + "eapis.com/auth/spanner.dataB\221\002\n\025com.goog"
+          + "le.spanner.v1B\014SpannerProtoP\001Z5cloud.goo"
+          + "gle.com/go/spanner/apiv1/spannerpb;spann"
+          + "erpb\252\002\027Google.Cloud.Spanner.V1\312\002\027Google\\"
+          + "Cloud\\Spanner\\V1\352\002\032Google::Cloud::Spanne"
+          + "r::V1\352A_\n\037spanner.googleapis.com/Databas"
+          + "e\022<projects/{project}/instances/{instanc"
+          + "e}/databases/{database}P\010b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
@@ -87,12 +87,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "actionSelector\022;\n\nsingle_use\030\001 \001(\0132%.goo"
           + "gle.spanner.v1.TransactionOptionsH\000\022\014\n\002i"
           + "d\030\002 \001(\014H\000\0226\n\005begin\030\003 \001(\0132%.google.spanne"
-          + "r.v1.TransactionOptionsH\000B\n\n\010selectorB\266\001"
+          + "r.v1.TransactionOptionsH\000B\n\n\010selectorB\263\001"
           + "\n\025com.google.spanner.v1B\020TransactionProt"
-          + "oP\001Z8google.golang.org/genproto/googleap"
-          + "is/spanner/v1;spanner\252\002\027Google.Cloud.Spa"
-          + "nner.V1\312\002\027Google\\Cloud\\Spanner\\V1\352\002\032Goog"
-          + "le::Cloud::Spanner::V1b\006proto3"
+          + "oP\001Z5cloud.google.com/go/spanner/apiv1/s"
+          + "pannerpb;spannerpb\252\002\027Google.Cloud.Spanne"
+          + "r.V1\312\002\027Google\\Cloud\\Spanner\\V1\352\002\032Google:"
+          + ":Cloud::Spanner::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
@@ -65,12 +65,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\t\n\005ARRAY\020\010\022\n\n\006STRUCT\020\t\022\013\n\007NUMERIC\020\n\022\010\n\004J"
           + "SON\020\013*X\n\022TypeAnnotationCode\022$\n TYPE_ANNO"
           + "TATION_CODE_UNSPECIFIED\020\000\022\016\n\nPG_NUMERIC\020"
-          + "\002\022\014\n\010PG_JSONB\020\003B\257\001\n\025com.google.spanner.v"
-          + "1B\tTypeProtoP\001Z8google.golang.org/genpro"
-          + "to/googleapis/spanner/v1;spanner\252\002\027Googl"
-          + "e.Cloud.Spanner.V1\312\002\027Google\\Cloud\\Spanne"
-          + "r\\V1\352\002\032Google::Cloud::Spanner::V1b\006proto"
-          + "3"
+          + "\002\022\014\n\010PG_JSONB\020\003B\254\001\n\025com.google.spanner.v"
+          + "1B\tTypeProtoP\001Z5cloud.google.com/go/span"
+          + "ner/apiv1/spannerpb;spannerpb\252\002\027Google.C"
+          + "loud.Spanner.V1\312\002\027Google\\Cloud\\Spanner\\V"
+          + "1\352\002\032Google::Cloud::Spanner::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/commit_response.proto b/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/commit_response.proto
@@ -19,7 +19,7 @@ package google.spanner.v1;
 import "google/protobuf/timestamp.proto";
 
 option csharp_namespace = "Google.Cloud.Spanner.V1";
-option go_package = "google.golang.org/genproto/googleapis/spanner/v1;spanner";
+option go_package = "cloud.google.com/go/spanner/apiv1/spannerpb;spannerpb";
 option java_multiple_files = true;
 option java_outer_classname = "CommitResponseProto";
 option java_package = "com.google.spanner.v1";
diff --git a/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/keys.proto b/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/keys.proto
diff --git a/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/mutation.proto b/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/mutation.proto
diff --git a/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/query_plan.proto b/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/query_plan.proto
diff --git a/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/result_set.proto b/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/result_set.proto
diff --git a/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/spanner.proto b/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/spanner.proto
diff --git a/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/transaction.proto b/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/transaction.proto
diff --git a/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/type.proto b/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/type.proto
