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

feat: allow set lifetime for service account creds #516

Merged
merged 12 commits into from
Jan 12, 2021
Merged

feat: allow set lifetime for service account creds #516

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
235523f
feat: allow set lifetime for service account creds
arithmetic1728 Dec 10, 2020
de79320
update
arithmetic1728 Dec 10, 2020
282e791
Merge branch 'master' into lifespan_srv
arithmetic1728 Dec 14, 2020
37c39f4
update name
arithmetic1728 Dec 14, 2020
0419d60
update
arithmetic1728 Dec 16, 2020
727aad7
update
arithmetic1728 Dec 16, 2020
1a1330a
change lifetime 0 to default
arithmetic1728 Dec 16, 2020
afd2a40
Merge branch 'master' into lifespan_srv
arithmetic1728 Dec 17, 2020
6154d90
update
arithmetic1728 Dec 17, 2020
39476f1
update
arithmetic1728 Dec 17, 2020
28ad538
Merge branch 'master' into lifespan_srv
arithmetic1728 Dec 31, 2020
6ed887a
Merge branch 'master' into lifespan_srv
chingor13 Jan 12, 2021
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
Prev Previous commit
Next Next commit
update
  • Loading branch information
@arithmetic1728
arithmetic1728 committed Dec 17, 2020
commit 39476f1cde7a588588a1041e9b8155f9d5e686dd
4 changes: 2 additions & 2 deletions oauth2_http/java/com/google/auth/oauth2/ServiceAccountCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public class ServiceAccountCredentials extends GoogleCredentials
if (lifetime > TWELVE_HOURS_IN_SECONDS) {
throw new IllegalStateException("lifetime must be less than or equal to 43200");
}
this.lifetime = lifetime == 0 ? DEFAULT_LIFETIME_IN_SECONDS : lifetime;
this.lifetime = lifetime;
}

/**
Expand Down Expand Up @@ -850,7 +850,7 @@ public Builder setQuotaProjectId(String quotaProjectId) {
}

public Builder setLifetime(int lifetime) {
this.lifetime = lifetime;
this.lifetime = lifetime == 0 ? DEFAULT_LIFETIME_IN_SECONDS : lifetime;
return this;
}

Expand Down