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: bundles are stored in job_history in their original format #344

Merged
merged 7 commits into from
Jun 18, 2024

Conversation

crowecawcaw
Copy link
Contributor

What was the problem/requirement? (What/Why)

The bundle GUI submitter does not always save asset references or parameter values in the original file format when the bundle is saved to the job_history directory.

Job bundles have data files for the template, asset references and parameter values, and these files can be either JSON or YAML. If input job bundle has a JSON template, the saved bundle's template will also by JSON, but the asset references and parameter values will still be saved as YAML.

What was the solution? (How)

Update the bundle saving logic so to that asset references and parameter values are saved in the same format as the job template.

What is the impact of this change?

This unblocks some other work I'm doing on the Keyshot submitter where Keyshot's Python interpreter can only read and write JSON files. If saved bundle data is all in JSON, the submitter will be able to load it to find previously selected settings.

How was this change tested?

I created a bundle with a JSON template, opened it with the GUI submitter, changed some parameters and job attachments, then exported the bundle. I verified that the new bundle in job_history had all JSON files. I also opened the GUI submitter for the new template and verified it loaded the JSON references and parameters correctly.

Was this change documented?

No - bug fix.

Is this a breaking change?

No


By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@crowecawcaw crowecawcaw requested a review from a team as a code owner June 7, 2024 14:53
Signed-off-by: Stephen Crowe <[email protected]>
Copy link
Contributor

@epmog epmog left a comment

Choose a reason for hiding this comment

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

Code looks good, just need to ensure it's in the right home! Thanks Stephen

src/deadline/client/job_bundle/loader.py Outdated Show resolved Hide resolved
src/deadline/client/job_bundle/loader.py Outdated Show resolved Hide resolved
Signed-off-by: Stephen Crowe <[email protected]>
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

lucaseck
lucaseck previously approved these changes Jun 11, 2024
Signed-off-by: Stephen Crowe <[email protected]>
@crowecawcaw crowecawcaw requested review from epmog and lucaseck June 17, 2024 23:44
@crowecawcaw crowecawcaw enabled auto-merge (squash) June 18, 2024 15:28
@crowecawcaw crowecawcaw merged commit b5de504 into aws-deadline:mainline Jun 18, 2024
15 checks passed
rena-cheng pushed a commit to rena-cheng/deadline-cloud that referenced this pull request Jun 26, 2024
…deadline#344)

* fix: bundles are stored in job_history in their original format

Signed-off-by: Stephen Crowe <[email protected]>

fix: use sids when granting permissions with icacls (aws-deadline#359)

Signed-off-by: Charles Moore <[email protected]>
Signed-off-by: Cloud User <[email protected]>

chore: Add OS field support for integ test (aws-deadline#361)

Signed-off-by: Alex Tran <[email protected]>
Signed-off-by: Cloud User <[email protected]>

fix: bundle gui-submit fails loading bundles with saved queue parameter values (aws-deadline#360)

Signed-off-by: Evan Spearman <[email protected]>
Signed-off-by: Cloud User <[email protected]>

ci: update workflow job names for integ tests (aws-deadline#338)

Signed-off-by: Charles Moore <[email protected]>
Signed-off-by: Cloud User <[email protected]>

Squish Automated Tests - Settings flow for Dev Submit GUI

Change env var to relative path

Squish Automated Tests - Dev Submit GUI Settings Flow

Squish Automated Tests - Dev Submit GUI settings flow

Signed-off-by: Cloud User <[email protected]>

ci: Add integ req to toml (aws-deadline#364)

Signed-off-by: Alex Tran <[email protected]>
Signed-off-by: Cloud User <[email protected]>

Fixing linting errors

Signed-off-by: Cloud User <[email protected]>

feat: support JSON output in bundle GUI submitter (aws-deadline#357)

* feat: support JSON output in bundle GUI submitter

Signed-off-by: Stephen Crowe <[email protected]>
Signed-off-by: Cloud User <[email protected]>

fixing formatting/lint issues

Signed-off-by: Cloud User <[email protected]>

fixing linting issues

Signed-off-by: Cloud User <[email protected]>

fixing linting errors

Signed-off-by: Cloud User <[email protected]>

chore(release): 0.48.5 (aws-deadline#367)

Signed-off-by: client-software-ci <[email protected]>
Signed-off-by: Cloud User <[email protected]>

chore(deps): update python-semantic-release requirement (aws-deadline#342)

Updates the requirements on [python-semantic-release](https://github.com/python-semantic-release/python-semantic-release) to permit the latest version.
- [Release notes](https://github.com/python-semantic-release/python-semantic-release/releases)
- [Changelog](https://github.com/python-semantic-release/python-semantic-release/blob/master/CHANGELOG.md)
- [Commits](python-semantic-release/python-semantic-release@v9.5.0...v9.8.1)

---
updated-dependencies:
- dependency-name: python-semantic-release
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Cloud User <[email protected]>

Disabling lint error checks due to Squish modules

Signed-off-by: Cloud User <[email protected]>

feat: Adding automated tests using Squish framework: Dev Submit GUI Settings flow

Signed-off-by: Cloud User <[email protected]>

feat: Adding automated tests using Squish framework: Dev Submit GUI Settings flow

Signed-off-by: Cloud User <[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.

3 participants