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

Return object in converter if is SecretBytes #135

Merged
merged 1 commit into from
Feb 27, 2020
Merged

Return object in converter if is SecretBytes #135

merged 1 commit into from
Feb 27, 2020

Conversation

timja
Copy link
Member

@timja timja commented Feb 22, 2020

Partially fixes jenkinsci/configuration-as-code-plugin#1170

The other part is a null check in JCasC

Before this change, if one credential was a FileCredentialsImpl then no credentials could be exported (see the linked issue above), after this change and a null check in JCasC I can export all credentials including FileCredentialsImpl

@timja timja requested a review from jvz February 22, 2020 09:42
@timja timja mentioned this pull request Feb 22, 2020
Merged
6 tasks
@timja
Copy link
Member Author

timja commented Feb 22, 2020

Test in the JCasC PR using incremental version: jenkinsci/configuration-as-code-plugin#1282

@jetersen
Copy link
Member

@timja how does it handle my attempt to fix keystore and credentials in #129

@timja
Copy link
Member Author

timja commented Feb 22, 2020

@timja how does it handle my attempt to fix keystore and credentials in #129

exports fine, I tried every type of credential that came from installing plain-credentials

      - file:
          fileName: "pom.xml"
          id: "secret-file"
          scope: GLOBAL
          secretBytes: "{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}"
      - certificate:
          id: "590cc9a5-10c3-4680-9f97-afa77c6d4c36"
          keyStoreSource:
            uploaded:
              uploadedKeystore: "****"
          password: "{AQAAABAAAAAQI0D0qAWL6imcWL8SL4BY1nLyBKpllSh11GkurZ+Y738=}"
          scope: GLOBAL

@jetersen
Copy link
Member

Hmmm at the same time should we try and fix that the exported things are returned as **** instead of the encrypted value?

@timja
Copy link
Member Author

timja commented Feb 22, 2020 •
edited
Loading

Hmmm at the same time should we try and fix that the exported things are returned as **** instead of the encrypted value?

separate improvement 😉 **** is much better than ALL creds being skipped

@jetersen jetersen mentioned this pull request Feb 22, 2020
Closed
jvz
jvz approved these changes Feb 24, 2020
View reviewed changes
Copy link
Member

@jvz jvz left a comment

Choose a reason for hiding this comment

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

Seems reasonable. Can you add any tests for this?

@timja
Copy link
Member Author

timja commented Feb 24, 2020 •
edited
Loading

Seems reasonable. Can you add any tests for this?

There's a test here:
jenkinsci/configuration-as-code-plugin#1282

I can port it over if you want? There's a circular dependency though, the test won't pass until JCasC is fixed, which means this would need the incrementals version of JCasc to be here and JCasc needs the incrementals...
(I'm looping around, but TLDR it's circular...)

@jvz
Copy link
Member

jvz commented Feb 24, 2020

That test looks fine, no need to port it here.

@timja
Copy link
Member Author

timja commented Feb 25, 2020 •
edited
Loading

That test looks fine, no need to port it here.

The build is green on the jcasc side if you want to 🚢 now, (Must've keyboard mashed in between running the test locally and committing 🤕 jenkinsci/configuration-as-code-plugin@c6f4a24)

@timja
Copy link
Member Author

timja commented Feb 26, 2020 •
edited
Loading

a rebuild of this hit 1 test failure on a web client test (note it passed on the previous build):

java.net.SocketTimeoutException: Read timed out

@timja timja closed this Feb 26, 2020
@timja timja reopened this Feb 26, 2020
@oleg-nenashev oleg-nenashev self-requested a review February 26, 2020 09:39
@jetersen
Copy link
Member

Would be nice with a release 🙏

@jvz jvz merged commit 9bdfefa into jenkinsci:master Feb 27, 2020
@timja timja deleted the fix-class-cast-in-jcasc branch February 27, 2020 20:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oleg-nenashev oleg-nenashev oleg-nenashev approved these changes

@jetersen jetersen jetersen approved these changes

@jvz jvz jvz 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.

Possible NPE when DataBound Object attribute is not Describable
4 participants
@timja @jetersen @jvz @oleg-nenashev