Description

This PR resolves some TODOs in the bootstrap and upgrade logic. Specifically the one that was targetted mentioned,

// TODO: Check if it is public cloud here and set PersonalCloud accordingly.
// For now, we're always setting it.

I checked whether our bootstrap logic supports bootstrapping onto public clouds. I was mostly able to successfully bootstrap to AWS with ./jaas bootstrap aws/us-east-1 my-test-controller 3.6.12. I say mostly because the machine was provisioned but the bootstrap failed near the end when the controller couldn't reach https://jimm.localhost/.well-known/jwks.json which was obviously only running locally. I'm not keen on deploying everything to AWS just to test this further as I was able to prove to myself this works and the code indicates the same.

Essentially the problem described in the TODO is that we shoudn't pass the cloud information to the StartBootstrap method if the cloud is a public cloud (i.e. AWS, Azure, etc). While it's not necessary to send the cloud info in these cases, it also doesn't do any harm, the bootstrap logic only writes these details to the filesystem if the cloud is not a public one. I did some renaming of the PersonalCloud field to just Cloud with some docstrings to hopefully make it clear (we pass these params around a lot so only some of the fields have docstrings).

In the end, the only substantial change I made was to the CLI, where we now skip sending the cloud information if it's a public cloud. This change is not required, since again, the server will decide whether it needs to use the cloud information. But I decided it was better to omit it if we know it's not needed.

I've also done some minor refactoring of the bootstrap command tests to accompany the above change.

Fixes JUJU-8932

Engineering checklist

• Documentation updated
• Covered by unit tests
• Covered by integration tests