Skip to content

Commit 4729a5b

Browse files
committed
changing the deprecating message
1 parent 4147191 commit 4729a5b

9 files changed

Lines changed: 52 additions & 52 deletions

google/cloud/storage/oauth2/anonymous_credentials.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace oauth2 {
3737
* @deprecated Prefer using the unified credentials documented in @ref guac
3838
*/
3939
class GOOGLE_CLOUD_CPP_DEPRECATED(
40-
"This class will be removed in v3.0.0 and later. "
40+
"This class will be removed in v4.0.0 and later. "
4141
"Prefer using the unified credentials "
4242
"documented in @ref guac.") AnonymousCredentials : public Credentials {
4343
public:

google/cloud/storage/oauth2/authorized_user_credentials.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ namespace oauth2 {
4646
* @deprecated Prefer using the unified credentials documented in @ref guac
4747
*/
4848
struct GOOGLE_CLOUD_CPP_DEPRECATED(
49-
"This struct will be removed in v3.0.0 and later. Prefer using the "
49+
"This struct will be removed in v4.0.0 and later. Prefer using the "
5050
"unified credentials documented in @ref guac.")
5151
AuthorizedUserCredentialsInfo {
5252
std::string client_id;
@@ -64,7 +64,7 @@ struct GOOGLE_CLOUD_CPP_DEPRECATED(
6464
* @deprecated Prefer using the unified credentials documented in @ref guac
6565
*/
6666
GOOGLE_CLOUD_CPP_DEPRECATED(
67-
"This function will be removed in v3.0.0 and later. Prefer using the "
67+
"This function will be removed in v4.0.0 and later. Prefer using the "
6868
"unified credentials documented in @ref guac.")
6969
StatusOr<RefreshingCredentialsWrapper::TemporaryToken>
7070
ParseAuthorizedUserRefreshResponse(
@@ -77,7 +77,7 @@ ParseAuthorizedUserRefreshResponse(
7777
* @deprecated Prefer using the unified credentials documented in @ref guac
7878
*/
7979
GOOGLE_CLOUD_CPP_DEPRECATED(
80-
"This function will be removed in v3.0.0 and later. Prefer using the "
80+
"This function will be removed in v4.0.0 and later. Prefer using the "
8181
"unified credentials documented in @ref guac.")
8282
StatusOr<AuthorizedUserCredentialsInfo> ParseAuthorizedUserCredentials(
8383
std::string const& content, std::string const& source,
@@ -116,7 +116,7 @@ class AuthorizedUserCredentials;
116116
/// @copydoc AuthorizedUserCredentials
117117
template <>
118118
class GOOGLE_CLOUD_CPP_DEPRECATED(
119-
"This class will be removed in v3.0.0 and later. Prefer using the "
119+
"This class will be removed in v4.0.0 and later. Prefer using the "
120120
"unified credentials documented in @ref guac.")
121121
AuthorizedUserCredentials<storage::internal::CurlRequestBuilder,
122122
std::chrono::system_clock> : public Credentials {
@@ -150,7 +150,7 @@ class GOOGLE_CLOUD_CPP_DEPRECATED(
150150
/// @copydoc AuthorizedUserCredentials
151151
template <typename HttpRequestBuilderType, typename ClockType>
152152
class GOOGLE_CLOUD_CPP_DEPRECATED(
153-
"This class will be removed in v3.0.0 and later. Prefer using the "
153+
"This class will be removed in v4.0.0 and later. Prefer using the "
154154
"unified credentials documented in @ref guac.") AuthorizedUserCredentials
155155
: public Credentials {
156156
public:

google/cloud/storage/oauth2/compute_engine_credentials.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ namespace oauth2 {
4848
* @deprecated Prefer using the unified credentials documented in @ref guac
4949
*/
5050
struct GOOGLE_CLOUD_CPP_DEPRECATED(
51-
"This struct will be removed in v3.0.0 and later. Prefer using the "
51+
"This struct will be removed in v4.0.0 and later. Prefer using the "
5252
"unified credentials documented in @ref guac.") ServiceAccountMetadata {
5353
std::set<std::string> scopes;
5454
std::string email;
@@ -60,7 +60,7 @@ struct GOOGLE_CLOUD_CPP_DEPRECATED(
6060
* @deprecated Prefer using the unified credentials documented in @ref guac
6161
*/
6262
GOOGLE_CLOUD_CPP_DEPRECATED(
63-
"This function will be removed in v3.0.0 and later. Prefer using the "
63+
"This function will be removed in v4.0.0 and later. Prefer using the "
6464
"unified credentials documented in @ref guac.")
6565
StatusOr<ServiceAccountMetadata> ParseMetadataServerResponse(
6666
storage::internal::HttpResponse const& response);
@@ -73,7 +73,7 @@ StatusOr<ServiceAccountMetadata> ParseMetadataServerResponse(
7373
* @deprecated Prefer using the unified credentials documented in @ref guac
7474
*/
7575
GOOGLE_CLOUD_CPP_DEPRECATED(
76-
"This function will be removed in v3.0.0 and later. Prefer using the "
76+
"This function will be removed in v4.0.0 and later. Prefer using the "
7777
"unified credentials documented in @ref guac.")
7878
StatusOr<RefreshingCredentialsWrapper::TemporaryToken>
7979
ParseComputeEngineRefreshResponse(
@@ -113,7 +113,7 @@ class ComputeEngineCredentials;
113113
/// @copydoc ComputeEngineCredentials
114114
template <>
115115
class GOOGLE_CLOUD_CPP_DEPRECATED(
116-
"This class will be removed in v3.0.0 and later. Prefer using the "
116+
"This class will be removed in v4.0.0 and later. Prefer using the "
117117
"unified credentials documented in @ref guac.")
118118
ComputeEngineCredentials<storage::internal::CurlRequestBuilder,
119119
std::chrono::system_clock> : public Credentials {
@@ -164,7 +164,7 @@ class GOOGLE_CLOUD_CPP_DEPRECATED(
164164
/// @copydoc ComputeEngineCredentials
165165
template <typename HttpRequestBuilderType, typename ClockType>
166166
class GOOGLE_CLOUD_CPP_DEPRECATED(
167-
"This class will be removed in v3.0.0 and later. Prefer using the "
167+
"This class will be removed in v4.0.0 and later. Prefer using the "
168168
"unified credentials documented in @ref guac.") ComputeEngineCredentials
169169
: public Credentials {
170170
public:

google/cloud/storage/oauth2/credential_constants.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace oauth2 {
3333
* @deprecated Prefer using the unified credentials documented in @ref guac
3434
*/
3535
enum class GOOGLE_CLOUD_CPP_DEPRECATED(
36-
"This enum will be removed in v3.0.0 and later. Prefer using the unified "
36+
"This enum will be removed in v4.0.0 and later. Prefer using the unified "
3737
"credentials documented in @ref guac.") JwtSigningAlgorithms {
3838
// NOLINTNEXTLINE(readability-identifier-naming)
3939
RS256
@@ -45,7 +45,7 @@ enum class GOOGLE_CLOUD_CPP_DEPRECATED(
4545
* @deprecated Prefer using the unified credentials documented in @ref guac
4646
*/
4747
GOOGLE_CLOUD_CPP_DEPRECATED(
48-
"This constant will be removed in v3.0.0 and later. Prefer using the "
48+
"This constant will be removed in v4.0.0 and later. Prefer using the "
4949
"unified "
5050
"credentials documented in @ref guac.")
5151
constexpr std::chrono::seconds GoogleOAuthAccessTokenLifetime() {
@@ -64,7 +64,7 @@ constexpr std::chrono::seconds GoogleOAuthAccessTokenLifetime() {
6464
* @deprecated Prefer using the unified credentials documented in @ref guac
6565
*/
6666
GOOGLE_CLOUD_CPP_DEPRECATED(
67-
"This constant will be removed in v3.0.0 and later. Prefer using the "
67+
"This constant will be removed in v4.0.0 and later. Prefer using the "
6868
"unified "
6969
"credentials documented in @ref guac.")
7070
constexpr std::chrono::seconds GoogleOAuthAccessTokenExpirationSlack() {
@@ -77,7 +77,7 @@ constexpr std::chrono::seconds GoogleOAuthAccessTokenExpirationSlack() {
7777
* @deprecated Prefer using the unified credentials documented in @ref guac
7878
*/
7979
GOOGLE_CLOUD_CPP_DEPRECATED(
80-
"This constant will be removed in v3.0.0 and later. Prefer using the "
80+
"This constant will be removed in v4.0.0 and later. Prefer using the "
8181
"unified "
8282
"credentials documented in @ref guac.")
8383
inline char const* GoogleOAuthRefreshEndpoint() {
@@ -91,7 +91,7 @@ inline char const* GoogleOAuthRefreshEndpoint() {
9191
* @deprecated Prefer using the unified credentials documented in @ref guac
9292
*/
9393
GOOGLE_CLOUD_CPP_DEPRECATED(
94-
"This constant will be removed in v3.0.0 and later. Prefer using the "
94+
"This constant will be removed in v4.0.0 and later. Prefer using the "
9595
"unified "
9696
"credentials documented in @ref guac.")
9797
inline char const* GoogleOAuthScopeCloudPlatform() {

google/cloud/storage/oauth2/credentials.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace oauth2 {
4545
* @deprecated Prefer using the unified credentials documented in @ref guac
4646
*/
4747
class GOOGLE_CLOUD_CPP_DEPRECATED(
48-
"This class will be removed in v3.0.0 and later. Prefer using the "
48+
"This class will be removed in v4.0.0 and later. Prefer using the "
4949
"unified credentials documented in @ref guac.") Credentials {
5050
public:
5151
virtual ~Credentials() = default;

google/cloud/storage/oauth2/google_application_default_credentials_file.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace oauth2 {
3333
* @deprecated Prefer using the unified credentials documented in @ref guac
3434
*/
3535
GOOGLE_CLOUD_CPP_DEPRECATED(
36-
"This function will be removed in v3.0.0 and later. Prefer using the "
36+
"This function will be removed in v4.0.0 and later. Prefer using the "
3737
"unified credentials documented in @ref guac.")
3838
char const* GoogleAdcEnvVar();
3939

@@ -47,7 +47,7 @@ char const* GoogleAdcEnvVar();
4747
* @deprecated Prefer using the unified credentials documented in @ref guac
4848
*/
4949
GOOGLE_CLOUD_CPP_DEPRECATED(
50-
"This function will be removed in v3.0.0 and later. Prefer using the "
50+
"This function will be removed in v4.0.0 and later. Prefer using the "
5151
"unified credentials documented in @ref guac.")
5252
std::string GoogleAdcFilePathFromEnvVarOrEmpty();
5353

@@ -61,7 +61,7 @@ std::string GoogleAdcFilePathFromEnvVarOrEmpty();
6161
* @deprecated Prefer using the unified credentials documented in @ref guac
6262
*/
6363
GOOGLE_CLOUD_CPP_DEPRECATED(
64-
"This function will be removed in v3.0.0 and later. Prefer using the "
64+
"This function will be removed in v4.0.0 and later. Prefer using the "
6565
"unified credentials documented in @ref guac.")
6666
std::string GoogleAdcFilePathFromWellKnownPathOrEmpty();
6767

@@ -74,7 +74,7 @@ std::string GoogleAdcFilePathFromWellKnownPathOrEmpty();
7474
* @deprecated Prefer using the unified credentials documented in @ref guac
7575
*/
7676
GOOGLE_CLOUD_CPP_DEPRECATED(
77-
"This function will be removed in v3.0.0 and later. Prefer using the "
77+
"This function will be removed in v4.0.0 and later. Prefer using the "
7878
"unified credentials documented in @ref guac.")
7979
char const* GoogleGcloudAdcFileEnvVar();
8080

@@ -89,7 +89,7 @@ char const* GoogleGcloudAdcFileEnvVar();
8989
* @deprecated Prefer using the unified credentials documented in @ref guac
9090
*/
9191
GOOGLE_CLOUD_CPP_DEPRECATED(
92-
"This function will be removed in v3.0.0 and later. Prefer using the "
92+
"This function will be removed in v4.0.0 and later. Prefer using the "
9393
"unified credentials documented in @ref guac.")
9494
char const* GoogleAdcHomeEnvVar();
9595

google/cloud/storage/oauth2/google_credentials.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace oauth2 {
4545
* @deprecated Prefer using the unified credentials documented in @ref guac
4646
*/
4747
GOOGLE_CLOUD_CPP_DEPRECATED(
48-
"This function will be removed in v3.0.0 and later. Prefer using the "
48+
"This function will be removed in v4.0.0 and later. Prefer using the "
4949
"unified credentials "
5050
"documented in @ref guac.")
5151
StatusOr<std::shared_ptr<Credentials>> GoogleDefaultCredentials(
@@ -64,7 +64,7 @@ StatusOr<std::shared_ptr<Credentials>> GoogleDefaultCredentials(
6464
* @deprecated Prefer using the unified credentials documented in @ref guac
6565
*/
6666
GOOGLE_CLOUD_CPP_DEPRECATED(
67-
"This function will be removed in v3.0.0 and later. Prefer using the "
67+
"This function will be removed in v4.0.0 and later. Prefer using the "
6868
"unified credentials "
6969
"documented in @ref guac.")
7070
std::shared_ptr<Credentials> CreateAnonymousCredentials();
@@ -78,7 +78,7 @@ std::shared_ptr<Credentials> CreateAnonymousCredentials();
7878
* @deprecated Prefer using the unified credentials documented in @ref guac
7979
*/
8080
GOOGLE_CLOUD_CPP_DEPRECATED(
81-
"This function will be removed in v3.0.0 and later. Prefer using the "
81+
"This function will be removed in v4.0.0 and later. Prefer using the "
8282
"unified credentials "
8383
"documented in @ref guac.")
8484
StatusOr<std::shared_ptr<Credentials>>
@@ -93,7 +93,7 @@ CreateAuthorizedUserCredentialsFromJsonFilePath(std::string const& path);
9393
* @deprecated Prefer using the unified credentials documented in @ref guac
9494
*/
9595
GOOGLE_CLOUD_CPP_DEPRECATED(
96-
"This function will be removed in v3.0.0 and later. Prefer using the "
96+
"This function will be removed in v4.0.0 and later. Prefer using the "
9797
"unified credentials "
9898
"documented in @ref guac.")
9999
StatusOr<std::shared_ptr<Credentials>>
@@ -122,7 +122,7 @@ CreateAuthorizedUserCredentialsFromJsonContents(
122122
* @deprecated Prefer using the unified credentials documented in @ref guac
123123
*/
124124
GOOGLE_CLOUD_CPP_DEPRECATED(
125-
"This function will be removed in v3.0.0 and later. Prefer using the "
125+
"This function will be removed in v4.0.0 and later. Prefer using the "
126126
"unified credentials "
127127
"documented in @ref guac.")
128128
StatusOr<std::shared_ptr<Credentials>>
@@ -153,7 +153,7 @@ CreateServiceAccountCredentialsFromFilePath(std::string const& path);
153153
* @deprecated Prefer using the unified credentials documented in @ref guac
154154
*/
155155
GOOGLE_CLOUD_CPP_DEPRECATED(
156-
"This function will be removed in v3.0.0 and later. Prefer using the "
156+
"This function will be removed in v4.0.0 and later. Prefer using the "
157157
"unified credentials "
158158
"documented in @ref guac.")
159159
StatusOr<std::shared_ptr<Credentials>>
@@ -171,7 +171,7 @@ CreateServiceAccountCredentialsFromFilePath(
171171
* @deprecated Prefer using the unified credentials documented in @ref guac
172172
*/
173173
GOOGLE_CLOUD_CPP_DEPRECATED(
174-
"This function will be removed in v3.0.0 and later. Prefer using the "
174+
"This function will be removed in v4.0.0 and later. Prefer using the "
175175
"unified credentials "
176176
"documented in @ref guac.")
177177
StatusOr<std::shared_ptr<Credentials>>
@@ -199,7 +199,7 @@ CreateServiceAccountCredentialsFromJsonFilePath(std::string const& path);
199199
* @deprecated Prefer using the unified credentials documented in @ref guac
200200
*/
201201
GOOGLE_CLOUD_CPP_DEPRECATED(
202-
"This function will be removed in v3.0.0 and later. Prefer using the "
202+
"This function will be removed in v4.0.0 and later. Prefer using the "
203203
"unified credentials "
204204
"documented in @ref guac.")
205205
StatusOr<std::shared_ptr<Credentials>>
@@ -217,7 +217,7 @@ CreateServiceAccountCredentialsFromJsonFilePath(
217217
* @deprecated Prefer using the unified credentials documented in @ref guac
218218
*/
219219
GOOGLE_CLOUD_CPP_DEPRECATED(
220-
"This function will be removed in v3.0.0 and later. Prefer using the "
220+
"This function will be removed in v4.0.0 and later. Prefer using the "
221221
"unified credentials "
222222
"documented in @ref guac.")
223223
StatusOr<std::shared_ptr<Credentials>>
@@ -245,7 +245,7 @@ CreateServiceAccountCredentialsFromP12FilePath(std::string const& path);
245245
* @deprecated Prefer using the unified credentials documented in @ref guac
246246
*/
247247
GOOGLE_CLOUD_CPP_DEPRECATED(
248-
"This function will be removed in v3.0.0 and later. Prefer using the "
248+
"This function will be removed in v4.0.0 and later. Prefer using the "
249249
"unified credentials "
250250
"documented in @ref guac.")
251251
StatusOr<std::shared_ptr<Credentials>>
@@ -272,7 +272,7 @@ CreateServiceAccountCredentialsFromP12FilePath(
272272
* @deprecated Prefer using the unified credentials documented in @ref guac
273273
*/
274274
GOOGLE_CLOUD_CPP_DEPRECATED(
275-
"This function will be removed in v3.0.0 and later. Prefer using the "
275+
"This function will be removed in v4.0.0 and later. Prefer using the "
276276
"unified credentials "
277277
"documented in @ref guac.")
278278
StatusOr<std::shared_ptr<Credentials>>
@@ -306,7 +306,7 @@ CreateServiceAccountCredentialsFromDefaultPaths(
306306
* @deprecated Prefer using the unified credentials documented in @ref guac
307307
*/
308308
GOOGLE_CLOUD_CPP_DEPRECATED(
309-
"This function will be removed in v3.0.0 and later. Prefer using the "
309+
"This function will be removed in v4.0.0 and later. Prefer using the "
310310
"unified credentials "
311311
"documented in @ref guac.")
312312
StatusOr<std::shared_ptr<Credentials>>
@@ -324,7 +324,7 @@ CreateServiceAccountCredentialsFromDefaultPaths(
324324
* @deprecated Prefer using the unified credentials documented in @ref guac
325325
*/
326326
GOOGLE_CLOUD_CPP_DEPRECATED(
327-
"This function will be removed in v3.0.0 and later. Prefer using the "
327+
"This function will be removed in v4.0.0 and later. Prefer using the "
328328
"unified credentials "
329329
"documented in @ref guac.")
330330
StatusOr<std::shared_ptr<Credentials>>
@@ -354,7 +354,7 @@ CreateServiceAccountCredentialsFromJsonContents(
354354
* @deprecated Prefer using the unified credentials documented in @ref guac
355355
*/
356356
GOOGLE_CLOUD_CPP_DEPRECATED(
357-
"This function will be removed in v3.0.0 and later. Prefer using the "
357+
"This function will be removed in v4.0.0 and later. Prefer using the "
358358
"unified credentials "
359359
"documented in @ref guac.")
360360
StatusOr<std::shared_ptr<Credentials>>
@@ -368,7 +368,7 @@ CreateServiceAccountCredentialsFromJsonContents(
368368
* @deprecated Prefer using the unified credentials documented in @ref guac
369369
*/
370370
GOOGLE_CLOUD_CPP_DEPRECATED(
371-
"This function will be removed in v3.0.0 and later. Prefer using the "
371+
"This function will be removed in v4.0.0 and later. Prefer using the "
372372
"unified credentials "
373373
"documented in @ref guac.")
374374
std::shared_ptr<Credentials> CreateComputeEngineCredentials();
@@ -379,7 +379,7 @@ std::shared_ptr<Credentials> CreateComputeEngineCredentials();
379379
* @deprecated Prefer using the unified credentials documented in @ref guac
380380
*/
381381
GOOGLE_CLOUD_CPP_DEPRECATED(
382-
"This function will be removed in v3.0.0 and later. Prefer using the "
382+
"This function will be removed in v4.0.0 and later. Prefer using the "
383383
"unified credentials "
384384
"documented in @ref guac.")
385385
std::shared_ptr<Credentials> CreateComputeEngineCredentials(

google/cloud/storage/oauth2/refreshing_credentials_wrapper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ namespace oauth2 {
3636
* @deprecated Prefer using the unified credentials documented in @ref guac
3737
*/
3838
class GOOGLE_CLOUD_CPP_DEPRECATED(
39-
"This class will be removed in v3.0.0 and later. Prefer using the "
39+
"This class will be removed in v4.0.0 and later. Prefer using the "
4040
"unified credentials documented in @ref guac.")
4141
RefreshingCredentialsWrapper {
4242
public:
4343
RefreshingCredentialsWrapper();
4444

4545
struct GOOGLE_CLOUD_CPP_DEPRECATED(
46-
"This struct will be removed in v3.0.0 and later. Prefer using the "
46+
"This struct will be removed in v4.0.0 and later. Prefer using the "
4747
"unified credentials documented in @ref guac.") TemporaryToken {
4848
std::string token;
4949
std::chrono::system_clock::time_point expiration_time;

0 commit comments

Comments
 (0)