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

Upstream v5.63.0 #4378

Merged
merged 11 commits into from
Aug 21, 2024
Merged

Upstream v5.63.0 #4378

merged 11 commits into from
Aug 21, 2024

Conversation

t0yv0
Copy link
Member

@t0yv0 t0yv0 commented Aug 16, 2024

Upgrade upstream to 5.63.0

Fixes #4373
Fixes #4372
Fixes #3713
Fixes #4369

There are some changes to patches:

This file disappeared upstream but was maintained in patches.

It is not needed since Pulumi no longer exposes this resource.

Deleting the file in this change rather than solving the merge conflicts over it.
Copy link

github-actions bot commented Aug 16, 2024

Does the PR have any schema changes?

Found 3 breaking changes:

Types

  • "aws:lex/V2modelsSlotTypeSlotTypeValues:V2modelsSlotTypeSlotTypeValues":
    • 🟡 properties: "slotTypeValues" missing
    • 🟢 required: "slotTypeValues" property is no longer Required
  • 🔴 "aws:lex/V2modelsSlotTypeSlotTypeValuesSlotTypeValue:V2modelsSlotTypeSlotTypeValuesSlotTypeValue" missing

New resources:

  • bedrock/guardrail.Guardrail
  • cloudtrail/organizationDelegatedAdminAccount.OrganizationDelegatedAdminAccount
  • datazone/environmentProfile.EnvironmentProfile
  • datazone/formType.FormType
  • datazone/glossaryTerm.GlossaryTerm
  • pinpoint/emailTemplate.EmailTemplate

New functions:

  • bedrock/getAgentAgentVersions.getAgentAgentVersions

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

@t0yv0
Copy link
Member Author

t0yv0 commented Aug 19, 2024

Regression detected by the tests:

 panic: no AWS SDK v1 API client factory: gamelift

This is not entirely surprising as the gamelift patch edits must not be complete. I'll tackle this.

@flostadler
Copy link
Contributor

@t0yv0 I adapted the patch a bit, it was missing some of the code to setup the conn and resolve the endpoint. Worked locally for me after fixing that up 🤞

@flostadler flostadler marked this pull request as ready for review August 20, 2024 15:26
@flostadler flostadler requested review from corymhall and a team August 20, 2024 15:27
Copy link
Contributor

@corymhall corymhall left a comment

Choose a reason for hiding this comment

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

I think the only upstream tests we need to run are related to the gamelift patch. The other patch updates look minor.

@t0yv0
Copy link
Member Author

t0yv0 commented Aug 20, 2024

@corymhall these gamelift resources are not in upstream and are not under upstream test, though they should be tested under Pulumi, which actually detected the problem Florian was finishing up for me above. I think we don't have any more information here from running upstream tests.

@corymhall
Copy link
Contributor

@t0yv0

these gamelift resources are not in upstream and are not under upstream test,

It looks like we added upstream tests as part of the patch

@AshTharappel
Copy link

Thanks for working on this. I am currently affected by the on JobQueue issue, so I appreciate y'all already being on top of it.

@flostadler
Copy link
Contributor

Running the gamelift tests worked for our added resources:

~ TF_ACC=1 go test ./internal/service/gamelift/... -v -count 1 -parallel 20 -run=TestAccMatchmakingConfiguration -timeout 180m

