refactor(iam): versioned v1 clients (#10944)

googleapis · Feb 24, 2023 · 32d66ea · 32d66ea
1 parent a574ad2
commit 32d66ea
Show file tree

Hide file tree

Showing 106 changed files with 3,667 additions and 2,940 deletions.
diff --git a/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz b/ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz
diff --git a/ci/etc/expected_install_directories b/ci/etc/expected_install_directories
@@ -275,8 +275,18 @@
 ./include/google/cloud/gkemulticloud/v1/internal
 ./include/google/cloud/gkemulticloud/v1/mocks
 ./include/google/cloud/iam
-./include/google/cloud/iam/internal
+./include/google/cloud/iam/admin
+./include/google/cloud/iam/admin/v1
+./include/google/cloud/iam/admin/v1/internal
+./include/google/cloud/iam/admin/v1/mocks
+./include/google/cloud/iam/credentials
+./include/google/cloud/iam/credentials/v1
+./include/google/cloud/iam/credentials/v1/internal
+./include/google/cloud/iam/credentials/v1/mocks
 ./include/google/cloud/iam/mocks
+./include/google/cloud/iam/v1
+./include/google/cloud/iam/v1/internal
+./include/google/cloud/iam/v1/mocks
 ./include/google/cloud/iam/v2
 ./include/google/cloud/iam/v2/internal
 ./include/google/cloud/iam/v2/mocks

diff --git a/generator/generator_config.textproto b/generator/generator_config.textproto
@@ -1000,15 +1000,17 @@ service {
 # IAM
 service {
   service_proto_path: "google/iam/credentials/v1/iamcredentials.proto"
-  product_path: "google/cloud/iam"
+  product_path: "google/cloud/iam/credentials/v1"
+  forwarding_product_path: "google/cloud/iam"
   initial_copyright_year: "2020"
   backwards_compatibility_namespace_alias: true
   retryable_status_codes: ["kUnavailable"]
 }
 
 service {
   service_proto_path: "google/iam/admin/v1/iam.proto"
-  product_path: "google/cloud/iam"
+  product_path: "google/cloud/iam/admin/v1"
+  forwarding_product_path: "google/cloud/iam"
   initial_copyright_year: "2021"
   omitted_rpcs: ["SignBlob", "SignJwt", "UpdateServiceAccount"]
   backwards_compatibility_namespace_alias: true
@@ -1021,7 +1023,8 @@ service {
 
 service {
   service_proto_path: "google/iam/v1/iam_policy.proto"
-  product_path: "google/cloud/iam"
+  product_path: "google/cloud/iam/v1"
+  forwarding_product_path: "google/cloud/iam"
   initial_copyright_year: "2022"
   retryable_status_codes: ["kUnavailable"]
 }

diff --git a/google/cloud/iam/BUILD.bazel b/google/cloud/iam/BUILD.bazel
@@ -18,6 +18,9 @@ licenses(["notice"])  # Apache 2.0
 
 service_dirs = [
     "",
+    "admin/v1/",
+    "credentials/v1/",
+    "v1/",
     "v2/",
 ]
 

diff --git a/google/cloud/iam/CMakeLists.txt b/google/cloud/iam/CMakeLists.txt
@@ -23,7 +23,7 @@ set(DOXYGEN_EXAMPLE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/quickstart")
 
 unset(mocks_globs)
 unset(source_globs)
-set(service_dirs "" "v2/")
+set(service_dirs "" "admin/v1/" "credentials/v1/" "v1/" "v2/")
 foreach (dir IN LISTS service_dirs)
     string(REPLACE "/" "_" ns "${dir}")
     list(APPEND source_globs "${dir}*.h" "${dir}*.cc" "${dir}internal/*")

diff --git a/google/cloud/iam/iam_client.cc → google/cloud/iam/admin/v1/iam_client.cc b/google/cloud/iam/iam_client.cc → google/cloud/iam/admin/v1/iam_client.cc
@@ -16,14 +16,14 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
-#include "google/cloud/iam/iam_client.h"
-#include "google/cloud/iam/iam_options.h"
+#include "google/cloud/iam/admin/v1/iam_client.h"
+#include "google/cloud/iam/admin/v1/iam_options.h"
 #include <memory>
 #include <thread>
 
 namespace google {
 namespace cloud {
-namespace iam {
+namespace iam_admin_v1 {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
 IAMClient::IAMClient(std::shared_ptr<IAMConnection> connection, Options opts)
@@ -396,6 +396,6 @@ StatusOr<google::iam::admin::v1::LintPolicyResponse> IAMClient::LintPolicy(
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
-}  // namespace iam
+}  // namespace iam_admin_v1
 }  // namespace cloud
 }  // namespace google