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.

Sign up for GitHub

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

Jump to bottom

fix(xo-web/new-vm): ability to escape cloud config template variables #4501

Merged
merged 20 commits into from Sep 19, 2019
Merged

fix(xo-web/new-vm): ability to escape cloud config template variables #4501

merged 20 commits into from Sep 19, 2019

Conversation

badrAZ
Copy link
Contributor

@badrAZ badrAZ commented Sep 6, 2019 •
edited

Fixes #4486

image

Check list

Check items when done or if not relevant

  • PR reference the relevant issue (e.g. Fixes #007)
  • if UI changes, a screenshot has been added to the PR
  • if xo-server API changes, the corresponding test has been added to/updated on xo-server-test
  • CHANGELOG.unreleased.md:
    • enhancement/bug fix entry added
    • list of packages to release updated (${name} v${new version})
  • documentation updated
  • I have tested added/updated features (and impacted code)

Process

  1. create a PR as soon as possible
  2. mark it as WiP: (Work in Progress) if not ready to be merged
  3. when you want a review, add a reviewer (and only one)
  4. if necessary, update your PR, and re- add a reviewer

@badrAZ badrAZ changed the title [WIP] fix(xo-web/new-vm): ability to escape cloud config template syntax [WIP] fix(xo-web/new-vm): ability to escape cloud config template variables Sep 6, 2019
@badrAZ badrAZ force-pushed the fixCloudConfig branch 2 times, most recently from c72a840 to d77bbbb Compare September 6, 2019 13:17
@badrAZ badrAZ changed the title [WIP] fix(xo-web/new-vm): ability to escape cloud config template variables fix(xo-web/new-vm): ability to escape cloud config template variables Sep 10, 2019
pdonias
pdonias requested changes Sep 13, 2019
View reviewed changes
packages/xo-web/src/common/intl/messages.js Outdated Show resolved Hide resolved
packages/xo-web/src/common/cloud-config.js Outdated Show resolved Hide resolved
packages/xo-web/src/common/utils.js Outdated Show resolved Hide resolved
packages/xo-web/src/common/utils.js Outdated Show resolved Hide resolved
packages/xo-web/src/common/utils.js Outdated Show resolved Hide resolved
packages/xo-web/src/common/utils.js Outdated Show resolved Hide resolved
packages/xo-web/src/common/intl/messages.js Outdated Show resolved Hide resolved
@badrAZ badrAZ requested a review from pdonias September 13, 2019 15:25
pdonias
pdonias requested changes Sep 16, 2019
View reviewed changes
packages/xo-web/src/common/intl/messages.js Outdated Show resolved Hide resolved
packages/xo-web/src/common/utils.js Outdated Show resolved Hide resolved
packages/xo-web/src/common/utils.js Outdated Show resolved Hide resolved
packages/xo-web/src/common/utils.js Outdated Show resolved Hide resolved
packages/xo-web/src/common/utils.js Outdated Show resolved Hide resolved
@badrAZ badrAZ requested a review from pdonias September 16, 2019 14:31
julien-f
julien-f requested changes Sep 17, 2019
View reviewed changes
CHANGELOG.unreleased.md Outdated Show resolved Hide resolved
packages/xo-web/src/common/cloud-config.js Outdated Show resolved Hide resolved
packages/xo-web/src/common/utils.js Outdated Show resolved Hide resolved
packages/xo-web/src/common/utils.js Outdated Show resolved Hide resolved
@julien-f julien-f requested review from pdonias and removed request for julien-f September 18, 2019 11:45
pdonias
pdonias requested changes Sep 18, 2019
View reviewed changes
@xen-orchestra/build-template/src/index.spec.js Outdated Show resolved Hide resolved
@xen-orchestra/build-template/src/index.spec.js Outdated Show resolved Hide resolved
@xen-orchestra/build-template/src/index.spec.js Outdated Show resolved Hide resolved
@xen-orchestra/build-template/src/index.spec.js Outdated Show resolved Hide resolved
packages/xo-web/src/xo-app/new-vm/index.js Outdated Show resolved Hide resolved
@badrAZ badrAZ requested a review from pdonias September 18, 2019 13:37
pdonias
pdonias requested changes Sep 18, 2019
View reviewed changes
CHANGELOG.unreleased.md Outdated Show resolved Hide resolved
@badrAZ badrAZ requested a review from pdonias September 18, 2019 14:42
@julien-f julien-f removed their request for review September 19, 2019 13:48
@julien-f julien-f closed this Sep 19, 2019
@julien-f julien-f reopened this Sep 19, 2019
julien-f
julien-f reviewed Sep 19, 2019
View reviewed changes
packages/xo-web/src/xo-app/new-vm/index.js
import { compileTemplate } from '@xen-orchestra/template'
import { confirm } from 'modal'
import { Container, Row, Col } from 'grid'
import { injectIntl } from 'react-intl'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those changes are unrelated, leave them, but please avoid in the future.

@julien-f julien-f merged commit aaae258 into master Sep 19, 2019
@julien-f julien-f deleted the fixCloudConfig branch September 19, 2019 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julien-f julien-f julien-f approved these changes

@pdonias pdonias pdonias approved these changes

@GHEMID-Mohamed GHEMID-Mohamed GHEMID-Mohamed approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[New vm] % in the cloud config template is replaced by the index of the VM
4 participants
@badrAZ @julien-f @pdonias @GHEMID-Mohamed