web_app_hybrid_connection_resource and function_app_hybrid_connection_resource should retrieve the sendKey by either hybrid connection ID or the relay ID

[stuartjbrown]

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 "+1" or "me too" comments, they generate extra noise for PR followers and do not help prioritize for review

Description

This fixes retrieving the sendKey during creation of the web app or function app hybrid connection resource. The current main branch acceptance tests for the same are failing - this PR fixes those tests, see for example:

terraform-provider-azurerm/internal/services/appservice/web_app_hybrid_connection_resource_test.go

Line 74 in ac13fcc

func TestAccWebAppHybridConnection_sendRule(t *testing.T) {

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)

Change Log

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

• web_app_hybrid_connection_resource and function_app_hybrid_connection_resource - fixes internal retrieval of the sendKeyValue for the sendKeyName

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 #0000

Note

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

[manicminer]

@stuartjbrown Thanks for the PR! Unfortunately I'm seeing test failures that are passing on main.

• TestAccFunctionAppHybridConnection_basic
• TestAccFunctionAppHybridConnection_requiresImport
• TestAccFunctionAppHybridConnection_update
• TestAccWebAppHybridConnection_basic
• TestAccWebAppHybridConnection_requiresImport
• TestAccWebAppHybridConnection_update

are all failing with:

------- Stdout: -------
=== RUN   TestAccFunctionAppHybridConnection_basic
=== PAUSE TestAccFunctionAppHybridConnection_basic
=== CONT  TestAccFunctionAppHybridConnection_basic
    testcase.go:113: Step 1/2 error: Error running apply: exit status 1
        Error: listing Send Keys for Hybrid Connection Authorization Rule (Subscription: "*******"
        Resource Group Name: "acctestRG-240326203120243221"
        Namespace Name: "acctest-RN-240326203120243221"
        Hybrid Connection Name: "acctest-RHC-240326203120243221"
        Authorization Rule Name: "RootManageSharedAccessKey") in Relay (Subscription: "*******"
        Resource Group Name: "acctestRG-240326203120243221"
        Site Name: "acctest-WFA-240326203120243221"
        Hybrid Connection Namespace Name: "acctest-RN-240326203120243221"
        Relay Name: "acctest-RHC-240326203120243221"): unexpected status 404 (404 Not Found) with error: AuthorizationRuleNotFound: Authorization rule not found
          with azurerm_function_app_hybrid_connection.test,
          on terraform_plugin_test.tf line 75, in resource "azurerm_function_app_hybrid_connection" "test":
          75: resource "azurerm_function_app_hybrid_connection" "test" {
        listing Send Keys for Hybrid Connection Authorization Rule (Subscription:
        "*******"
        Resource Group Name: "acctestRG-240326203120243221"
        Namespace Name: "acctest-RN-240326203120243221"
        Hybrid Connection Name: "acctest-RHC-240326203120243221"
        Authorization Rule Name: "RootManageSharedAccessKey") in Relay (Subscription:
        "*******"
        Resource Group Name: "acctestRG-240326203120243221"
        Site Name: "acctest-WFA-240326203120243221"
        Hybrid Connection Namespace Name: "acctest-RN-240326203120243221"
        Relay Name: "acctest-RHC-240326203120243221"): unexpected status 404 (404 Not
        Found) with error: AuthorizationRuleNotFound: Authorization rule not found
--- FAIL: TestAccFunctionAppHybridConnection_basic (227.27s)
FAIL

[stuartjbrown]

@manicminer thanks for the heads up! I didn't check the other tests... I refactored the GetSendKeyValue helper somewhat to reflect the logic used in Read() - so we check first for the sendKeyName against the relay ID and then if we don't find that we check against the hybrid connection ID. This fixes all the tests for function and web app hybrid connection resources.

[manicminer]

@stuartjbrown Thanks for taking another look. The tests are passing and this LGTM 👍

[github-actions]

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.