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

azurerm_logic_app_action_http - omit queries when not specified #28447

Merged
merged 3 commits into from
Feb 4, 2025

Conversation

ziyeqf
Copy link
Contributor

@ziyeqf ziyeqf commented Jan 8, 2025

Community Note

  • Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
  • Please do not leave comments along the lines of "+1", "me too" or "any updates", they generate extra noise for PR followers and do not help prioritize for review

Description

empty map and nil have different definitions on the service side, omit it when it's not specified on configuration.

PR Checklist

  • I have followed the guidelines in our Contributing Documentation.
  • I have checked to ensure there aren't other open Pull Requests for the same update/change.
  • I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
  • I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
  • I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
    For example: “resource_name_here - description of change e.g. adding property new_property_name_here

Changes to existing Resource / Data Source

  • I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
  • I have written new tests for my resource or datasource changes & updated any relevent documentation.
  • I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
  • (For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

  • My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)
❯ tftest logic TestAccLogicAppActionHttp_
=== RUN   TestAccLogicAppActionHttp_basic
=== PAUSE TestAccLogicAppActionHttp_basic
=== RUN   TestAccLogicAppActionHttp_complete
=== PAUSE TestAccLogicAppActionHttp_complete
=== RUN   TestAccLogicAppActionHttp_requiresImport
=== PAUSE TestAccLogicAppActionHttp_requiresImport
=== RUN   TestAccLogicAppActionHttp_headers
=== PAUSE TestAccLogicAppActionHttp_headers
=== RUN   TestAccLogicAppActionHttp_queries
=== PAUSE TestAccLogicAppActionHttp_queries
=== RUN   TestAccLogicAppActionHttp_dynamicFunction
=== PAUSE TestAccLogicAppActionHttp_dynamicFunction
=== RUN   TestAccLogicAppActionHttp_bodyDiff
=== PAUSE TestAccLogicAppActionHttp_bodyDiff
=== RUN   TestAccLogicAppActionHttp_disappears
=== PAUSE TestAccLogicAppActionHttp_disappears
=== RUN   TestAccLogicAppActionHttp_runAfter
=== PAUSE TestAccLogicAppActionHttp_runAfter
=== CONT  TestAccLogicAppActionHttp_basic
=== CONT  TestAccLogicAppActionHttp_dynamicFunction
=== CONT  TestAccLogicAppActionHttp_headers
=== CONT  TestAccLogicAppActionHttp_disappears
=== CONT  TestAccLogicAppActionHttp_queries
=== CONT  TestAccLogicAppActionHttp_bodyDiff
=== CONT  TestAccLogicAppActionHttp_runAfter
=== CONT  TestAccLogicAppActionHttp_complete
--- PASS: TestAccLogicAppActionHttp_headers (113.97s)
=== CONT  TestAccLogicAppActionHttp_requiresImport
--- PASS: TestAccLogicAppActionHttp_queries (114.24s)
--- PASS: TestAccLogicAppActionHttp_disappears (116.67s)
--- PASS: TestAccLogicAppActionHttp_basic (132.71s)
--- PASS: TestAccLogicAppActionHttp_dynamicFunction (149.04s)
--- PASS: TestAccLogicAppActionHttp_complete (159.73s)
--- PASS: TestAccLogicAppActionHttp_requiresImport (74.80s)
--- PASS: TestAccLogicAppActionHttp_bodyDiff (216.38s)
--- PASS: TestAccLogicAppActionHttp_runAfter (222.35s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/logic 222.463s

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

This is a (please select all that apply):

  • Bug Fix
  • New Feature (ie adding a service, resource, or data source)
  • Enhancement
  • Breaking Change

Related Issue(s)

Fixes #28429

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

@ziyeqf ziyeqf marked this pull request as ready for review January 8, 2025 06:29
@ziyeqf ziyeqf requested a review from a team as a code owner January 8, 2025 06:29
Comment on lines +306 to +311
// per the issue https://github.com/hashicorp/terraform-provider-azurerm/issues/28429
// empty map and nil are different on the service side.
if len(queriesRaw) == 0 {
return nil, nil
}

Copy link
Member

Choose a reason for hiding this comment

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

@ziyeqf could you extend the following test case to add a second step where queries is removed and validate that this works for that case?

func TestAccLogicAppActionHttp_queries(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_logic_app_action_http", "test")
r := LogicAppActionHttpResource{}
data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.queries(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

@ziyeqf
Copy link
Contributor Author

ziyeqf commented Feb 3, 2025

Here is the result of extended test case

❯ tftest logic TestAccLogicAppActionHttp_queries
=== RUN   TestAccLogicAppActionHttp_queries
=== PAUSE TestAccLogicAppActionHttp_queries
=== CONT  TestAccLogicAppActionHttp_queries
--- PASS: TestAccLogicAppActionHttp_queries (242.09s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/logic 242.172s

Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

Thanks @ziyeqf LGTM 👍

@stephybun stephybun merged commit 9d969d4 into hashicorp:main Feb 4, 2025
30 checks passed
@github-actions github-actions bot added this to the v4.18.0 milestone Feb 4, 2025
stephybun added a commit that referenced this pull request Feb 4, 2025
@ziyeqf ziyeqf deleted the issue/28249 branch February 5, 2025 01:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

azurerm_logic_app_action_http implicitly setting the queries parameter
2 participants