From 64dd584507d14978c7a85d1a66196eba8b8e6b6f Mon Sep 17 00:00:00 2001 From: Charlie Conneely Date: Thu, 26 Sep 2024 12:21:33 +0100 Subject: [PATCH] Minor refactoring of auth division data source --- .../data_source_genesyscloud_auth_division.go | 11 ++++++----- .../auth_division/genesyscloud_auth_division_proxy.go | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/genesyscloud/auth_division/data_source_genesyscloud_auth_division.go b/genesyscloud/auth_division/data_source_genesyscloud_auth_division.go index 844799e69..06dda686b 100644 --- a/genesyscloud/auth_division/data_source_genesyscloud_auth_division.go +++ b/genesyscloud/auth_division/data_source_genesyscloud_auth_division.go @@ -21,11 +21,12 @@ func dataSourceAuthDivisionRead(ctx context.Context, d *schema.ResourceData, m i // Query division by name. Retry in case search has not yet indexed the division. return util.WithRetries(ctx, 15*time.Second, func() *retry.RetryError { divisionId, resp, retryable, getErr := proxy.getAuthDivisionIdByName(ctx, name) - if getErr != nil && !retryable { - return retry.NonRetryableError(util.BuildWithRetriesApiDiagnosticError(resourceName, fmt.Sprintf("Error requesting division %s | error: %s", name, getErr), resp)) - } - if retryable { - return retry.RetryableError(util.BuildWithRetriesApiDiagnosticError(resourceName, fmt.Sprintf("Error requesting division %s | error: %s", name, getErr), resp)) + if getErr != nil { + errorDetails := util.BuildWithRetriesApiDiagnosticError(resourceName, fmt.Sprintf("Error requesting division %s | error: %s", name, getErr), resp) + if !retryable { + return retry.NonRetryableError(errorDetails) + } + return retry.RetryableError(errorDetails) } d.SetId(divisionId) diff --git a/genesyscloud/auth_division/genesyscloud_auth_division_proxy.go b/genesyscloud/auth_division/genesyscloud_auth_division_proxy.go index ca6f76d5c..b5cc3532e 100644 --- a/genesyscloud/auth_division/genesyscloud_auth_division_proxy.go +++ b/genesyscloud/auth_division/genesyscloud_auth_division_proxy.go @@ -131,13 +131,15 @@ func getAuthDivisionByIdFn(ctx context.Context, p *authDivisionProxy, id string, } func getAuthDivisionIdByNameFn(ctx context.Context, p *authDivisionProxy, name string) (string, *platformclientv2.APIResponse, bool, error) { + notFoundError := fmt.Errorf("unable to find auth division with name %s", name) + authzDivisions, resp, err := getAllAuthDivisionFn(ctx, p, name) if err != nil { return "", resp, false, err } if authzDivisions == nil || len(*authzDivisions) == 0 { - return "", resp, true, err + return "", resp, true, notFoundError } for _, authzDivision := range *authzDivisions { @@ -147,7 +149,7 @@ func getAuthDivisionIdByNameFn(ctx context.Context, p *authDivisionProxy, name s } } - return "", resp, true, fmt.Errorf("unable to find auth division with name %s", name) + return "", resp, true, notFoundError } func updateAuthDivisionFn(ctx context.Context, p *authDivisionProxy, id string, authDivision *platformclientv2.Authzdivision) (*platformclientv2.Authzdivision, *platformclientv2.APIResponse, error) {