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.

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

fix: unmarshal additional disks #613

Merged
merged 1 commit into from
Oct 6, 2023

Conversation

ginglis13
Copy link
Contributor

Issue #, if available:

Description of changes:

disks in the list format in lima override.yaml were not being unmarshalled properly, causing a disk with the name "" to be mixed with finch lima yaml, resulting in startup failure. This only occurs on inits of a vm other than the very first init. init a vm the first time, _output/lima/data/_config/override.yaml:

additionalDisks:
    - name: finch

stop and remove the vm, then re-init:

additionalDisks:
    - name: ""
    - name: finch

to fix, copy upstream logic from lima to use a custom unmarshaler for the Disk type.

Testing done:

make test-unit

manual testing

  • I've reviewed the guidance in CONTRIBUTING.md

License Acceptance

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

disks in the list format in lima override.yaml were not being
unmarshalled properly, causing a disk with the name "" to be mixed with
finch lima yaml, resulting in startup failure. This only occurs on inits
of a vm other than the very first init. init a vm the first time,
_output/lima/data/_config/override.yaml:

```yaml
additionalDisks:
    - name: finch
```

stop and remove the vm, then re-init:
```yaml
additionalDisks:
    - name: ""
    - name: finch
```

to fix, copy upstream logic from lima to use a custom unmarshaler for
the Disk type.

Signed-off-by: Gavin Inglis <[email protected]>
@ginglis13 ginglis13 merged commit c3d95ac into runfinch:windev Oct 6, 2023
vsiravar pushed a commit that referenced this pull request Oct 17, 2023
Issue #, if available:

*Description of changes:*

disks in the list format in lima override.yaml were not being
unmarshalled properly, causing a disk with the name "" to be mixed with
finch lima yaml, resulting in startup failure. This only occurs on inits
of a vm other than the very first init. init a vm the first time,
_output/lima/data/_config/override.yaml:

```yaml
additionalDisks:
    - name: finch
```

stop and remove the vm, then re-init:
```yaml
additionalDisks:
    - name: ""
    - name: finch
```

to fix, copy upstream logic from lima to use a custom unmarshaler for
the Disk type.

*Testing done:*

`make test-unit`

manual testing

- [x] I've reviewed the guidance in CONTRIBUTING.md


#### License Acceptance

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

Signed-off-by: Gavin Inglis <[email protected]>
vsiravar pushed a commit that referenced this pull request Oct 17, 2023
Issue #, if available:

*Description of changes:*

disks in the list format in lima override.yaml were not being
unmarshalled properly, causing a disk with the name "" to be mixed with
finch lima yaml, resulting in startup failure. This only occurs on inits
of a vm other than the very first init. init a vm the first time,
_output/lima/data/_config/override.yaml:

```yaml
additionalDisks:
    - name: finch
```

stop and remove the vm, then re-init:
```yaml
additionalDisks:
    - name: ""
    - name: finch
```

to fix, copy upstream logic from lima to use a custom unmarshaler for
the Disk type.

*Testing done:*

`make test-unit`

manual testing

- [x] I've reviewed the guidance in CONTRIBUTING.md

#### License Acceptance

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

Signed-off-by: Gavin Inglis <[email protected]>
Signed-off-by: Vishwas Siravara <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants