From 4e16e75e200fca869b5a44ff62d205f285e94be5 Mon Sep 17 00:00:00 2001
From: tombuildsstuff <git@ibuildstuff.co.uk>
Date: Fri, 12 Nov 2021 12:31:33 +0100
Subject: [PATCH] r/signalr_service_network_acl: updating to use the native
 Resource ID validator function

---
 .../signalr_service_network_acl_resource.go   |  3 +-
 .../services/signalr/validate/service_id.go   | 21 ------
 .../signalr/validate/service_id_test.go       | 74 -------------------
 3 files changed, 1 insertion(+), 97 deletions(-)
 delete mode 100644 internal/services/signalr/validate/service_id.go
 delete mode 100644 internal/services/signalr/validate/service_id_test.go

diff --git a/internal/services/signalr/signalr_service_network_acl_resource.go b/internal/services/signalr/signalr_service_network_acl_resource.go
index 976a0bfc2333..413eca2ec67c 100644
--- a/internal/services/signalr/signalr_service_network_acl_resource.go
+++ b/internal/services/signalr/signalr_service_network_acl_resource.go
@@ -9,7 +9,6 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
 	networkValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/network/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/2020-05-01/signalr"
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
@@ -37,7 +36,7 @@ func resourceArmSignalRServiceNetworkACL() *pluginsdk.Resource {
 				Type:         pluginsdk.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: validate.ServiceID,
+				ValidateFunc: signalr.ValidateSignalRID,
 			},
 
 			"default_action": {
diff --git a/internal/services/signalr/validate/service_id.go b/internal/services/signalr/validate/service_id.go
deleted file mode 100644
index 0442fefc5875..000000000000
--- a/internal/services/signalr/validate/service_id.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package validate
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/2020-05-01/signalr"
-)
-
-func ServiceID(input interface{}, key string) (warnings []string, errors []error) {
-	v, ok := input.(string)
-	if !ok {
-		errors = append(errors, fmt.Errorf("expected %q to be a string", key))
-		return
-	}
-
-	if _, err := signalr.ParseSignalRID(v); err != nil {
-		errors = append(errors, err)
-	}
-
-	return
-}
diff --git a/internal/services/signalr/validate/service_id_test.go b/internal/services/signalr/validate/service_id_test.go
deleted file mode 100644
index a17761186a39..000000000000
--- a/internal/services/signalr/validate/service_id_test.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package validate
-
-import "testing"
-
-func TestServiceID(t *testing.T) {
-	cases := []struct {
-		Input string
-		Valid bool
-	}{
-
-		{
-			// empty
-			Input: "",
-			Valid: false,
-		},
-
-		{
-			// missing SubscriptionId
-			Input: "/",
-			Valid: false,
-		},
-
-		{
-			// missing value for SubscriptionId
-			Input: "/subscriptions/",
-			Valid: false,
-		},
-
-		{
-			// missing ResourceGroup
-			Input: "/subscriptions/12345678-1234-9876-4563-123456789012/",
-			Valid: false,
-		},
-
-		{
-			// missing value for ResourceGroup
-			Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/",
-			Valid: false,
-		},
-
-		{
-			// missing SignalRName
-			Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.",
-			Valid: false,
-		},
-
-		{
-			// missing value for SignalRName
-			Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.SignalRService/SignalR/",
-			Valid: false,
-		},
-
-		{
-			// valid
-			Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourceGroups/resGroup1/providers/Microsoft.SignalRService/SignalR/service1",
-			Valid: true,
-		},
-
-		{
-			// upper-cased
-			Input: "/SUBSCRIPTIONS/12345678-1234-9876-4563-123456789012/RESOURCEGROUPS/RESGROUP1/PROVIDERS/MICROSOFT.SIGNALRSERVICE/SIGNALR/SERVICE1",
-			Valid: false,
-		},
-	}
-	for _, tc := range cases {
-		t.Logf("[DEBUG] Testing Value %s", tc.Input)
-		_, errors := ServiceID(tc.Input, "test")
-		valid := len(errors) == 0
-
-		if tc.Valid != valid {
-			t.Fatalf("Expected %t but got %t", tc.Valid, valid)
-		}
-	}
-}