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

azurerm_web_app_hybrid_connection: populate the sendKeyValue when creating the web app hybrid connection #23761

Merged
merged 6 commits into from
Mar 5, 2024
Merged

azurerm_web_app_hybrid_connection: populate the sendKeyValue when creating the web app hybrid connection #23761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ce417d
fix: populate the sendKeyValue when creating the WebApp hybrid connec…
stuartjbrown Nov 2, 2023
76eabfe
Update web_app_hybrid_connection_resource.go
katbyte Feb 9, 2024
068f89c
Merge branch 'main' into main
stuartjbrown Feb 12, 2024
4e2b8cd
fix: the send key value is already a string pointer
stuartjbrown Feb 12, 2024
6cbb1b0
feat: retrieve and use sendKeyValue for function app hybrid connections
stuartjbrown Feb 12, 2024
411c417
chore: formatting
stuartjbrown Feb 12, 2024
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
7 changes: 6 additions & 1 deletion internal/services/appservice/function_app_hybrid_connection_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,18 @@ func (r FunctionAppHybridConnectionResource) Create() sdk.ResourceFunc {
return tf.ImportAsExistsError(r.ResourceType(), id.ID())
}

key, err := helpers.GetSendKeyValue(ctx, metadata, id, appHybridConn.SendKeyName)
if err != nil {
return err
}

envelope := webapps.HybridConnection{
Properties: &webapps.HybridConnectionProperties{
RelayArmUri: pointer.To(relayId.ID()),
Hostname: pointer.To(appHybridConn.HostName),
Port: pointer.To(appHybridConn.HostPort),
SendKeyName: pointer.To(appHybridConn.SendKeyName),
SendKeyValue: pointer.To(""),
SendKeyValue: key,
},
}

Expand Down
7 changes: 6 additions & 1 deletion internal/services/appservice/web_app_hybrid_connection_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,18 @@ func (r WebAppHybridConnectionResource) Create() sdk.ResourceFunc {
return tf.ImportAsExistsError(r.ResourceType(), id.ID())
}

key, err := helpers.GetSendKeyValue(ctx, metadata, id, appHybridConn.SendKeyName)
if err != nil {
return err
}

envelope := webapps.HybridConnection{
Properties: &webapps.HybridConnectionProperties{
RelayArmUri: pointer.To(relayId.ID()),
Hostname: pointer.To(appHybridConn.HostName),
Port: pointer.To(appHybridConn.HostPort),
SendKeyName: pointer.To(appHybridConn.SendKeyName),
SendKeyValue: pointer.To(""),
SendKeyValue: key,
},
}

Expand Down
Loading