Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(iam): versioned v1 clients #10944

Merged
merged 5 commits into from
Feb 24, 2023
Merged

refactor(iam): versioned v1 clients #10944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e5fe9c
refactor(iam): versioned v1 clients
dbolduc Feb 23, 2023
8e29b03
generated changes
dbolduc Feb 23, 2023
31965bf
remove stale code; regenerate docs
dbolduc Feb 23, 2023
f3f1e69
manually update builds; retry traits
dbolduc Feb 23, 2023
dd28a3a
update ABI dumps
dbolduc Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz
View file
Open in desktop
Binary file not shown.
12 changes: 11 additions & 1 deletion ci/etc/expected_install_directories
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions generator/generator_config.textproto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
}
Expand Down
3 changes: 3 additions & 0 deletions google/cloud/iam/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ licenses(["notice"]) # Apache 2.0

service_dirs = [
"",
"admin/v1/",
"credentials/v1/",
"v1/",
"v2/",
]

Expand Down
2 changes: 1 addition & 1 deletion google/cloud/iam/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*")
Expand Down
8 changes: 4 additions & 4 deletions google/cloud/iam/iam_client.cc → google/cloud/iam/admin/v1/iam_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Loading