=== RUN   TestAccMatchmakingConfiguration_basic
=== PAUSE TestAccMatchmakingConfiguration_basic
=== RUN   TestAccMatchmakingConfiguration_tags
=== PAUSE TestAccMatchmakingConfiguration_tags
=== RUN   TestAccMatchmakingConfiguration_disappears
=== PAUSE TestAccMatchmakingConfiguration_disappears
=== CONT  TestAccMatchmakingConfiguration_basic
=== CONT  TestAccMatchmakingConfiguration_disappears
=== CONT  TestAccMatchmakingConfiguration_tags
--- PASS: TestAccMatchmakingConfiguration_disappears (28.34s)
--- PASS: TestAccMatchmakingConfiguration_tags (32.40s)
--- PASS: TestAccMatchmakingConfiguration_basic (34.71s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/gamelift	38.718s

~ TF_ACC=1 go test ./internal/service/gamelift/... -v -count 1 -parallel 20 -run=TestAccMatchmakingRuleSet -timeout 180m

=== RUN   TestAccMatchmakingRuleSet_basic
--- PASS: TestAccMatchmakingRuleSet_basic (27.96s)
=== RUN   TestAccMatchmakingRuleSet_disappears
=== PAUSE TestAccMatchmakingRuleSet_disappears
=== CONT  TestAccMatchmakingRuleSet_disappears
--- PASS: TestAccMatchmakingRuleSet_disappears (21.12s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/gamelift	53.225s

@t0yv0
Copy link
Member Author

t0yv0 commented Aug 21, 2024

/release minor

@github-actions github-actions bot added the needs-release/minor When a PR with this label merges, it initiates a release of vX.Y+1.0 label Aug 21, 2024
@t0yv0 t0yv0 merged commit 198219a into master Aug 21, 2024
30 checks passed
@t0yv0 t0yv0 deleted the upstream-v5.63.0 branch August 21, 2024 17:01
@pulumi-bot
Copy link
Contributor

This PR has been shipped in release v6.50.0.

lumiere-bot bot added a commit to coolguy1771/home-ops that referenced this pull request Aug 22, 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.49.1` ->
`6.50.0`](https://renovatebot.com/diffs/npm/@pulumi%2faws/6.49.1/6.50.0)
|

---

### Release Notes

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

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

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

##### Does the PR have any schema changes?

Found 3 breaking changes:

##### Types

-
"aws:lex/V2modelsSlotTypeSlotTypeValues:V2modelsSlotTypeSlotTypeValues":
    -   `🟡` properties: "slotTypeValues" missing
    -   `🟢` required: "slotTypeValues" property is no longer Required
- `🔴`
"aws:lex/V2modelsSlotTypeSlotTypeValuesSlotTypeValue:V2modelsSlotTypeSlotTypeValuesSlotTypeValue"
missing

##### New resources:

-   `bedrock/guardrail.Guardrail`
-
`cloudtrail/organizationDelegatedAdminAccount.OrganizationDelegatedAdminAccount`
-   `datazone/environmentProfile.EnvironmentProfile`
-   `datazone/formType.FormType`
-   `datazone/glossaryTerm.GlossaryTerm`
-   `pinpoint/emailTemplate.EmailTemplate`

##### New functions:

-   `bedrock/getAgentAgentVersions.getAgentAgentVersions`

##### What's Changed

- Upgrade pulumi-terraform-bridge to v3.89.1 by
[@&#8203;iwahbe](https://togithub.com/iwahbe) in
[pulumi/pulumi-aws#4377
- Update GitHub Actions workflows. by
[@&#8203;pulumi-bot](https://togithub.com/pulumi-bot) in
[pulumi/pulumi-aws#4381
- Upstream v5.63.0 by [@&#8203;t0yv0](https://togithub.com/t0yv0) in
[pulumi/pulumi-aws#4378
- Update GitHub Actions workflows. by
[@&#8203;pulumi-bot](https://togithub.com/pulumi-bot) in
[pulumi/pulumi-aws#4387

**Full Changelog**:
pulumi/pulumi-aws@v6.49.1...v6.50.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:eyJjcmVhdGVkSW5WZXIiOiIzOC40Ni4zIiwidXBkYXRlZEluVmVyIjoiMzguNDYuMyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsidHlwZS9taW5vciJdfQ==-->

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 Aug 22, 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.49.1` ->
`6.50.0`](https://renovatebot.com/diffs/npm/@pulumi%2faws/6.49.1/6.50.0)
|

---

### Release Notes

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

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

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

##### Does the PR have any schema changes?

Found 3 breaking changes:

##### Types

-
"aws:lex/V2modelsSlotTypeSlotTypeValues:V2modelsSlotTypeSlotTypeValues":
    -   `🟡` properties: "slotTypeValues" missing
    -   `🟢` required: "slotTypeValues" property is no longer Required
- `🔴`
"aws:lex/V2modelsSlotTypeSlotTypeValuesSlotTypeValue:V2modelsSlotTypeSlotTypeValuesSlotTypeValue"
missing

##### New resources:

-   `bedrock/guardrail.Guardrail`
-
`cloudtrail/organizationDelegatedAdminAccount.OrganizationDelegatedAdminAccount`
-   `datazone/environmentProfile.EnvironmentProfile`
-   `datazone/formType.FormType`
-   `datazone/glossaryTerm.GlossaryTerm`
-   `pinpoint/emailTemplate.EmailTemplate`

##### New functions:

-   `bedrock/getAgentAgentVersions.getAgentAgentVersions`

##### What's Changed

- Upgrade pulumi-terraform-bridge to v3.89.1 by
[@&#8203;iwahbe](https://togithub.com/iwahbe) in
[pulumi/pulumi-aws#4377
- Update GitHub Actions workflows. by
[@&#8203;pulumi-bot](https://togithub.com/pulumi-bot) in
[pulumi/pulumi-aws#4381
- Upstream v5.63.0 by [@&#8203;t0yv0](https://togithub.com/t0yv0) in
[pulumi/pulumi-aws#4378
- Update GitHub Actions workflows. by
[@&#8203;pulumi-bot](https://togithub.com/pulumi-bot) in
[pulumi/pulumi-aws#4387

**Full Changelog**:
pulumi/pulumi-aws@v6.49.1...v6.50.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:eyJjcmVhdGVkSW5WZXIiOiIzOC40Ni4zIiwidXBkYXRlZEluVmVyIjoiMzguNDYuMyIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsidHlwZS9taW5vciJdfQ==-->

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
needs-release/minor When a PR with this label merges, it initiates a release of vX.Y+1.0
Projects
None yet
5 participants