Skip to content

Commit 32d66ea

Browse files
dbolducdbolduc
authored
refactor(iam): versioned v1 clients (#10944)
1 parent a574ad2 commit 32d66ea

106 files changed

Lines changed: 3667 additions & 2940 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz‎

-2.75 KB
Binary file not shown.

‎ci/etc/expected_install_directories‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,18 @@
275275
./include/google/cloud/gkemulticloud/v1/internal
276276
./include/google/cloud/gkemulticloud/v1/mocks
277277
./include/google/cloud/iam
278-
./include/google/cloud/iam/internal
278+
./include/google/cloud/iam/admin
279+
./include/google/cloud/iam/admin/v1
280+
./include/google/cloud/iam/admin/v1/internal
281+
./include/google/cloud/iam/admin/v1/mocks
282+
./include/google/cloud/iam/credentials
283+
./include/google/cloud/iam/credentials/v1
284+
./include/google/cloud/iam/credentials/v1/internal
285+
./include/google/cloud/iam/credentials/v1/mocks
279286
./include/google/cloud/iam/mocks
287+
./include/google/cloud/iam/v1
288+
./include/google/cloud/iam/v1/internal
289+
./include/google/cloud/iam/v1/mocks
280290
./include/google/cloud/iam/v2
281291
./include/google/cloud/iam/v2/internal
282292
./include/google/cloud/iam/v2/mocks

‎generator/generator_config.textproto‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,15 +1000,17 @@ service {
10001000
# IAM
10011001
service {
10021002
service_proto_path: "google/iam/credentials/v1/iamcredentials.proto"
1003-
product_path: "google/cloud/iam"
1003+
product_path: "google/cloud/iam/credentials/v1"
1004+
forwarding_product_path: "google/cloud/iam"
10041005
initial_copyright_year: "2020"
10051006
backwards_compatibility_namespace_alias: true
10061007
retryable_status_codes: ["kUnavailable"]
10071008
}
10081009

10091010
service {
10101011
service_proto_path: "google/iam/admin/v1/iam.proto"
1011-
product_path: "google/cloud/iam"
1012+
product_path: "google/cloud/iam/admin/v1"
1013+
forwarding_product_path: "google/cloud/iam"
10121014
initial_copyright_year: "2021"
10131015
omitted_rpcs: ["SignBlob", "SignJwt", "UpdateServiceAccount"]
10141016
backwards_compatibility_namespace_alias: true
@@ -1021,7 +1023,8 @@ service {
10211023

10221024
service {
10231025
service_proto_path: "google/iam/v1/iam_policy.proto"
1024-
product_path: "google/cloud/iam"
1026+
product_path: "google/cloud/iam/v1"
1027+
forwarding_product_path: "google/cloud/iam"
10251028
initial_copyright_year: "2022"
10261029
retryable_status_codes: ["kUnavailable"]
10271030
}

‎google/cloud/iam/BUILD.bazel‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ licenses(["notice"]) # Apache 2.0
1818

1919
service_dirs = [
2020
"",
21+
"admin/v1/",
22+
"credentials/v1/",
23+
"v1/",
2124
"v2/",
2225
]
2326

‎google/cloud/iam/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ set(DOXYGEN_EXAMPLE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/quickstart")
2323

2424
unset(mocks_globs)
2525
unset(source_globs)
26-
set(service_dirs "" "v2/")
26+
set(service_dirs "" "admin/v1/" "credentials/v1/" "v1/" "v2/")
2727
foreach (dir IN LISTS service_dirs)
2828
string(REPLACE "/" "_" ns "${dir}")
2929
list(APPEND source_globs "${dir}*.h" "${dir}*.cc" "${dir}internal/*")

google/cloud/iam/iam_client.cc renamed to google/cloud/iam/admin/v1/iam_client.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
// If you make any local changes, they will be lost.
1717
// source: google/iam/admin/v1/iam.proto
1818

19-
#include "google/cloud/iam/iam_client.h"
20-
#include "google/cloud/iam/iam_options.h"
19+
#include "google/cloud/iam/admin/v1/iam_client.h"
20+
#include "google/cloud/iam/admin/v1/iam_options.h"
2121
#include <memory>
2222
#include <thread>
2323

2424
namespace google {
2525
namespace cloud {
26-
namespace iam {
26+
namespace iam_admin_v1 {
2727
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
2828

2929
IAMClient::IAMClient(std::shared_ptr<IAMConnection> connection, Options opts)
@@ -396,6 +396,6 @@ StatusOr<google::iam::admin::v1::LintPolicyResponse> IAMClient::LintPolicy(
396396
}
397397

398398
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
399-
} // namespace iam
399+
} // namespace iam_admin_v1
400400
} // namespace cloud
401401
} // namespace google

0 commit comments

Comments
 (0)