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.

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(config): support type:secret in config.options #1625

Merged
merged 5 commits into from Apr 4, 2024

Conversation

tonyandrewmeyer
Copy link
Contributor

Since Juju 3.1, the config.options section of charmcraft.yaml (or the older config.yaml) has supported a type value of secret (for user secrets). This is missing from the documentation right now, but the Juju team are working on fixing that.

This PR adds support for type: secret in config options.

charmcraft/models/config.py Show resolved Hide resolved
@lengau lengau requested a review from syu-w April 3, 2024 22:29
@tonyandrewmeyer tonyandrewmeyer changed the title fix: support type:secret in config.options fix: support type:secret in config.options Apr 3, 2024
@syu-w syu-w changed the title fix: support type:secret in config.options feat(config): support type:secret in config.options Apr 3, 2024
@tonyandrewmeyer
Copy link
Contributor Author

I (foolishly!) made the same mistake here as on the earlier PR and did the GitHub UI "update" without picking the address to associate that with. I've now signed the CLA with my personal address also, so I think if that action is re-run it should pass?

@lengau
Copy link
Collaborator

lengau commented Apr 4, 2024

@tonyandrewmeyer I'm not sure why it's still not liking it. If you want you can rebase and force-push; otherwise I'll check tomorrow and see what we can do.

This makes a few related changes:

1. Extensions are applied on the rawest charmcraft.yaml data we have
2. Charms with a "bases" key (not just bundles) get a default part.
3. Always expect a dictionary for parts.
@lengau lengau merged commit 9021926 into canonical:main Apr 4, 2024
15 checks passed
@lengau
Copy link
Collaborator

lengau commented Apr 4, 2024

Thanks again @tonyandrewmeyer ! This is merged

@tonyandrewmeyer tonyandrewmeyer deleted the config-type-secret-main branch April 8, 2024 06:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Juju 3.4 supports user-secrets and config with 'secret' type
3 participants