Skip to content

Commit

Permalink
azurerm_signalr_service - add public_network_access_enabled, `loc…
Browse files Browse the repository at this point in the history 
…al_auth_enabled`, `aad_auth_enabled`, `tls_client_cert_enabled`, `serverless_connection_timeout_in_seconds` that were introduced in latest 2023-02-01 api (#20975)
  • Loading branch information
@xiaxyi
xiaxyi authored Mar 21, 2023
1 parent 8078c35 commit dd7f580
Show file tree
Hide file tree
Showing 5 changed files with 439 additions and 6 deletions.
54 changes: 54 additions & 0 deletions internal/services/signalr/signalr_service_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package signalr

import (
"fmt"
"strings"
"time"

"github.com/hashicorp/go-azure-helpers/lang/response"
Expand Down Expand Up @@ -55,6 +56,31 @@ func dataSourceArmSignalRService() *pluginsdk.Resource {
Computed: true,
},

"local_auth_enabled": {
Type: pluginsdk.TypeBool,
Computed: true,
},

"aad_auth_enabled": {
Type: pluginsdk.TypeBool,
Computed: true,
},

"public_network_access_enabled": {
Type: pluginsdk.TypeBool,
Computed: true,
},

"tls_client_cert_enabled": {
Type: pluginsdk.TypeBool,
Computed: true,
},

"serverless_connection_timeout_in_seconds": {
Type: pluginsdk.TypeInt,
Computed: true,
},

"primary_access_key": {
Type: pluginsdk.TypeString,
Computed: true,
Expand Down Expand Up @@ -117,6 +143,34 @@ func dataSourceArmSignalRServiceRead(d *pluginsdk.ResourceData, meta interface{}
d.Set("ip_address", props.ExternalIP)
d.Set("public_port", props.PublicPort)
d.Set("server_port", props.ServerPort)

aadAuthEnabled := true
if props.DisableAadAuth != nil {
aadAuthEnabled = !(*props.DisableAadAuth)
}
d.Set("aad_auth_enabled", aadAuthEnabled)

localAuthEnabled := true
if props.DisableLocalAuth != nil {
localAuthEnabled = !(*props.DisableLocalAuth)
}
d.Set("local_auth_enabled", localAuthEnabled)

publicNetworkAccessEnabled := true
if props.PublicNetworkAccess != nil {
publicNetworkAccessEnabled = strings.EqualFold(*props.PublicNetworkAccess, "Enabled")
}
d.Set("public_network_access_enabled", publicNetworkAccessEnabled)

tlsClientCertEnabled := false
if props.Tls != nil && props.Tls.ClientCertEnabled != nil {
tlsClientCertEnabled = *props.Tls.ClientCertEnabled
}
d.Set("tls_client_cert_enabled", tlsClientCertEnabled)

if props.Serverless != nil && props.Serverless.ConnectionTimeoutInSeconds != nil {
d.Set("serverless_connection_timeout_in_seconds", int(*props.Serverless.ConnectionTimeoutInSeconds))
}
}

if err := tags.FlattenAndSet(d, model.Tags); err != nil {
Expand Down
166 changes: 160 additions & 6 deletions internal/services/signalr/signalr_service_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-sdk/resource-manager/signalr/2023-02-01/signalr"
Expand Down Expand Up @@ -104,13 +105,44 @@ func resourceArmSignalRServiceCreate(d *pluginsdk.ResourceData, meta interface{}
return fmt.Errorf("Upstream configurations are only allowed when the SignalR Service is in `Serverless` mode")
}

publicNetworkAcc := "Enabled"
if !d.Get("public_network_access_enabled").(bool) {
publicNetworkAcc = "Disabled"
}

tlsClientCertEnabled := d.Get("tls_client_cert_enabled").(bool)

if expandSignalRServiceSku(sku).Name == "Free_F1" {
if publicNetworkAcc == "Disabled" {
return fmt.Errorf("SKU Free_F1 does not support disabling public network access")
}
if tlsClientCertEnabled {
return fmt.Errorf("SKU Free_F1 does not support enabling tls client cert")
}
}

identity, err := identity.ExpandSystemOrUserAssignedMap(d.Get("identity").([]interface{}))
if err != nil {
return fmt.Errorf("expanding `identity`: %+v", err)
}

resourceType := signalr.SignalRResource{
Location: utils.String(location),
Identity: identity,
Properties: &signalr.SignalRProperties{
Cors: expandSignalRCors(cors),
Features: &expandedFeatures,
Upstream: expandUpstreamSettings(upstreamSettings),
LiveTraceConfiguration: expandSignalRLiveTraceConfig(d.Get("live_trace").([]interface{})),
PublicNetworkAccess: utils.String(publicNetworkAcc),
DisableAadAuth: utils.Bool(!d.Get("aad_auth_enabled").(bool)),
DisableLocalAuth: utils.Bool(!d.Get("local_auth_enabled").(bool)),
Tls: &signalr.SignalRTlsSettings{
ClientCertEnabled: utils.Bool(tlsClientCertEnabled),
},
Serverless: &signalr.ServerlessSettings{
ConnectionTimeoutInSeconds: utils.Int64(int64(d.Get("serverless_connection_timeout_in_seconds").(int))),
},
},
Sku: expandSignalRServiceSku(sku),
Tags: tags.Expand(d.Get("tags").(map[string]interface{})),
Expand Down Expand Up @@ -189,6 +221,34 @@ func resourceArmSignalRServiceRead(d *pluginsdk.ResourceData, meta interface{})
d.Set("live_trace_enabled", liveTraceEnabled)
d.Set("service_mode", serviceMode)

aadAuthEnabled := true
if props.DisableAadAuth != nil {
aadAuthEnabled = !(*props.DisableAadAuth)
}
d.Set("aad_auth_enabled", aadAuthEnabled)

localAuthEnabled := true
if props.DisableLocalAuth != nil {
localAuthEnabled = !(*props.DisableLocalAuth)
}
d.Set("local_auth_enabled", localAuthEnabled)

publicNetworkAccessEnabled := true
if props.PublicNetworkAccess != nil {
publicNetworkAccessEnabled = strings.EqualFold(*props.PublicNetworkAccess, "Enabled")
}
d.Set("public_network_access_enabled", publicNetworkAccessEnabled)

tlsClientCertEnabled := false
if props.Tls != nil && props.Tls.ClientCertEnabled != nil {
tlsClientCertEnabled = *props.Tls.ClientCertEnabled
}
d.Set("tls_client_cert_enabled", tlsClientCertEnabled)

if props.Serverless != nil && props.Serverless.ConnectionTimeoutInSeconds != nil {
d.Set("serverless_connection_timeout_in_seconds", int(*props.Serverless.ConnectionTimeoutInSeconds))
}

if err := d.Set("cors", flattenSignalRCors(props.Cors)); err != nil {
return fmt.Errorf("setting `cors`: %+v", err)
}
Expand All @@ -201,6 +261,14 @@ func resourceArmSignalRServiceRead(d *pluginsdk.ResourceData, meta interface{})
return fmt.Errorf("setting `live_trace`:%+v", err)
}

identity, err := identity.FlattenSystemOrUserAssignedMap(model.Identity)
if err != nil {
return fmt.Errorf("flattening `identity`: %+v", err)
}
if err := d.Set("identity", identity); err != nil {
return fmt.Errorf("setting `identity`: %+v", err)
}

if err := tags.FlattenAndSet(d, model.Tags); err != nil {
return err
}
Expand Down Expand Up @@ -229,7 +297,23 @@ func resourceArmSignalRServiceUpdate(d *pluginsdk.ResourceData, meta interface{}

resourceType := signalr.SignalRResource{}

if d.HasChanges("cors", "features", "upstream_endpoint", "connectivity_logs_enabled", "messaging_logs_enabled", "service_mode", "live_trace_enabled", "live_trace") {
existing, err := client.Get(ctx, *id)
if err != nil {
return fmt.Errorf("retrieving %s: %+v", *id, err)
}

currentSku := ""
if existing.Model != nil && existing.Model.Sku != nil {
currentSku = existing.Model.Sku.Name
}

if d.HasChange("sku") {
sku := d.Get("sku").([]interface{})
resourceType.Sku = expandSignalRServiceSku(sku)
currentSku = resourceType.Sku.Name
}

if d.HasChanges("cors", "features", "upstream_endpoint", "connectivity_logs_enabled", "messaging_logs_enabled", "service_mode", "live_trace_enabled", "live_trace", "public_network_access_enabled", "local_auth_enabled", "aad_auth_enabled", "tls_client_cert_enabled", "serverless_connection_timeout_in_seconds") {
resourceType.Properties = &signalr.SignalRProperties{}

if d.HasChange("cors") {
Expand All @@ -241,6 +325,49 @@ func resourceArmSignalRServiceUpdate(d *pluginsdk.ResourceData, meta interface{}
resourceType.Properties.LiveTraceConfiguration = expandSignalRLiveTraceConfig(d.Get("live_trace").([]interface{}))
}

if d.HasChange("public_network_access_enabled") {
publicNetworkAcc := "Enabled"
if !d.Get("public_network_access_enabled").(bool) {
publicNetworkAcc = "Disabled"
}
if currentSku == "Free_F1" && publicNetworkAcc == "Disabled" {
return fmt.Errorf("SKU Free_F1 does not support disabling public network access")
}
resourceType.Properties.PublicNetworkAccess = utils.String(publicNetworkAcc)
}

if d.HasChange("local_auth_enabled") {
resourceType.Properties.DisableLocalAuth = utils.Bool(!d.Get("local_auth_enabled").(bool))
}

if d.HasChange("aad_auth_enabled") {
resourceType.Properties.DisableAadAuth = utils.Bool(!d.Get("aad_auth_enabled").(bool))
}

if d.HasChange("tls_client_cert_enabled") {
tlsClientCertEnabled := d.Get("tls_client_cert_enabled").(bool)
resourceType.Properties.Tls = &signalr.SignalRTlsSettings{
ClientCertEnabled: utils.Bool(tlsClientCertEnabled),
}
if currentSku == "Free_F1" && tlsClientCertEnabled {
return fmt.Errorf("SKU Free_F1 does not support enabling tls client cert")
}
}

if d.HasChange("serverless_connection_timeout_in_seconds") {
resourceType.Properties.Serverless = &signalr.ServerlessSettings{
ConnectionTimeoutInSeconds: utils.Int64(int64(d.Get("serverless_connection_timeout_in_seconds").(int))),
}
}

if d.HasChange("identity") {
identity, err := identity.ExpandSystemOrUserAssignedMap(d.Get("identity").([]interface{}))
if err != nil {
return fmt.Errorf("expanding `identity`: %+v", err)
}
resourceType.Identity = identity
}

if d.HasChanges("connectivity_logs_enabled", "messaging_logs_enabled", "service_mode", "live_trace_enabled") {
features := make([]signalr.SignalRFeature, 0)
if d.HasChange("connectivity_logs_enabled") {
Expand Down Expand Up @@ -283,11 +410,6 @@ func resourceArmSignalRServiceUpdate(d *pluginsdk.ResourceData, meta interface{}
}
}

if d.HasChange("sku") {
sku := d.Get("sku").([]interface{})
resourceType.Sku = expandSignalRServiceSku(sku)
}

if d.HasChange("tags") {
tagsRaw := d.Get("tags").(map[string]interface{})
resourceType.Tags = tags.Expand(tagsRaw)
Expand Down Expand Up @@ -652,6 +774,36 @@ func resourceArmSignalRServiceSchema() map[string]*pluginsdk.Schema {
},
},

"public_network_access_enabled": {
Type: pluginsdk.TypeBool,
Optional: true,
Default: true,
},

"local_auth_enabled": {
Type: pluginsdk.TypeBool,
Optional: true,
Default: true,
},

"aad_auth_enabled": {
Type: pluginsdk.TypeBool,
Optional: true,
Default: true,
},

"tls_client_cert_enabled": {
Type: pluginsdk.TypeBool,
Optional: true,
Default: false,
},

"serverless_connection_timeout_in_seconds": {
Type: pluginsdk.TypeInt,
Optional: true,
Default: 30,
},

"service_mode": {
Type: pluginsdk.TypeString,
Optional: true,
Expand Down Expand Up @@ -721,6 +873,8 @@ func resourceArmSignalRServiceSchema() map[string]*pluginsdk.Schema {
},
},

"identity": commonschema.SystemOrUserAssignedIdentityOptional(),

"hostname": {
Type: pluginsdk.TypeString,
Computed: true,
Expand Down
Loading

0 comments on commit dd7f580

Please sign in to comment.