[JUJU-386] Improve yaml parsing for yaml files without 'clouds:' keyword ... #13597
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cderici
changed the title
SimonRichardson
requested changes
Jan 10, 2022
There was a problem hiding this comment.
We should attempt to coerce the format based on the schema. As empty lines are valid yaml, this is susceptible to failure. Instead, we should be working with the final representation.
This breaks your setup easily:
juju list-clouds -c <controller> --format yaml > /tmp/clouds.yaml
sed -i '0,/^/s//#some comment\n/' /tmp/clouds.yaml
juju update-cloud -f /tmp/clouds.yaml localhost
|
!!build!! |
cderici
force-pushed
the
yaml-without-clouds-keyword
branch
from
e6badd2
to
840262f
Compare
SimonRichardson
requested changes
Jan 13, 2022
|
!!build!! |
SimonRichardson
approved these changes
Jan 18, 2022
... so that the 'list-clouds' output can be used directly as an input to 'update-clouds'.
cderici
force-pushed
the
yaml-without-clouds-keyword
branch
from
a8c58ba
to
d4238b5
Compare
|
!!build!! |
|
|
jujubot
added a commit
that referenced
this pull request
Jan 25, 2022
#13644 Merge from 2.9 to bring forward: - #13643 from manadart/2.9-late-unit-public-addr - #13641 from ycliuhw/fix/nw-deploy-bionic-aks - #13638 from ycliuhw/fix/lp-1896209 - #13637 from wallyworld/external-controller-error - #13619 from hmlanigan/bug-1956975-improved-logging - #13632 from manadart/2.9-report-test-race-fix - #13631 from manadart/2.9-remove-old-network-stuff - #13597 from cderici/yaml-without-clouds-keyword - #13626 from jack-w-shaw/JUJU-256_fix_smoke_race_condition - #13611 from jack-w-shaw/JUJU-416_Consolidate_retries - #13629 from SimonRichardson/report-model-cache - #13598 from benhoyt/configurable-log-size - #13625 from manadart/2.9-instance-poller-no-fake-addrs - #13623 from jack-w-shaw/JUJU-416_Consolidate_retries_service - #13622 from SimonRichardson/fix-state-tracker-panic - #13620 from wallyworld/migration-with-cmr - #13616 from wallyworld/peergroup-unittext-fixes - #13612 from manadart/2.9-state-package-col-iter-close - #13610 from jujubot/increment-to-2.9.24 - #13605 from SimonRichardson/fix-upgrade-closer-leak Conflicts: - apiserver/facades/agent/caasapplication/application_test.go - cloudconfig/windows_userdata_test.go - cmd/juju/commands/main.go - cmd/juju/gui/gui.go - cmd/juju/ssh/debugcode.go - cmd/juju/ssh/debugcode_test.go - cmd/juju/ssh/debughooks.go - cmd/juju/ssh/debughooks_test.go - cmd/juju/ssh/scp.go - cmd/juju/ssh/scp_unix_test.go - cmd/juju/ssh/ssh.go - cmd/juju/ssh/ssh_machine.go - cmd/juju/ssh/ssh_unix_test.go - scripts/win-installer/setup.iss - snap/snapcraft.yaml - state/mocks/database_mock.go - state/mocks/txn_mock.go - state/prune.go - version/version.go - worker/containerbroker/mocks/agent_mock.go - worker/containerbroker/mocks/machine_mock.go - worker/instancemutater/mocks/agent_mock.go
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This improves the
ParseCloudMetadatato be able to parse yaml files for the cloudset that doesn't have the keywordclouds:at the top level.The change is requested in the LP Bug #1826957
QA Steps
Notes & Discussion
It is also discussed in the LP bug as another solution to put
clouds:keyword into thelist-cloud, but that'd break backwards compatibility.