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

Configurable Session Token Duration #48

Merged
merged 3 commits into from
Feb 25, 2019
Merged

Configurable Session Token Duration #48

merged 3 commits into from
Feb 25, 2019

Conversation

nathandines
Copy link
Contributor

Based off of #43, but attempts to address the changes requested by @andresrc at #43 (review)

@nathandines nathandines force-pushed the feature/make-session-token-duration-updatable branch from 1d56305 to 492dc31 Compare February 16, 2019 04:34
@nathandines
Copy link
Contributor Author

Ping @andresrc

Any feedback on this? Hoping to get it through soon if we can

@nathandines nathandines force-pushed the feature/make-session-token-duration-updatable branch from 2e6c1eb to 8447901 Compare February 23, 2019 22:47
@nathandines
Copy link
Contributor Author

nathandines commented Feb 23, 2019 •
edited

@andresrc I've made some changes, and rebased against master to bring the parent pom forward (I didn't realise the branch was so far behind!) which I think might be better.

I did keep getting cannot find symbol when trying to use edu.umd.cs.findbugs.annotations.Nonnull. Is it a problem to use javax.annotation.Nonnull, or were you just referring to CheckForNull?

EDIT: Never mind... edu.umd.cs.findbugs.annotations.NonNull is pascal case, as opposed to javax.annotation.Nonnull. Let me know if you think the changes I've made should be acceptable.

andresrc
andresrc requested changes Feb 24, 2019
View reviewed changes
Copy link
Contributor

@andresrc andresrc left a comment

Choose a reason for hiding this comment

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

Thanks for addressing the feedback! Just a couple of additional comments.

src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java Outdated

@DataBoundSetter
public void setStsTokenDuration(@NonNull Integer stsTokenDuration) {
this.stsTokenDuration = stsTokenDuration.equals(DescriptorImpl.defaultStsTokenDuration) ? null : stsTokenDuration;
Copy link
Contributor

Choose a reason for hiding this comment

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

With this logic you can relax the @NonNull condition, which is only used by static analysis and cannot be enforced by Jelly and write:

this.stsTokenDuration = stsTokenDuration == null || stsTokenDuration.equals(DescriptorImpl.defaultStsTokenDuration) ? null : stsTokenDuration;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the feedback. I've added the improvements for how the method handles null values now

src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java Outdated
@@ -176,10 +190,13 @@ public String getDisplayName() {
return Messages.AWSCredentialsImpl_DisplayName();
}

public static final Integer defaultStsTokenDuration = STS_CREDENTIALS_DURATION_SECONDS;
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need another constant here? If it is to reference it from Jelly, ${it.STS_CREDENTIALS_DURATION_SECONDS} should do the trick. Anyway by convention, constants should be all uppercase.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I kept the original constant for backwards compatibility, as it was public. I tried incorporating your suggestion, but could not access STS_CREDENTIALS_DURATION_SECONDS from Jelly using the it syntax, so at the moment, I've kept it as it was, but changed the casing. Please let me know if this would be okay.

@nathandines nathandines force-pushed the feature/make-session-token-duration-updatable branch from 44bf265 to 68eda61 Compare February 24, 2019 19:33
@nathandines
Copy link
Contributor Author

@andresrc I've made some changes. Awaiting feedback

andresrc
andresrc requested changes Feb 24, 2019
View reviewed changes
Copy link
Contributor

@andresrc andresrc left a comment

Choose a reason for hiding this comment

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

Thanks for changes, just one more thing.

src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java Outdated
@@ -63,17 +65,18 @@

private static final Logger LOGGER = Logger.getLogger(BaseAmazonWebServicesCredentials.class.getName());

public static final int STS_CREDENTIALS_DURATION_SECONDS = 3600;
public static final Integer STS_CREDENTIALS_DURATION_SECONDS = 3600;
Copy link
Contributor

Choose a reason for hiding this comment

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

No need to change the type here, as it will be boxed when needed. Besides, I'm not sure if it would be backwards compatible. Better to revert this change.

Copy link
Contributor Author

@nathandines nathandines Feb 24, 2019 •
edited

Choose a reason for hiding this comment

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

Ah, I changed type because I was getting boxing then unboxing compilation errors with the new setStsTokenDuration logic

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I’ll see what I can do to revert it when I get back to a computer

Copy link
Contributor

Choose a reason for hiding this comment

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

Worst case:

this.stsTokenDuration = stsTokenDuration == null || stsTokenDuration.intValue() == STS_CREDENTIALS_DURATION_SECONDS ? null : stsTokenDuration;

@nathandines nathandines force-pushed the feature/make-session-token-duration-updatable branch 2 times, most recently from a3167db to eada550 Compare February 24, 2019 21:33
@nathandines
Copy link
Contributor Author

@andresrc I kept hitting boxing and unboxing errors, so I've reverted to accessing the variable through DescriptorImpl. I think this is cleaner than having .intValue() all over the place, or boxing the constant in the set and get methods

@nathandines nathandines force-pushed the feature/make-session-token-duration-updatable branch from eada550 to e1e1d7d Compare February 24, 2019 21:39
@nathandines nathandines force-pushed the feature/make-session-token-duration-updatable branch from e1e1d7d to 63c1d2b Compare February 24, 2019 21:40
@andresrc andresrc merged commit 921d77a into jenkinsci:master Feb 25, 2019
@andresrc andresrc mentioned this pull request Feb 25, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andresrc andresrc andresrc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@nathandines @andresrc