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

cleanup: remove remnant IAM deprecation macros #8873

Merged
merged 1 commit into from
May 4, 2022
Merged

cleanup: remove remnant IAM deprecation macros #8873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions cmake/GoogleCloudCppCommon.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ elseif (GOOGLE_CLOUD_CPP_GENERATE_DOXYGEN)
# to be noops or have simple values.
set(DOXYGEN_PREDEFINED
"GOOGLE_CLOUD_CPP_DEPRECATED(x)="
"GOOGLE_CLOUD_CPP_IAM_DEPRECATED(x)="
"GOOGLE_CLOUD_CPP_BIGTABLE_IAM_DEPRECATED(x)="
"GOOGLE_CLOUD_CPP_SPANNER_ADMIN_API_DEPRECATED(x)="
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm.. I recently added

google-cloud-cpp/google/cloud/bigtable/version.h

Lines 22 to 26 in b09c2f3

#define GOOGLE_CLOUD_CPP_BIGTABLE_DATA_CLIENT_DEPRECATED(name) \
GOOGLE_CLOUD_CPP_DEPRECATED( \
"google::cloud::bigtable::DataClient::" name \
" is deprecated, and will be removed on or shortly after 2023-05-01." \
" See GitHub issue #8800 for more information.")
and the doxygen seems fine (although I don't remember what the original problem was). Maybe it is fine because it reduces to GOOGLE_CLOUD_CPP_DEPRECATED? If so, then maybe we can remove the spanner macro from this list.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My understanding is that it should be a problem if doxygen saw any code that used GOOGLE_CLOUD_CPP_BIGTABLE_DATA_CLIENT_DEPRECATED. So you may want to investigate.

[The original problem is that doxygen doesn't usually expand macros during its parse, so those attribute macros look like syntax errors.]

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack. I think the GOOGLE_CLOUD_CPP_BIGTABLE_DATA_CLIENT_DEPRECATED macro is only used in tests and internal classes. So we should be fine.

"GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN="
"GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END=")
Expand Down
7 changes: 0 additions & 7 deletions google/cloud/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@
#include "google/cloud/internal/version_info.h"
#include <string>

#define GOOGLE_CLOUD_CPP_IAM_DEPRECATED \
GOOGLE_CLOUD_CPP_DEPRECATED( \
"this type predates IAM conditions and does not work with policies " \
"that include IAM conditions. The functions that use this type are " \
"deprecated and will be be removed on 2022-04-01 or shortly " \
"after. See GitHub issue #5929 for more information.")

#define GOOGLE_CLOUD_CPP_VCONCAT(Ma, Mi, Pa) v##Ma##_##Mi##_##Pa
#define GOOGLE_CLOUD_CPP_VEVAL(Ma, Mi, Pa) GOOGLE_CLOUD_CPP_VCONCAT(Ma, Mi, Pa)
#define GOOGLE_CLOUD_CPP_NS \
Expand Down