fix: email validation regex updated (#17)

* fix: email validation regex updated * chore: user_v2 minimal test updated
conduktor · Nov 4, 2024 · 8a28cc4 · 8a28cc4
1 parent ecc548f
commit 8a28cc4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/internal/provider/user_v2_resource_test.go b/internal/provider/user_v2_resource_test.go
@@ -69,7 +69,7 @@ func TestAccUserV2Minimal(t *testing.T) {
 			{
 				Config: providerConfig + test.TestAccTestdata(t, "user_v2_resource_minimal.tf"),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr("conduktor_user_v2.minimal", "name", "angela.martin@dunder.mifflin.com"),
+					resource.TestCheckResourceAttr("conduktor_user_v2.minimal", "name", "angela.martin@dunder-mifflin.com"),
 					resource.TestCheckResourceAttr("conduktor_user_v2.minimal", "spec.permissions.#", "0"),
 				),
 			},

diff --git a/internal/schema/resource_user_v2/user_v2_resource_gen.go b/internal/schema/resource_user_v2/user_v2_resource_gen.go
diff --git a/internal/testdata/user_v2_resource_minimal.tf b/internal/testdata/user_v2_resource_minimal.tf
@@ -1,6 +1,6 @@
 
 resource "conduktor_user_v2" "minimal" {
-  name = "angela.martin@dunder.mifflin.com"
+  name = "angela.martin@dunder-mifflin.com"
   spec {
   }
 }
diff --git a/provider_code_spec.json b/provider_code_spec.json
@@ -98,7 +98,7 @@
                         "path": "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
                       }
                     ],
-                    "schema_definition": "stringvalidator.RegexMatches(regexp.MustCompile(\"^([\\\\w\\\\-_.]*[^.])(@\\\\w+)(\\\\.\\\\w+(\\\\.\\\\w+)?[^.\\\\W])$\"), \"\")"
+                    "schema_definition": "stringvalidator.RegexMatches(regexp.MustCompile(\"^([\\\\w\\\\-_.]*[^.])@([\\\\w-]+\\\\.)+[\\\\w-]{2,4}$\"), \"\")"
                   }
                 }
               ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,7 +98,7 @@ @@
                             "path": "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
                           }
                         ],
-                        "schema_definition": "stringvalidator.RegexMatches(regexp.MustCompile(\"^([\\\\w\\\\-_.]*[^.])(@\\\\w+)(\\\\.\\\\w+(\\\\.\\\\w+)?[^.\\\\W])$\"), \"\")"
+                        "schema_definition": "stringvalidator.RegexMatches(regexp.MustCompile(\"^([\\\\w\\\\-_.]*[^.])@([\\\\w-]+\\\\.)+[\\\\w-]{2,4}$\"), \"\")"
                       }
                     }
                   ]
@@ Expand Down @@