-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Add 'how to run' instructions for each Enos scenario #27959
base: main
Are you sure you want to change the base?
Conversation
Please note that this scenario requires several inputs variables to be set in order to function | ||
RUNNING THIS SCENARIO | ||
|
||
1. Set input variables |
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.
Does this need to be 4.
?
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.
Probably, still working on polishing the dev scenarios.
with vault. If using Ubuntu, your SSH user will be `ubuntu`; if using any of the other | ||
supported distros, it will be `ec2-user`. |
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.
Thanks for this. Always trips me up.
enos/enos-scenario-agent.hcl
Outdated
$ enos scenario launch agent arch:amd64 artifact_source:crt artifact_type:bundle backend:consul config_mode:env consul_edition:ent consul_version:1.16.3 distro:ubuntu edition:ent.hsm.fips1402 seal:pkcs11 | ||
|
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.
IMO this should be a code block and maybe use line breaks to make it more readable:
enos scenario launch agent \
arch:amd64 \
artifact_source:crt \
artifact_type:bundle \
backend:consul \
config_mode:env \
consul_edition:ent \
consul_version:1.16.3 \
distro:ubuntu \
edition:ent.hsm.fips1402 \
seal:pkcs11
arm64 AMI: https://aws.amazon.com/marketplace/server/procurement?productId=a516e959-df54-4035-bb1a-63599b7a6df9 | ||
amd64 AMI: https://aws.amazon.com/marketplace/server/procurement?productId=5535c495-72d4-4355-b169-54ffa874f849 |
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.
Nit: turn these into links.
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.
This doesn't get put in markdown at any point, it's just a blurb of HCL.
enos/enos-scenario-proxy.hcl
Outdated
5. Choose the matrix variants you want to use, and launch the scenario with the appropriate | ||
filter for those variants, e.g.: | ||
|
||
$ enos scenario launch proxy arch:arm64 artifact_source:artifactory artifact_type:bundle backend:raft config_mode:file consul_edition:ce consul_version:1.17.0 distro:leap edition:ent seal:shamir |
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.
Same recommendation as above: code block and newlines will make this more readable
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 can see your point but I think we will leave this as one-liner for the purpose of the docs -- formatting changes may vary by personal preference and also be shell dependent.
enos/enos-scenario-replication.hcl
Outdated
5. Choose the matrix variants you want to use, and launch the scenario with the appropriate | ||
filter for those variants, e.g.: | ||
|
||
$ enos scenario launch replication arch:amd64 artifact_source:artifactory artifact_type:bundle config_mode:env consul_edition:ce consul_version:1.16.3 distro:sles edition:ent primary_backend:raft primary_seal:shamir secondary_backend:raft secondary_seal:shamir |
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.
Same recommendation as above: code block and newlines will make this more readable
enos/enos-scenario-seal-ha.hcl
Outdated
5. Choose the matrix variants you want to use, and launch the scenario with the appropriate | ||
filter for those variants, e.g.: | ||
|
||
$ enos scenario launch seal_ha arch:amd64 artifact_source:artifactory artifact_type:package distro:rhel edition:ent.hsm.fips1402 backend:raft config_mode:file consul_edition:ce consul_version:1.17.0 primary_seal:pkcs11 secondary_seal:pkcs11 |
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.
Same recommendation as above: code block and newlines will make this more readable
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.
Some nits but looks great. I stopped flagging the same nit over but it should be applied across the documentation.
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'm not sure exactly what I think. That's totally okay and perhaps we should have a conversation. It feels to me like this is very useful information but might be too verbose and sort of scary if you're just getting started.
I'm leaning towards the scenario description being information that is unique to each scenario, which would include required variables and then having like 80% of what you've done in the README. What do you think?
|
||
4. Choose what type of Vault artifact you want to use, and set the appropriate variables. | ||
|
||
a. 'artifact:local' |
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.
The actual path of the zip bundle we create for local is probably not all that useful for configuration. Can we remove it?
This will download a Vault .zip bundle from releases.hashicorp.com with the version and | ||
edition you specify. | ||
|
||
TODO: add required variable |
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.
There should be none other than version.
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.
It's also important to note that versions between dev and CI scenarios are a bit different right now. In dev scenarios you just use the 'major.minor.patch` form whereas in CI scenarios it's 'major.minor.patch.edition-prerelease'
|
||
$ enos scenario list dev_single_cluster | ||
|
||
Once you know what filter you want to use to obtain your desired combination of matrix variants, |
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.
Would be useful to mention that you can reduce the list by providing partial filters?
|
||
$ enos scenario destroy dev_pr_replication <filter> | ||
|
||
|
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.
nit: seems like a bit of extra whilte space here.
|
||
The scenario supports finding and installing any released 'linux/amd64' or 'linux/arm64' Vault | ||
artifact as long as its version is >= 1.8. You can also use the 'artifact:local' variant to | ||
build and deploy the current branch! | ||
|
||
In order to execute this scenario you'll need to install the enos CLI: | ||
You can use the following command to get a textual outline of the entire |
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.
This is a lot of information. I'm trying figure out whether it all really should be in the scenario outline now or just information that is specific to each scenario. It almost feels like half of this information would be more apt to a README than in every scenario description.
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.
And I realize that is the opposite of what I've previously said. But seeing it here has me questioning that.
Description
Adds 'how to run' instructions for each Enos scenario. https://hashicorp.atlassian.net/browse/VAULT-29011?atlOrigin=eyJpIjoiZjYyN2JiN2YwMDcyNDM0NTg0Zjk2MzkzNzZkMGEyNTciLCJwIjoiaiJ9
TODO only if you're a HashiCorp employee
getting backported to N-2, use the new style
backport/ent/x.x.x+ent
labelsinstead of the old style
backport/x.x.x
labels.the normal
backport/x.x.x
label (there should be only 1).of a public function, even if that change is in a CE file, double check that
applying the patch for this PR to the ENT repo and running tests doesn't
break any tests. Sometimes ENT only tests rely on public functions in CE
files.
in the PR description, commit message, or branch name.
description. Also, make sure the changelog is in this PR, not in your ENT PR.