-
Notifications
You must be signed in to change notification settings - Fork 45
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
docs: fill in gaps from v15-16 #658
base: main
Are you sure you want to change the base?
Conversation
a392e52
to
aaeb786
Compare
aaeb786
to
11fc2bc
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with a few suggestions.. Thank you!
docs-rtd/howto/manage-groups.md
Outdated
|
||
## Add a group | ||
|
||
To add a group, in your Terraform plan create a resource of the `juju_jaas_group` type, specifying, at the very least, a name. For example: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To add a group, in your Terraform plan create a resource of the `juju_jaas_group` type, specifying, at the very least, a name. For example: | |
To add a group, in your Terraform plan create a resource of the `juju_jaas_group` type, specifying its name. For example: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed.
(manage-access-to-a-group)= | ||
## Manage access to a group | ||
|
||
When using Juju with JAAS, to grant one or more users, groups, and/or service accounts access to a group, in your Terraform plan add a resource type `juju_jaas_access_group`, specifying the group ID, the JAAS group access level, and the list of desired users, groups, and/or service accounts. For example: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thinking that maybe we should reword it to make it cleared that by "adding access to a group" we manage group membership.. "granting" somebody access to a group effectively makes them a member of that group.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, that is so only because the only valid access level is "member". Will that still be all in the future?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I moved the note about member
being the only valid level higher, before the example, and rephrased it:
At present, the only valid JAAS group access level is
member
, so granting an entity access to a group effectively means making them a member of the group.
docs-rtd/howto/manage-offers.md
Outdated
|
||
> See more: [`juju_offer`](https://registry.terraform.io/providers/juju/juju/latest/docs/resources/offer) | ||
### Using Juju alone | ||
When using Juju alone, to grant a user access to an offer, in your Terraform plan add a `juju_access_offer` resource, specifying the offer URL and setting the Juju access level to the list of users you want to grant that level. For example: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
a suggestion for all Juju VS JAAS sections:
"When applying a Terraform plan to a Juju controller"
vs
"When applying a Terraform plan to a JAAS controller"
Because when you say "When using Juju alone" it sounds to me like you're using the Juju CLI, not the provider.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated the section intro, subsection titles, and subsection intro lines to align with this.
## Remove an offer | ||
> Who: User with [offer `admin` access](https://canonical-juju.readthedocs-hosted.com/en/latest/user/reference/user/#user-access-offer-admin). | ||
|
||
To remove an offer, in your Terraform plan, remove its resource definition. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unless they used the offer data source in which case will need to use external tools to remove it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed in our call, I've updated the docs to not have any mention of data sources in the Remove an x sections. Also, for all entities that can be referenced through a data source, I've updated the Manage x > Reference... section to have the better phrasing we agreed upon ("outside of the current Terraform plan").
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Had a follow-up question about how to handle the remove sections (with the data source and resource split).
docs-rtd/howto/manage-groups.md
Outdated
|
||
## Add a group | ||
|
||
To add a group, in your Terraform plan create a resource of the `juju_jaas_group` type, specifying, at the very least, a name. For example: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed.
(manage-access-to-a-group)= | ||
## Manage access to a group | ||
|
||
When using Juju with JAAS, to grant one or more users, groups, and/or service accounts access to a group, in your Terraform plan add a resource type `juju_jaas_access_group`, specifying the group ID, the JAAS group access level, and the list of desired users, groups, and/or service accounts. For example: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, that is so only because the only valid access level is "member". Will that still be all in the future?
(manage-access-to-a-group)= | ||
## Manage access to a group | ||
|
||
When using Juju with JAAS, to grant one or more users, groups, and/or service accounts access to a group, in your Terraform plan add a resource type `juju_jaas_access_group`, specifying the group ID, the JAAS group access level, and the list of desired users, groups, and/or service accounts. For example: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I moved the note about member
being the only valid level higher, before the example, and rephrased it:
At present, the only valid JAAS group access level is
member
, so granting an entity access to a group effectively means making them a member of the group.
docs-rtd/howto/manage-offers.md
Outdated
|
||
> See more: [`juju_offer`](https://registry.terraform.io/providers/juju/juju/latest/docs/resources/offer) | ||
### Using Juju alone | ||
When using Juju alone, to grant a user access to an offer, in your Terraform plan add a `juju_access_offer` resource, specifying the offer URL and setting the Juju access level to the list of users you want to grant that level. For example: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated the section intro, subsection titles, and subsection intro lines to align with this.
bf3bb7f
to
8ff09c9
Compare
/merge |
8ff09c9
to
5d84513
Compare
/merge |
2 similar comments
/merge |
/merge |
@hmlanigan @alesstimec The test
|
5d84513
to
ffc4f61
Compare
ffc4f61
to
fbe123b
Compare
328dbff
to
1d5911b
Compare
Description
This PR fills in docs gaps from v15-16 and makes a few other small updates. Specifically, it:
juju_kubernetes_cloud
and also refactors content / creates new docs as needed, e.g., with jaas users are just one of 3 entities that can be given access to things, so I've reorganized all that content so it'll better reflect that)Type of change
Docs.
QA steps
In
terraform-provider-juju/docs-rtd
, runmake run
to preview the changes in a browser.