Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

r/signalr: support for delta updates #8541

Merged
merged 3 commits into from
Sep 21, 2020
Merged

r/signalr: support for delta updates #8541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
752ff6d
r/signalr: support for delta updates
tombuildsstuff Sep 21, 2020
b2b9efd
r/signalr_service: adding missing features
tombuildsstuff Sep 21, 2020
02c8b3f
fixing the tests
tombuildsstuff Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 90 additions & 38 deletions azurerm/internal/services/signalr/resource_arm_signalr_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

func resourceArmSignalRService() *schema.Resource {
return &schema.Resource{
Create: resourceArmSignalRServiceCreateUpdate,
Create: resourceArmSignalRServiceCreate,
Read: resourceArmSignalRServiceRead,
Update: resourceArmSignalRServiceCreateUpdate,
Update: resourceArmSignalRServiceUpdate,
Delete: resourceArmSignalRServiceDelete,

Timeouts: &schema.ResourceTimeout{
Expand Down Expand Up @@ -164,34 +164,32 @@ func resourceArmSignalRService() *schema.Resource {
}
}

func resourceArmSignalRServiceCreateUpdate(d *schema.ResourceData, meta interface{}) error {
func resourceArmSignalRServiceCreate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).SignalR.Client
ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d)
ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
defer cancel()

name := d.Get("name").(string)
location := azure.NormalizeLocation(d.Get("location").(string))
resourceGroup := d.Get("resource_group_name").(string)

existing, err := client.Get(ctx, resourceGroup, name)
if err != nil {
if !utils.ResponseWasNotFound(existing.Response) {
return fmt.Errorf("Error checking for presence of existing SignalR %q (Resource Group %q): %+v", name, resourceGroup, err)
}
}

if existing.ID != nil && *existing.ID != "" {
return tf.ImportAsExistsError("azurerm_signalr_service", *existing.ID)
}

sku := d.Get("sku").([]interface{})
t := d.Get("tags").(map[string]interface{})
featureFlags := d.Get("features").([]interface{})
cors := d.Get("cors").([]interface{})
expandedTags := tags.Expand(t)

if d.IsNewResource() {
existing, err := client.Get(ctx, resourceGroup, name)
if err != nil {
if !utils.ResponseWasNotFound(existing.Response) {
return fmt.Errorf("Error checking for presence of existing SignalR %q (Resource Group %q): %+v", name, resourceGroup, err)
}
}

if existing.ID != nil && *existing.ID != "" {
return tf.ImportAsExistsError("azurerm_signalr_service", *existing.ID)
}
}

properties := &signalr.CreateOrUpdateProperties{
Cors: expandSignalRCors(cors),
Features: expandSignalRFeatures(featureFlags),
Expand All @@ -217,11 +215,11 @@ func resourceArmSignalRServiceCreateUpdate(d *schema.ResourceData, meta interfac
return err
}
if read.ID == nil {
return fmt.Errorf("SignalR %q (Resource Group %q) ID is empty", name, resourceGroup)
return fmt.Errorf("SignalR Service %q (Resource Group %q) ID is empty", name, resourceGroup)
}
d.SetId(*read.ID)

return resourceArmSignalRServiceRead(d, meta)
return resourceArmSignalRServiceUpdate(d, meta)
}

func resourceArmSignalRServiceRead(d *schema.ResourceData, meta interface{}) error {
Expand Down Expand Up @@ -283,6 +281,53 @@ func resourceArmSignalRServiceRead(d *schema.ResourceData, meta interface{}) err
return tags.FlattenAndSet(d, resp.Tags)
}

func resourceArmSignalRServiceUpdate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).SignalR.Client
ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := parse.SignalRServiceID(d.Id())
if err != nil {
return err
}

parameters := &signalr.UpdateParameters{}

if d.HasChanges("cors", "features") {
parameters.Properties = &signalr.CreateOrUpdateProperties{}

if d.HasChange("cors") {
corsRaw := d.Get("cors").([]interface{})
parameters.Properties.Cors = expandSignalRCors(corsRaw)
}

if d.HasChange("features") {
featuresRaw := d.Get("features").([]interface{})
parameters.Properties.Features = expandSignalRFeatures(featuresRaw)
}
}

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

if d.HasChange("tags") {
tagsRaw := d.Get("tags").(map[string]interface{})
parameters.Tags = tags.Expand(tagsRaw)
}

future, err := client.Update(ctx, id.ResourceGroup, id.Name, parameters)
if err != nil {
return fmt.Errorf("updating SignalR Service %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
}
if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
return fmt.Errorf("waiting for the update of SignalR Service %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
}

return resourceArmSignalRServiceRead(d, meta)
}

func resourceArmSignalRServiceDelete(d *schema.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).SignalR.Client
ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
Expand All @@ -296,13 +341,13 @@ func resourceArmSignalRServiceDelete(d *schema.ResourceData, meta interface{}) e
future, err := client.Delete(ctx, id.ResourceGroup, id.Name)
if err != nil {
if !response.WasNotFound(future.Response()) {
return fmt.Errorf("Error deleting SignalR %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
return fmt.Errorf("deleting SignalR Service %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
}
return nil
}
if err := future.WaitForCompletionRef(ctx, client.Client); err != nil {
if !response.WasNotFound(future.Response()) {
return fmt.Errorf("Error waiting for the deletion of SignalR %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
return fmt.Errorf("waiting for the deletion of SignalR Service %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
}
}

Expand All @@ -326,19 +371,21 @@ func expandSignalRFeatures(input []interface{}) *[]signalr.Feature {
}

func flattenSignalRFeatures(features *[]signalr.Feature) []interface{} {
if features == nil {
return []interface{}{}
}

result := make([]interface{}, 0)
if features != nil {
for _, feature := range *features {
value := ""
if feature.Value != nil {
value = *feature.Value
}

result = append(result, map[string]interface{}{
"flag": string(feature.Flag),
"value": value,
})
for _, feature := range *features {
value := ""
if feature.Value != nil {
value = *feature.Value
}

result = append(result, map[string]interface{}{
"flag": string(feature.Flag),
"value": value,
})
}
return result
}
Expand Down Expand Up @@ -395,15 +442,20 @@ func flattenSignalRServiceSku(input *signalr.ResourceSku) []interface{} {
return []interface{}{}
}

result := make(map[string]interface{})
capacity := 0
if input.Capacity != nil {
capacity = int(*input.Capacity)
}

name := ""
if input.Name != nil {
result["name"] = *input.Name
name = *input.Name
}

if input.Capacity != nil {
result["capacity"] = *input.Capacity
return []interface{}{
map[string]interface{}{
"capacity": capacity,
"name": name,
},
}

return []interface{}{result}
}
10 changes: 10 additions & 0 deletions azurerm/internal/services/signalr/tests/resource_arm_signalr_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,16 @@ resource "azurerm_signalr_service" "test" {
flag = "ServiceMode"
value = "%s"
}

features {
flag = "EnableConnectivityLogs"
value = "False"
}

features {
flag = "EnableMessagingLogs"
value = "False"
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, serviceMode)
}
Expand Down