refactor(bigtable): only default UserProjectOption for Data API (#8455)

Author: dbolduc

google/cloud/bigtable/internal/defaults.cc

@@ -89,11 +89,6 @@ Options DefaultOptions(Options opts) {
     opts.set<InstanceAdminEndpointOption>(*std::move(instance_admin_emulator));
   }
 
-  auto user_project = GetEnv("GOOGLE_CLOUD_CPP_USER_PROJECT");
-  if (user_project && !user_project->empty()) {
-    opts.set<UserProjectOption>(*std::move(user_project));
-  }
-
   if (!opts.has<DataEndpointOption>()) {
     opts.set<DataEndpointOption>("bigtable.googleapis.com");
   }
@@ -164,6 +159,11 @@ Options DefaultOptions(Options opts) {
 }
 
 Options DefaultDataOptions(Options opts) {
+  using ::google::cloud::internal::GetEnv;
+  auto user_project = GetEnv("GOOGLE_CLOUD_CPP_USER_PROJECT");
+  if (user_project && !user_project->empty()) {
+    opts.set<UserProjectOption>(*std::move(user_project));
+  }
   opts = DefaultOptions(std::move(opts));
   return opts.set<EndpointOption>(opts.get<DataEndpointOption>());
 }

google/cloud/bigtable/internal/defaults_test.cc

@@ -155,30 +155,6 @@ TEST(OptionsTest, DefaultTableAdminOptions) {
   EXPECT_EQ("tableadmin.googleapis.com", options.get<EndpointOption>());
 }
 
-TEST(OptionsTest, InstanceAdminUserProjectOption) {
-  auto env = ScopedEnvironment("GOOGLE_CLOUD_CPP_USER_PROJECT", absl::nullopt);
-  auto options = DefaultInstanceAdminOptions(
-      Options{}.set<UserProjectOption>("test-project"));
-  EXPECT_EQ(options.get<UserProjectOption>(), "test-project");
-
-  env = ScopedEnvironment("GOOGLE_CLOUD_CPP_USER_PROJECT", "env-project");
-  options = DefaultInstanceAdminOptions(
-      Options{}.set<UserProjectOption>("test-project"));
-  EXPECT_EQ(options.get<UserProjectOption>(), "env-project");
-}
-
-TEST(OptionsTest, TableAdminUserProjectOption) {
-  auto env = ScopedEnvironment("GOOGLE_CLOUD_CPP_USER_PROJECT", absl::nullopt);
-  auto options = DefaultTableAdminOptions(
-      Options{}.set<UserProjectOption>("test-project"));
-  EXPECT_EQ(options.get<UserProjectOption>(), "test-project");
-
-  env = ScopedEnvironment("GOOGLE_CLOUD_CPP_USER_PROJECT", "env-project");
-  options = DefaultTableAdminOptions(
-      Options{}.set<UserProjectOption>("test-project"));
-  EXPECT_EQ(options.get<UserProjectOption>(), "env-project");
-}
-
 TEST(OptionsTest, DataUserProjectOption) {
   auto env = ScopedEnvironment("GOOGLE_CLOUD_CPP_USER_PROJECT", absl::nullopt);
   auto options =