fix(v2): default migration_mode to PRE_MIGRATION_SURFACE_ONLY

googleapis · Apr 14, 2023 · 2851cd5 · 2851cd5
1 parent 8ae9eee
commit 2851cd5
Show file tree

Hide file tree

Showing 307 changed files with 21 additions and 46,188 deletions.
diff --git a/rules_php_gapic/php_gapic.bzl b/rules_php_gapic/php_gapic.bzl
@@ -55,7 +55,7 @@ def php_gapic_srcjar(
         rest_numeric_enums = False,
         generate_snippets = True,
         # Supported values validated and specified in src/Utils/MigrationMode.php.
-        migration_mode = "MIGRATION_MODE_UNSPECIFIED", 
+        migration_mode = "PRE_MIGRATION_SURFACE_ONLY", 
         generator_binary = Label("//rules_php_gapic:php_gapic_generator_binary"),
         **kwargs):
     plugin_file_args = {}

diff --git a/src/CodeGenerator.php b/src/CodeGenerator.php
@@ -80,7 +80,7 @@ public static function generateFromDescriptor(
         bool $numericEnums = false,
         int $licenseYear = -1,
         bool $generateSnippets = true,
-        string $migrationMode = MigrationMode::MIGRATION_MODE_UNSPECIFIED,
+        string $migrationMode = MigrationMode::PRE_MIGRATION_SURFACE_ONLY,
     ) {
         $descSet = new FileDescriptorSet();
         $descSet->mergeFromString($descBytes);
@@ -133,7 +133,7 @@ public static function generate(
         bool $numericEnums = false,
         int $licenseYear = -1,
         bool $generateSnippets = true,
-        string $migrationMode = MigrationMode::MIGRATION_MODE_UNSPECIFIED
+        string $migrationMode = MigrationMode::PRE_MIGRATION_SURFACE_ONLY
     ) {
         if ($licenseYear < 0) {
             $licenseYear = (int)date('Y');

diff --git a/src/Generation/ServiceDetails.php b/src/Generation/ServiceDetails.php
@@ -157,7 +157,7 @@ public function __construct(
         ServiceDescriptorProto $desc,
         FileDescriptorProto $fileDesc,
         int $transportType = Transport::GRPC_REST,
-        string $migrationMode = MigrationMode::MIGRATION_MODE_UNSPECIFIED
+        string $migrationMode = MigrationMode::PRE_MIGRATION_SURFACE_ONLY
     ) {
         $this->catalog = $catalog;
         $this->package = $package;

diff --git a/src/Main.php b/src/Main.php
@@ -236,7 +236,7 @@ function readOptions($opts, $sideLoadedRootDir = null)
         $migrationMode = $opts['migration-mode'];
         MigrationMode::validateMode($migrationMode);
     } else {
-        $migrationMode = MigrationMode::MIGRATION_MODE_UNSPECIFIED;
+        $migrationMode = MigrationMode::PRE_MIGRATION_SURFACE_ONLY;
     }
 
     // Flip the flag value because PHP is weird: the presence of the --metadata flag evaluates to false.

diff --git a/tests/Integration/BUILD.bazel b/tests/Integration/BUILD.bazel
@@ -352,6 +352,7 @@ php_gapic_library(
     gapic_yaml = "@com_google_googleapis//google/cloud/redis/v1:redis_gapic.yaml",
     grpc_service_config = "@com_google_googleapis//google/cloud/redis/v1:redis_grpc_service_config.json",
     service_yaml = "@com_google_googleapis//google/cloud/redis/v1:redis_v1.yaml",
+    migration_mode = "MIGRATION_MODE_UNSPECIFIED",
     deps = [
         ":redis_php_grpc",
         ":redis_php_proto",

diff --git a/tests/Integration/goldens/asset/fragments/Google/Cloud/Asset/V1/CreateFeedRequest.build.txt b/tests/Integration/goldens/asset/fragments/Google/Cloud/Asset/V1/CreateFeedRequest.build.txt
diff --git a/tests/Integration/goldens/asset/fragments/Google/Cloud/Asset/V1/DeleteFeedRequest.build.txt b/tests/Integration/goldens/asset/fragments/Google/Cloud/Asset/V1/DeleteFeedRequest.build.txt
diff --git a/tests/Integration/goldens/asset/fragments/Google/Cloud/Asset/V1/GetFeedRequest.build.txt b/tests/Integration/goldens/asset/fragments/Google/Cloud/Asset/V1/GetFeedRequest.build.txt
diff --git a/tests/Integration/goldens/asset/fragments/Google/Cloud/Asset/V1/ListAssetsRequest.build.txt b/tests/Integration/goldens/asset/fragments/Google/Cloud/Asset/V1/ListAssetsRequest.build.txt
diff --git a/tests/Integration/goldens/asset/fragments/Google/Cloud/Asset/V1/ListFeedsRequest.build.txt b/tests/Integration/goldens/asset/fragments/Google/Cloud/Asset/V1/ListFeedsRequest.build.txt
diff --git a/...ation/goldens/asset/fragments/Google/Cloud/Asset/V1/SearchAllIamPoliciesRequest.build.txt b/...ation/goldens/asset/fragments/Google/Cloud/Asset/V1/SearchAllIamPoliciesRequest.build.txt
diff --git a/...gration/goldens/asset/fragments/Google/Cloud/Asset/V1/SearchAllResourcesRequest.build.txt b/...gration/goldens/asset/fragments/Google/Cloud/Asset/V1/SearchAllResourcesRequest.build.txt
diff --git a/tests/Integration/goldens/asset/fragments/Google/Cloud/Asset/V1/UpdateFeedRequest.build.txt b/tests/Integration/goldens/asset/fragments/Google/Cloud/Asset/V1/UpdateFeedRequest.build.txt
diff --git a/tests/Integration/goldens/asset/src/V1/Client/AssetServiceClient.php b/tests/Integration/goldens/asset/src/V1/Client/AssetServiceClient.php