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.

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

New Resource: azurerm_relay_hybrid_connection #4832

Merged
merged 20 commits into from
Nov 8, 2019
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Support UserMetadata
DSakura207 committed Nov 7, 2019
commit 8ee9c9b2ffd3d98ec4c8a15610d4932c09a6b9e3
17 changes: 8 additions & 9 deletions azurerm/resource_arm_relay_hybrid_connection.go
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@ import (
"time"

"github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay"
"github.com/hashicorp/terraform-plugin-sdk/helper/customdiff"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
@@ -54,17 +53,14 @@ func resourceArmHybridConnection() *schema.Resource {
"requires_client_authorization": {
Type: schema.TypeBool,
Default: true,
ForceNew: true,
Optional: true,
},
"user_metadata": {
Type: schema.TypeString,
Optional: true,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to add validation here?

Suggested change
Optional: true,
Optional: true,
ValidateFunc: validate.NoEmptyStrings,

},
},

CustomizeDiff: customdiff.Sequence(
// This is to prevent this error:
// All fields are ForceNew or Computed w/out Optional, Update is superfluous.
customdiff.ForceNewIfChange("requires_client_authorization", func(old, new, meta interface{}) bool {
return true
}),
),
}
}

@@ -79,10 +75,12 @@ func resourceArmHybridConnectionCreateUpdate(d *schema.ResourceData, meta interf
resourceGroup := d.Get("resource_group_name").(string)
relayNamespace := d.Get("relay_namespace_name").(string)
requireClientAuthroization := d.Get("requires_client_authorization").(bool)
userMetadata := d.Get("user_metadata").(string)

parameters := relay.HybridConnection{
HybridConnectionProperties: &relay.HybridConnectionProperties{
RequiresClientAuthorization: &requireClientAuthroization,
UserMetadata: &userMetadata,
},
}

@@ -133,6 +131,7 @@ func resourceArmHybridConnectionRead(d *schema.ResourceData, meta interface{}) e

if props := resp.HybridConnectionProperties; props != nil {
d.Set("requires_client_authorization", props.RequiresClientAuthorization)
d.Set("user_metadata", props.UserMetadata)
}

return nil