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 empty retry_strategy of Batch JobDefinition causing panics #3921

Merged
merged 3 commits into from
May 10, 2024

Conversation

flostadler
Copy link
Contributor

Computing whether a Batch JobDefinition has a diff panics if the retry_strategy is empty. This is a valid configuration because all properties of retry_strategy are optional.

This patch fixes that by adding the missing nil checks for the retry strategy.

What's notable is that having an empty retry_strategy will cause a perma diff. MaxItems=1 blocks with all optional attributes lead to permanent diffs if the user provides an empty block.

Fixes #3905

@flostadler flostadler requested review from a team, t0yv0 and corymhall May 10, 2024 17:55
Copy link
Member

@t0yv0 t0yv0 left a comment

Choose a reason for hiding this comment

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

Thank you! Looks clean.

Copy link

Does the PR have any schema changes?

Looking good! No breaking changes found.
No new resources/functions.

Maintainer note: consult the runbook for dealing with any breaking changes.

@flostadler flostadler merged commit ba65249 into master May 10, 2024
23 checks passed
@flostadler flostadler deleted the regress-3905 branch May 10, 2024 19:40
lumiere-bot bot added a commit to coolguy1771/home-ops that referenced this pull request May 15, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [@pulumi/aws](https://pulumi.io)
([source](https://togithub.com/pulumi/pulumi-aws)) | dependencies |
minor | [`6.34.1` ->
`6.35.0`](https://renovatebot.com/diffs/npm/@pulumi%2faws/6.34.1/6.35.0)
|

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>pulumi/pulumi-aws (@&#8203;pulumi/aws)</summary>

###
[`v6.35.0`](https://togithub.com/pulumi/pulumi-aws/releases/tag/v6.35.0)

[Compare
Source](https://togithub.com/pulumi/pulumi-aws/compare/v6.34.1...v6.35.0)

##### Changelog

- Fix aws.s3.Bucket tag drift detection by
[@&#8203;t0yv0](https://togithub.com/t0yv0) in
[pulumi/pulumi-aws#3910
- Fix empty retry_strategy of Batch JobDefinition causing panics by
[@&#8203;flostadler](https://togithub.com/flostadler) in
[pulumi/pulumi-aws#3921
- Combined dependencies PR by
[@&#8203;pulumi-bot](https://togithub.com/pulumi-bot) in
[pulumi/pulumi-aws#3928
- Bump the go_modules group across 3 directories with 2 updates by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[pulumi/pulumi-aws#3894

**Full Changelog**:
pulumi/pulumi-aws@v6.34.1...v6.35.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNTYuMSIsInVwZGF0ZWRJblZlciI6IjM3LjM1Ni4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJ0eXBlL21pbm9yIl19-->

Co-authored-by: lumiere-bot[bot] <98047013+lumiere-bot[bot]@users.noreply.github.com>
lumiere-bot bot added a commit to coolguy1771/home-ops that referenced this pull request May 15, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [@pulumi/aws](https://pulumi.io)
([source](https://togithub.com/pulumi/pulumi-aws)) | dependencies |
minor | [`6.34.1` ->
`6.35.0`](https://renovatebot.com/diffs/npm/@pulumi%2faws/6.34.1/6.35.0)
|

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>pulumi/pulumi-aws (@&#8203;pulumi/aws)</summary>

###
[`v6.35.0`](https://togithub.com/pulumi/pulumi-aws/releases/tag/v6.35.0)

[Compare
Source](https://togithub.com/pulumi/pulumi-aws/compare/v6.34.1...v6.35.0)

##### Changelog

- Fix aws.s3.Bucket tag drift detection by
[@&#8203;t0yv0](https://togithub.com/t0yv0) in
[pulumi/pulumi-aws#3910
- Fix empty retry_strategy of Batch JobDefinition causing panics by
[@&#8203;flostadler](https://togithub.com/flostadler) in
[pulumi/pulumi-aws#3921
- Combined dependencies PR by
[@&#8203;pulumi-bot](https://togithub.com/pulumi-bot) in
[pulumi/pulumi-aws#3928
- Bump the go_modules group across 3 directories with 2 updates by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[pulumi/pulumi-aws#3894

**Full Changelog**:
pulumi/pulumi-aws@v6.34.1...v6.35.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these
updates again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNTYuMSIsInVwZGF0ZWRJblZlciI6IjM3LjM1Ni4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJ0eXBlL21pbm9yIl19-->

Co-authored-by: lumiere-bot[bot] <98047013+lumiere-bot[bot]@users.noreply.github.com>
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.

Panic in batch job definition in 6.33.1
2 participants