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

Add option in IoTHub to Enable Fallback Route #2764

Merged
merged 28 commits into from
Feb 22, 2019
Merged

Add option in IoTHub to Enable Fallback Route #2764

Changes from 7 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c901b63
Add option in IoTHub to Enable Fallback Route
BlueBasher Jan 25, 2019
e2097e6
Use correct syntax
BlueBasher Jan 25, 2019
ee5971f
Add missing comma
BlueBasher Jan 25, 2019
e76b2df
Ran goFmt
BlueBasher Jan 25, 2019
0a127d9
Use correct assignment
BlueBasher Jan 25, 2019
cd04f96
Use util methods
BlueBasher Jan 25, 2019
d36fbc3
Change fieldname to lowercase
BlueBasher Jan 25, 2019
897e65d
Added test and documentation
BlueBasher Jan 27, 2019
b9e4039
Option to change all values for the fallback route.
BlueBasher Jan 27, 2019
682f69c
Fix incorrect type
BlueBasher Jan 27, 2019
9016dcc
fallbackRoute elements should be optional
BlueBasher Jan 27, 2019
0a9bda2
Use single string for fallback route endpoint name.
BlueBasher Jan 27, 2019
641d5fd
Fix pointer indexing
BlueBasher Jan 27, 2019
2a20b2e
Fix pointer indexing
BlueBasher Jan 27, 2019
5c13bed
Updates based on review
BlueBasher Jan 29, 2019
48d0960
merge
BlueBasher Jan 29, 2019
4ba2e53
Fix merge error
BlueBasher Jan 29, 2019
848ef38
Add Condition to expandIoTHubFallbackRoute
BlueBasher Jan 29, 2019
8787f16
Fix invalid syntax for TestCheckResourceAttr
BlueBasher Jan 29, 2019
fd37921
Check if fallback_route has been supplied.
BlueBasher Jan 31, 2019
3046a14
Fix sytax error
BlueBasher Jan 31, 2019
9b281f2
Ran gofmt
BlueBasher Jan 31, 2019
7538300
read will now ignore default fallback route
katbyte Feb 19, 2019
a27985c
Merge branch 'master' into master-fallback
katbyte Feb 19, 2019
8ebf7f0
removed name, call update after create
katbyte Feb 19, 2019
74fa267
attempt to fix fallback
katbyte Feb 19, 2019
147464e
tidied up and fixed test
katbyte Feb 21, 2019
f264c60
git merge master -S
katbyte Feb 21, 2019
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
13 changes: 13 additions & 0 deletions azurerm/resource_arm_iothub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,12 @@ func resourceArmIotHub() *schema.Resource {
},
},

"enable_fallback_route": {
BlueBasher marked this conversation as resolved.
Show resolved Hide resolved
Type: schema.TypeBool,
Optional: true,
Default: true,
BlueBasher marked this conversation as resolved.
Show resolved Hide resolved
},

"tags": tagsSchema(),
},
}
Expand Down Expand Up @@ -292,6 +298,7 @@ func resourceArmIotHubCreateUpdate(d *schema.ResourceData, meta interface{}) err
location := azureRMNormalizeLocation(d.Get("location").(string))
skuInfo := expandIoTHubSku(d)
tags := d.Get("tags").(map[string]interface{})
enableFallbackRoute := d.Get("enable_fallback_route").(bool)

endpoints, err := expandIoTHubEndpoints(d, subscriptionID)
if err != nil {
Expand All @@ -308,6 +315,12 @@ func resourceArmIotHubCreateUpdate(d *schema.ResourceData, meta interface{}) err
Routing: &devices.RoutingProperties{
Endpoints: endpoints,
Routes: routes,
FallbackRoute: &devices.FallbackRouteProperties{
Name: utils.String("$fallback"),
BlueBasher marked this conversation as resolved.
Show resolved Hide resolved
Source: utils.String("DeviceMessages"),
EndpointNames: &[]string{"events"},
IsEnabled: utils.Bool(enableFallbackRoute),
},
},
},
Tags: expandTags(tags),
Expand Down