-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
Adding shared private link resource for the Azure web pubsub resource #15550
Merged
Merged
Changes from 6 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
15a742e
wps-privateSharedServices
xiaxyi a5d1b5d
add private link data source
xiaxyi d01043f
private link
xiaxyi 8511c56
Merge remote-tracking branch 'upstream/main' into f/wps/sharedPrivate…
xiaxyi f09cfac
private link
xiaxyi dd8e725
private link resource
xiaxyi 880f286
fmt
xiaxyi a03cff9
Merge remote-tracking branch 'upstream/main' into wps/privateLink
xiaxyi ea3aead
âupdate resource id per comment
xiaxyi 3f7a075
update ids
xiaxyi 22dca08
update upstream
xiaxyi ee652fd
update wps id
xiaxyi 4307d0e
remove test
xiaxyi 757095f
Merge remote-tracking branch 'upstream' into wps/privateLink
xiaxyi a256507
merging upstream
xiaxyi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
internal/services/signalr/parse/web_pubsub_shared_private_link_resource.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package parse | ||
|
|
||
| // NOTE: this file is generated via 'go:generate' - manual changes will be overwritten | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/hashicorp/go-azure-helpers/resourcemanager/resourceids" | ||
| ) | ||
|
|
||
| type WebPubsubSharedPrivateLinkResourceId struct { | ||
| SubscriptionId string | ||
| ResourceGroup string | ||
| WebPubSubName string | ||
| SharedPrivateLinkResourceName string | ||
| } | ||
|
|
||
| func NewWebPubsubSharedPrivateLinkResourceID(subscriptionId, resourceGroup, webPubSubName, sharedPrivateLinkResourceName string) WebPubsubSharedPrivateLinkResourceId { | ||
| return WebPubsubSharedPrivateLinkResourceId{ | ||
| SubscriptionId: subscriptionId, | ||
| ResourceGroup: resourceGroup, | ||
| WebPubSubName: webPubSubName, | ||
| SharedPrivateLinkResourceName: sharedPrivateLinkResourceName, | ||
| } | ||
| } | ||
|
|
||
| func (id WebPubsubSharedPrivateLinkResourceId) String() string { | ||
| segments := []string{ | ||
| fmt.Sprintf("Shared Private Link Resource Name %q", id.SharedPrivateLinkResourceName), | ||
| fmt.Sprintf("Web Pub Sub Name %q", id.WebPubSubName), | ||
| fmt.Sprintf("Resource Group %q", id.ResourceGroup), | ||
| } | ||
| segmentsStr := strings.Join(segments, " / ") | ||
| return fmt.Sprintf("%s: (%s)", "Web Pubsub Shared Private Link Resource", segmentsStr) | ||
| } | ||
|
|
||
| func (id WebPubsubSharedPrivateLinkResourceId) ID() string { | ||
| fmtString := "/subscriptions/%s/resourcegroups/%s/providers/Microsoft.SignalRService/WebPubSub/%s/sharedPrivateLinkResources/%s" | ||
| return fmt.Sprintf(fmtString, id.SubscriptionId, id.ResourceGroup, id.WebPubSubName, id.SharedPrivateLinkResourceName) | ||
| } | ||
|
|
||
| // WebPubsubSharedPrivateLinkResourceID parses a WebPubsubSharedPrivateLinkResource ID into an WebPubsubSharedPrivateLinkResourceId struct | ||
| func WebPubsubSharedPrivateLinkResourceID(input string) (*WebPubsubSharedPrivateLinkResourceId, error) { | ||
| id, err := resourceids.ParseAzureResourceID(input) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| resourceId := WebPubsubSharedPrivateLinkResourceId{ | ||
| SubscriptionId: id.SubscriptionID, | ||
| ResourceGroup: id.ResourceGroup, | ||
| } | ||
|
|
||
| if resourceId.SubscriptionId == "" { | ||
| return nil, fmt.Errorf("ID was missing the 'subscriptions' element") | ||
| } | ||
|
|
||
| if resourceId.ResourceGroup == "" { | ||
| return nil, fmt.Errorf("ID was missing the 'resourcegroups' element") | ||
| } | ||
|
|
||
| if resourceId.WebPubSubName, err = id.PopSegment("WebPubSub"); err != nil { | ||
| return nil, err | ||
| } | ||
| if resourceId.SharedPrivateLinkResourceName, err = id.PopSegment("sharedPrivateLinkResources"); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if err := id.ValidateNoEmptySegments(input); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &resourceId, nil | ||
| } |
128 changes: 128 additions & 0 deletions
128
internal/services/signalr/parse/web_pubsub_shared_private_link_resource_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| package parse | ||
|
|
||
| // NOTE: this file is generated via 'go:generate' - manual changes will be overwritten | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/hashicorp/go-azure-helpers/resourcemanager/resourceids" | ||
| ) | ||
|
|
||
| var _ resourceids.Id = WebPubsubSharedPrivateLinkResourceId{} | ||
|
|
||
| func TestWebPubsubSharedPrivateLinkResourceIDFormatter(t *testing.T) { | ||
| actual := NewWebPubsubSharedPrivateLinkResourceID("12345678-1234-9876-4563-123456789012", "resGroup1", "Webpubsub1", "resource1").ID() | ||
| expected := "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/resGroup1/providers/Microsoft.SignalRService/WebPubSub/Webpubsub1/sharedPrivateLinkResources/resource1" | ||
| if actual != expected { | ||
| t.Fatalf("Expected %q but got %q", expected, actual) | ||
| } | ||
| } | ||
|
|
||
| func TestWebPubsubSharedPrivateLinkResourceID(t *testing.T) { | ||
| testData := []struct { | ||
| Input string | ||
| Error bool | ||
| Expected *WebPubsubSharedPrivateLinkResourceId | ||
| }{ | ||
|
|
||
| { | ||
| // empty | ||
| Input: "", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing SubscriptionId | ||
| Input: "/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for SubscriptionId | ||
| Input: "/subscriptions/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing ResourceGroup | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for ResourceGroup | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing WebPubSubName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/resGroup1/providers/Microsoft.SignalRService/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for WebPubSubName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/resGroup1/providers/Microsoft.SignalRService/WebPubSub/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing SharedPrivateLinkResourceName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/resGroup1/providers/Microsoft.SignalRService/WebPubSub/Webpubsub1/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for SharedPrivateLinkResourceName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/resGroup1/providers/Microsoft.SignalRService/WebPubSub/Webpubsub1/sharedPrivateLinkResources/", | ||
| Error: true, | ||
| }, | ||
|
|
||
| { | ||
| // valid | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/resGroup1/providers/Microsoft.SignalRService/WebPubSub/Webpubsub1/sharedPrivateLinkResources/resource1", | ||
| Expected: &WebPubsubSharedPrivateLinkResourceId{ | ||
| SubscriptionId: "12345678-1234-9876-4563-123456789012", | ||
| ResourceGroup: "resGroup1", | ||
| WebPubSubName: "Webpubsub1", | ||
| SharedPrivateLinkResourceName: "resource1", | ||
| }, | ||
| }, | ||
|
|
||
| { | ||
| // upper-cased | ||
| Input: "/SUBSCRIPTIONS/12345678-1234-9876-4563-123456789012/RESOURCEGROUPS/RESGROUP1/PROVIDERS/MICROSOFT.SIGNALRSERVICE/WEBPUBSUB/WEBPUBSUB1/SHAREDPRIVATELINKRESOURCES/RESOURCE1", | ||
| Error: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, v := range testData { | ||
| t.Logf("[DEBUG] Testing %q", v.Input) | ||
|
|
||
| actual, err := WebPubsubSharedPrivateLinkResourceID(v.Input) | ||
| if err != nil { | ||
| if v.Error { | ||
| continue | ||
| } | ||
|
|
||
| t.Fatalf("Expect a value but got an error: %s", err) | ||
| } | ||
| if v.Error { | ||
| t.Fatal("Expect an error but didn't get one") | ||
| } | ||
|
|
||
| if actual.SubscriptionId != v.Expected.SubscriptionId { | ||
| t.Fatalf("Expected %q but got %q for SubscriptionId", v.Expected.SubscriptionId, actual.SubscriptionId) | ||
| } | ||
| if actual.ResourceGroup != v.Expected.ResourceGroup { | ||
| t.Fatalf("Expected %q but got %q for ResourceGroup", v.Expected.ResourceGroup, actual.ResourceGroup) | ||
| } | ||
| if actual.WebPubSubName != v.Expected.WebPubSubName { | ||
| t.Fatalf("Expected %q but got %q for WebPubSubName", v.Expected.WebPubSubName, actual.WebPubSubName) | ||
| } | ||
| if actual.SharedPrivateLinkResourceName != v.Expected.SharedPrivateLinkResourceName { | ||
| t.Fatalf("Expected %q but got %q for SharedPrivateLinkResourceName", v.Expected.SharedPrivateLinkResourceName, actual.SharedPrivateLinkResourceName) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
internal/services/signalr/validate/web_pubsub_shared_private_link_resource_id.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package validate | ||
|
|
||
| // NOTE: this file is generated via 'go:generate' - manual changes will be overwritten | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/hashicorp/terraform-provider-azurerm/internal/services/signalr/parse" | ||
| ) | ||
|
|
||
| func WebPubsubSharedPrivateLinkResourceID(input interface{}, key string) (warnings []string, errors []error) { | ||
| v, ok := input.(string) | ||
| if !ok { | ||
| errors = append(errors, fmt.Errorf("expected %q to be a string", key)) | ||
| return | ||
| } | ||
|
|
||
| if _, err := parse.WebPubsubSharedPrivateLinkResourceID(v); err != nil { | ||
| errors = append(errors, err) | ||
| } | ||
|
|
||
| return | ||
| } |
88 changes: 88 additions & 0 deletions
88
internal/services/signalr/validate/web_pubsub_shared_private_link_resource_id_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package validate | ||
|
|
||
| // NOTE: this file is generated via 'go:generate' - manual changes will be overwritten | ||
|
|
||
| import "testing" | ||
|
|
||
| func TestWebPubsubSharedPrivateLinkResourceID(t *testing.T) { | ||
| cases := []struct { | ||
| Input string | ||
| Valid bool | ||
| }{ | ||
|
|
||
| { | ||
| // empty | ||
| Input: "", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing SubscriptionId | ||
| Input: "/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for SubscriptionId | ||
| Input: "/subscriptions/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing ResourceGroup | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for ResourceGroup | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing WebPubSubName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/resGroup1/providers/Microsoft.SignalRService/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for WebPubSubName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/resGroup1/providers/Microsoft.SignalRService/WebPubSub/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing SharedPrivateLinkResourceName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/resGroup1/providers/Microsoft.SignalRService/WebPubSub/Webpubsub1/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // missing value for SharedPrivateLinkResourceName | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/resGroup1/providers/Microsoft.SignalRService/WebPubSub/Webpubsub1/sharedPrivateLinkResources/", | ||
| Valid: false, | ||
| }, | ||
|
|
||
| { | ||
| // valid | ||
| Input: "/subscriptions/12345678-1234-9876-4563-123456789012/resourcegroups/resGroup1/providers/Microsoft.SignalRService/WebPubSub/Webpubsub1/sharedPrivateLinkResources/resource1", | ||
| Valid: true, | ||
| }, | ||
|
|
||
| { | ||
| // upper-cased | ||
| Input: "/SUBSCRIPTIONS/12345678-1234-9876-4563-123456789012/RESOURCEGROUPS/RESGROUP1/PROVIDERS/MICROSOFT.SIGNALRSERVICE/WEBPUBSUB/WEBPUBSUB1/SHAREDPRIVATELINKRESOURCES/RESOURCE1", | ||
| Valid: false, | ||
| }, | ||
| } | ||
| for _, tc := range cases { | ||
| t.Logf("[DEBUG] Testing Value %s", tc.Input) | ||
| _, errors := WebPubsubSharedPrivateLinkResourceID(tc.Input, "test") | ||
| valid := len(errors) == 0 | ||
|
|
||
| if tc.Valid != valid { | ||
| t.Fatalf("Expected %t but got %t", tc.Valid, valid) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the casing here is wrong, this needs to be:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @tombuildsstuff, I will make resourceGroups as camel cased, however, for webPubSub oe, the service is returning the value as WebPubSub and this behavior is the same as its parent WebPubSub resource. Shall we keep it as capital cased?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should be correcting it to the proper case