Merge pull request hashicorp#14150 from hashicorp/pandora-signalr-regen

signalr - regenerate embedded sdk
amccullough84 · Nov 12, 2021 · bf7f88e · bf7f88e
2 parents 3072fa8 + 853d95e
commit bf7f88e
Show file tree

Hide file tree

Showing 24 changed files with 1,413 additions and 799 deletions.
diff --git a/internal/services/network/private_endpoint_resource.go b/internal/services/network/private_endpoint_resource.go
@@ -7,6 +7,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/2020-05-01/signalr"
+
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network"
 	"github.com/hashicorp/go-azure-helpers/lang/response"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
@@ -623,6 +625,11 @@ func flattenPrivateLinkEndpointServiceConnection(serviceConnections *[]network.P
 						privateConnectionId = serverId.ID()
 					}
 				}
+				if strings.Contains(strings.ToLower(privateConnectionId), "microsoft.signalrservice") {
+					if serviceId, err := signalr.ParseSignalRIDInsensitively(privateConnectionId); err == nil {
+						privateConnectionId = serviceId.ID()
+					}
+				}
 				attrs["private_connection_resource_id"] = privateConnectionId
 			}
 

diff --git a/internal/services/signalr/migration/network_acl_v0_to_v1.go b/internal/services/signalr/migration/network_acl_v0_to_v1.go
@@ -0,0 +1,111 @@
+package migration
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/2020-05-01/signalr"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
+)
+
+var _ pluginsdk.StateUpgrade = NetworkAclV0ToV1{}
+
+type NetworkAclV0ToV1 struct {
+}
+
+func (n NetworkAclV0ToV1) Schema() map[string]*pluginsdk.Schema {
+	return map[string]*pluginsdk.Schema{
+		"signalr_service_id": {
+			Type:     pluginsdk.TypeString,
+			Required: true,
+			ForceNew: true,
+		},
+
+		"default_action": {
+			Type:     pluginsdk.TypeString,
+			Required: true,
+		},
+
+		"public_network": {
+			Type:     pluginsdk.TypeList,
+			Required: true,
+			MaxItems: 1,
+			Elem: &pluginsdk.Resource{
+				Schema: map[string]*pluginsdk.Schema{
+					"allowed_request_types": {
+						Type:          pluginsdk.TypeSet,
+						Optional:      true,
+						ConflictsWith: []string{"public_network.0.denied_request_types"},
+						Elem: &pluginsdk.Schema{
+							Type: pluginsdk.TypeString,
+						},
+					},
+
+					"denied_request_types": {
+						Type:          pluginsdk.TypeSet,
+						Optional:      true,
+						ConflictsWith: []string{"public_network.0.allowed_request_types"},
+						Elem: &pluginsdk.Schema{
+							Type: pluginsdk.TypeString,
+						},
+					},
+				},
+			},
+		},
+
+		"private_endpoint": {
+			Type:     pluginsdk.TypeSet,
+			Optional: true,
+			Elem: &pluginsdk.Resource{
+				Schema: map[string]*pluginsdk.Schema{
+					"id": {
+						Type:     pluginsdk.TypeString,
+						Required: true,
+					},
+
+					"allowed_request_types": {
+						Type:     pluginsdk.TypeSet,
+						Optional: true,
+						Elem: &pluginsdk.Schema{
+							Type: pluginsdk.TypeString,
+						},
+					},
+
+					"denied_request_types": {
+						Type:     pluginsdk.TypeSet,
+						Optional: true,
+						Elem: &pluginsdk.Schema{
+							Type: pluginsdk.TypeString,
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func (n NetworkAclV0ToV1) UpgradeFunc() pluginsdk.StateUpgraderFunc {
+	return func(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
+		log.Println("[DEBUG] Migrating SignalR Network ACL from v0 to v1 format")
+
+		// the old segment is `SignalR` but should be `signalR`
+		oldId := rawState["id"].(string)
+		parsed, err := signalr.ParseSignalRIDInsensitively(oldId)
+		if err != nil {
+			return rawState, fmt.Errorf("parsing Old Resource ID %q: %+v", oldId, err)
+		}
+
+		newId := parsed.ID()
+		log.Printf("[DEBUG] Updating ID from %q to %q", oldId, newId)
+		rawState["id"] = newId
+
+		// SignalR Service ID is the same as ID, but let's call the values out specifically
+		oldServiceId := rawState["signalr_service_id"].(string)
+		newServiceId := parsed.ID()
+		log.Printf("[DEBUG] Updating SignalR Service ID from %q to %q", oldServiceId, newServiceId)
+		rawState["signalr_service_id"] = newId
+
+		return rawState, nil
+	}
+}
diff --git a/internal/services/signalr/migration/service_v0_to_v1.go b/internal/services/signalr/migration/service_v0_to_v1.go
@@ -0,0 +1,200 @@
+package migration
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/sdk/2020-05-01/signalr"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
+)
+
+var _ pluginsdk.StateUpgrade = ServiceV0ToV1{}
+
+type ServiceV0ToV1 struct {
+}
+
+func (s ServiceV0ToV1) Schema() map[string]*pluginsdk.Schema {
+	return map[string]*pluginsdk.Schema{
+		"name": {
+			Type:     pluginsdk.TypeString,
+			Required: true,
+			ForceNew: true,
+		},
+
+		"location": {
+			Type:     pluginsdk.TypeString,
+			Required: true,
+			ForceNew: true,
+		},
+
+		"resource_group_name": {
+			Type:     pluginsdk.TypeString,
+			Required: true,
+			ForceNew: true,
+		},
+
+		"sku": {
+			Type:     pluginsdk.TypeList,
+			Required: true,
+			MaxItems: 1,
+			Elem: &pluginsdk.Resource{
+				Schema: map[string]*pluginsdk.Schema{
+					"name": {
+						Type:     pluginsdk.TypeString,
+						Required: true,
+					},
+
+					"capacity": {
+						Type:     pluginsdk.TypeInt,
+						Required: true,
+					},
+				},
+			},
+		},
+
+		"features": {
+			Type:     pluginsdk.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem: &pluginsdk.Resource{
+				Schema: map[string]*pluginsdk.Schema{
+					"flag": {
+						Type:     pluginsdk.TypeString,
+						Required: true,
+					},
+
+					"value": {
+						Type:     pluginsdk.TypeString,
+						Required: true,
+					},
+				},
+			},
+		},
+
+		"upstream_endpoint": {
+			Type:     pluginsdk.TypeSet,
+			Optional: true,
+			Elem: &pluginsdk.Resource{
+				Schema: map[string]*pluginsdk.Schema{
+					"category_pattern": {
+						Type:     pluginsdk.TypeList,
+						Required: true,
+						Elem: &pluginsdk.Schema{
+							Type: pluginsdk.TypeString,
+						},
+					},
+
+					"event_pattern": {
+						Type:     pluginsdk.TypeList,
+						Required: true,
+						Elem: &pluginsdk.Schema{
+							Type: pluginsdk.TypeString,
+						},
+					},
+
+					"hub_pattern": {
+						Type:     pluginsdk.TypeList,
+						Required: true,
+						Elem: &pluginsdk.Schema{
+							Type: pluginsdk.TypeString,
+						},
+					},
+
+					"url_template": {
+						Type:     pluginsdk.TypeString,
+						Required: true,
+					},
+				},
+			},
+		},
+
+		"cors": {
+			Type:     pluginsdk.TypeList,
+			Optional: true,
+			Computed: true,
+			Elem: &pluginsdk.Resource{
+				Schema: map[string]*pluginsdk.Schema{
+					"allowed_origins": {
+						Type:     pluginsdk.TypeSet,
+						Required: true,
+						Elem: &pluginsdk.Schema{
+							Type: pluginsdk.TypeString,
+						},
+					},
+				},
+			},
+		},
+
+		"hostname": {
+			Type:     pluginsdk.TypeString,
+			Computed: true,
+		},
+
+		"ip_address": {
+			Type:     pluginsdk.TypeString,
+			Computed: true,
+		},
+
+		"public_port": {
+			Type:     pluginsdk.TypeInt,
+			Computed: true,
+		},
+
+		"server_port": {
+			Type:     pluginsdk.TypeInt,
+			Computed: true,
+		},
+
+		"primary_access_key": {
+			Type:      pluginsdk.TypeString,
+			Computed:  true,
+			Sensitive: true,
+		},
+
+		"primary_connection_string": {
+			Type:      pluginsdk.TypeString,
+			Computed:  true,
+			Sensitive: true,
+		},
+
+		"secondary_access_key": {
+			Type:      pluginsdk.TypeString,
+			Computed:  true,
+			Sensitive: true,
+		},
+
+		"secondary_connection_string": {
+			Type:      pluginsdk.TypeString,
+			Computed:  true,
+			Sensitive: true,
+		},
+
+		"tags": {
+			Type:     pluginsdk.TypeMap,
+			Optional: true,
+			Elem: &pluginsdk.Schema{
+				Type: pluginsdk.TypeString,
+			},
+		},
+	}
+}
+
+func (s ServiceV0ToV1) UpgradeFunc() pluginsdk.StateUpgraderFunc {
+	return func(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
+		log.Println("[DEBUG] Migrating SignalR from v0 to v1 format")
+
+		// the old segment is `SignalR` but should be `signalR`
+		oldId := rawState["id"].(string)
+		parsed, err := signalr.ParseSignalRIDInsensitively(oldId)
+		if err != nil {
+			return rawState, fmt.Errorf("parsing Old Resource ID %q: %+v", oldId, err)
+		}
+
+		newId := parsed.ID()
+		log.Printf("[DEBUG] Updating ID from %q to %q", oldId, newId)
+		rawState["id"] = newId
+
+		return rawState, nil
+	}
+}