cognitive_account_rai_blocklist_resource - support tags property and add validation for name property
#31871
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,18 @@ | ||
| // Copyright IBM Corp. 2014, 2026 | ||
| // SPDX-License-Identifier: MPL-2.0 | ||
|
|
||
| package validate | ||
|
|
||
| import ( | ||
| "regexp" | ||
|
|
||
| "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" | ||
| "github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation" | ||
| ) | ||
|
|
||
| func RaiBlocklistName() pluginsdk.SchemaValidateFunc { | ||
| return validation.StringMatch( | ||
| regexp.MustCompile("^[a-zA-Z0-9_-]{2,64}$"), | ||
| "The RAI Blocklist Name must be between 2 and 64 characters long, contain only alphanumeric characters, hyphens(-) or underscores(_).", | ||
| ) | ||
| } |
This file contains hidden or 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,116 @@ | ||
| // Copyright IBM Corp. 2014, 2026 | ||
| // SPDX-License-Identifier: MPL-2.0 | ||
|
|
||
| package validate | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestValidateCognitiveServicesRaiBlocklistName(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| input string | ||
| valid bool | ||
| }{ | ||
| { | ||
| name: "empty name", | ||
| input: "", | ||
| valid: false, | ||
| }, | ||
| { | ||
| name: "Invalid single character", | ||
| input: "a", | ||
| valid: false, | ||
| }, | ||
| { | ||
| name: "Valid two characters", | ||
| input: "ab", | ||
| valid: true, | ||
| }, | ||
| { | ||
| name: "Valid alphanumeric", | ||
| input: "hello1", | ||
| valid: true, | ||
| }, | ||
| { | ||
| name: "Valid contains underscore", | ||
| input: "hello_world", | ||
| valid: true, | ||
| }, | ||
| { | ||
| name: "Valid contains hyphen", | ||
| input: "hello-world", | ||
| valid: true, | ||
| }, | ||
| { | ||
| name: "Valid starts with digit", | ||
| input: "1hello", | ||
| valid: true, | ||
| }, | ||
| { | ||
| name: "Valid starts with underscore", | ||
| input: "_hello", | ||
| valid: true, | ||
| }, | ||
| { | ||
| name: "Valid starts with hyphen", | ||
| input: "-hello", | ||
| valid: true, | ||
| }, | ||
| { | ||
| name: "Valid ends with underscore", | ||
| input: "hello_", | ||
| valid: true, | ||
| }, | ||
| { | ||
| name: "Valid ends with hyphen", | ||
| input: "hello-", | ||
| valid: true, | ||
| }, | ||
| { | ||
| name: "Invalid contains period", | ||
| input: "a.bc", | ||
| valid: false, | ||
| }, | ||
| { | ||
| name: "Invalid contains whitespace", | ||
| input: "a bc", | ||
| valid: false, | ||
| }, | ||
| { | ||
| name: "Invalid contains special character", | ||
| input: "a@bc", | ||
| valid: false, | ||
| }, | ||
| { | ||
| name: "contains slash", | ||
| input: "a/bc", | ||
| valid: false, | ||
| }, | ||
| { | ||
| name: "Valid 64 characters", | ||
| input: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789012", | ||
| valid: true, | ||
| }, | ||
| { | ||
| name: "Invalid starts with period", | ||
| input: ".heyo", | ||
| valid: false, | ||
| }, | ||
| { | ||
| name: "Invalid 65 characters", | ||
| input: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890123", | ||
| valid: false, | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| _, err := RaiBlocklistName()(tt.input, "") | ||
| valid := err == nil | ||
| if valid != tt.valid { | ||
| t.Errorf("Expected valid status %t but got %t for input %s", tt.valid, valid, tt.input) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
Collaborator
There was a problem hiding this comment. Nice 👍, thank you for adding unit tests |
||
This file contains hidden or 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
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.
Wrapping this in a
!= nilif block is not necessary. Ifmodel.Tagsis nil (zero value for map),pointer.Towill still return a pointer to this zero value and subsequent JSON serialisation logic will handle this just fine.Do a codebase search for
Tags.*pointer\.Toand observe how we never wrap such code in this kind of if block.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.
Fixed