impl(universe_domain): remove ExperimentalTag (#15642)

Author: scotthart

google/cloud/storage/tests/universe_domain_integration_test.cc

@@ -62,8 +62,8 @@ auto TestOptions() {
   options.set<UnifiedCredentialsOption>(
       MakeServiceAccountCredentials(contents));
 
-  auto ud_options = AddUniverseDomainOption(
-      ExperimentalTag{}, options.set<ProjectIdOption>(projectId));
+  auto ud_options =
+      AddUniverseDomainOption(options.set<ProjectIdOption>(projectId));
   if (!ud_options.ok()) throw std::move(ud_options).status();
 
   return *ud_options;

google/cloud/universe_domain.cc

@@ -22,21 +22,20 @@ namespace google {
 namespace cloud {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-StatusOr<Options> AddUniverseDomainOption(ExperimentalTag, Options options) {
+StatusOr<Options> AddUniverseDomainOption(Options options) {
   if (!options.has<UnifiedCredentialsOption>()) {
     options.set<UnifiedCredentialsOption>(
         MakeGoogleDefaultCredentials(internal::MakeAuthOptions(options)));
   }
 
-  auto universe_domain = GetUniverseDomain(
-      ExperimentalTag{}, *options.get<UnifiedCredentialsOption>(), options);
+  auto universe_domain =
+      GetUniverseDomain(*options.get<UnifiedCredentialsOption>(), options);
   if (!universe_domain) return std::move(universe_domain).status();
   return options.set<internal::UniverseDomainOption>(
       *std::move(universe_domain));
 }
 
-StatusOr<std::string> GetUniverseDomain(ExperimentalTag,
-                                        Credentials const& credentials,
+StatusOr<std::string> GetUniverseDomain(Credentials const& credentials,
                                         Options const& options) {
   return rest_internal::MapCredentials(credentials)->universe_domain(options);
 }

google/cloud/universe_domain.h

@@ -17,7 +17,6 @@
 
 #include "google/cloud/backoff_policy.h"
 #include "google/cloud/credentials.h"
-#include "google/cloud/experimental_tag.h"
 #include "google/cloud/options.h"
 #include "google/cloud/status_or.h"
 #include "google/cloud/universe_domain_options.h"
@@ -47,8 +46,7 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
  * If the `RetryPolicy` becomes exhausted or other errors are encountered, that
  * `Status` is returned.
  */
-StatusOr<Options> AddUniverseDomainOption(ExperimentalTag tag,
-                                          Options options = {});
+StatusOr<Options> AddUniverseDomainOption(Options options = {});
 
 /**
  * Interrogates the provided credentials for the universe_domain.
@@ -61,8 +59,7 @@ StatusOr<Options> AddUniverseDomainOption(ExperimentalTag tag,
  * If successful the universe_domain value is returned, otherwise a `Status`
  * indicating the error encountered is returned.
  */
-StatusOr<std::string> GetUniverseDomain(ExperimentalTag tag,
-                                        Credentials const& credentials,
+StatusOr<std::string> GetUniverseDomain(Credentials const& credentials,
                                         Options const& options);
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END

google/cloud/universe_domain/demo/bigquery.cc

@@ -35,8 +35,7 @@ int main(int argc, char* argv[]) try {
   namespace bigquery_storage = ::google::cloud::bigquery_storage_v1;
   constexpr int kMaxReadStreams = 1;
 
-  auto options =
-      google::cloud::AddUniverseDomainOption(google::cloud::ExperimentalTag{});
+  auto options = google::cloud::AddUniverseDomainOption();
   if (!options.ok()) throw std::move(options).status();
 
   // Override retry policy to quickly exit if there's a failure.

google/cloud/universe_domain/demo/bigtable.cc

@@ -42,7 +42,7 @@ int main(int argc, char* argv[]) try {
 
   // Interrogate credentials for universe_domain and add the value to returned
   // options.
-  auto ud_options = gc::AddUniverseDomainOption(gc::ExperimentalTag{}, options);
+  auto ud_options = gc::AddUniverseDomainOption(options);
   if (!ud_options.ok()) throw std::move(ud_options).status();
 
   // Override retry policy to quickly exit if there's a failure.

google/cloud/universe_domain/demo/compute.cc

@@ -43,8 +43,7 @@ int main(int argc, char* argv[]) try {
 
   // Create aliases to make the code easier to read.
   namespace disks = ::google::cloud::compute_disks_v1;
-  auto options =
-      google::cloud::AddUniverseDomainOption(google::cloud::ExperimentalTag{});
+  auto options = google::cloud::AddUniverseDomainOption();
   if (!options.ok()) throw std::move(options).status();
 
   // Override retry policy to quickly exit if there's a failure.

google/cloud/universe_domain/demo/kms.cc

@@ -42,7 +42,7 @@ int main(int argc, char* argv[]) try {
 
   // Interrogate credentials for universe_domain and add the value to returned
   // options.
-  auto ud_options = gc::AddUniverseDomainOption(gc::ExperimentalTag{}, options);
+  auto ud_options = gc::AddUniverseDomainOption(options);
   if (!ud_options.ok()) throw std::move(ud_options).status();
 
   // Override retry policy to quickly exit if there's a failure.

google/cloud/universe_domain/demo/pubsub.cc

@@ -28,8 +28,7 @@ int main(int argc, char* argv[]) try {
   // Create a namespace alias to make the code easier to read.
   namespace pubsub_admin = ::google::cloud::pubsub_admin;
 
-  auto options =
-      google::cloud::AddUniverseDomainOption(google::cloud::ExperimentalTag{});
+  auto options = google::cloud::AddUniverseDomainOption();
   if (!options.ok()) throw std::move(options).status();
 
   // Override retry policy to quickly exit if there's a failure.

google/cloud/universe_domain/demo/spanner.cc

@@ -42,7 +42,7 @@ int main(int argc, char* argv[]) try {
 
   // Interrogate credentials for universe_domain and add the value to returned
   // options.
-  auto ud_options = gc::AddUniverseDomainOption(gc::ExperimentalTag{}, options);
+  auto ud_options = gc::AddUniverseDomainOption(options);
   if (!ud_options.ok()) throw std::move(ud_options).status();
 
   // Override retry policy to quickly exit if there's a failure.

google/cloud/universe_domain/demo/storage.cc

@@ -27,8 +27,7 @@ int main(int argc, char* argv[]) try {
   // Create aliases to make the code easier to read.
   namespace gcs = ::google::cloud::storage;
 
-  auto options =
-      google::cloud::AddUniverseDomainOption(google::cloud::ExperimentalTag{});
+  auto options = google::cloud::AddUniverseDomainOption();
   if (!options.ok()) throw std::move(options).status();
 
   // Override retry policy to quickly exit if there's a failure.