Merge pull request #16785 from pitwegner/master

Allow IDN domain names in annotations

.changeset/stale-files-sniff.md

@@ -0,0 +1,5 @@
+---
+'@backstage/catalog-model': minor
+---
+
+Modified the regex for DNS label validation to support IDN domains

packages/catalog-model/src/validation/CommonValidatorFunctions.test.ts

@@ -125,7 +125,7 @@ describe('CommonValidatorFunctions', () => {
     ['a-b', true],
     ['-a-b', false],
     ['a-b-', false],
-    ['a--b', false],
+    ['a--b', true],
     ['a_b', false],
     ['adam.bertil.caesar', true],
     ['adam.ber-til.caesar', true],
@@ -154,7 +154,8 @@ describe('CommonValidatorFunctions', () => {
     ['a-b', true],
     ['-a-b', false],
     ['a-b-', false],
-    ['a--b', false],
+    ['a--b', true],
+    ['xn--c6h', true],
     ['a_b', false],
     [`${'a'.repeat(63)}`, true],
     [`${'a'.repeat(64)}`, false],

packages/catalog-model/src/validation/CommonValidatorFunctions.ts

@@ -91,7 +91,7 @@ export class CommonValidatorFunctions {
       typeof value === 'string' &&
       value.length >= 1 &&
       value.length <= 63 &&
-      /^[a-z0-9]+(\-[a-z0-9]+)*$/.test(value)
+      /^[a-z0-9]+(?:\-+[a-z0-9]+)*$/.test(value)
     );
   }
 

packages/catalog-model/src/validation/KubernetesValidatorFunctions.test.ts

@@ -31,7 +31,7 @@ describe('KubernetesValidatorFunctions', () => {
     ['a/a', true],
     ['a/aAb5C', true],
     ['a-b.c/v1', true],
-    ['a--b.c/v1', false],
+    ['a--b.c/v1', true],
     [
       `${'a'.repeat(63)}.${'a'.repeat(63)}.${'a'.repeat(63)}.${'a'.repeat(
         61,
@@ -96,7 +96,7 @@ describe('KubernetesValidatorFunctions', () => {
     ['a-b', true],
     ['-a-b', false],
     ['a-b-', false],
-    ['a--b', false],
+    ['a--b', true],
     ['a_b', false],
     ['a.b', false],
   ])(`isValidNamespace %p ? %p`, (value, matches) => {
@@ -121,7 +121,7 @@ describe('KubernetesValidatorFunctions', () => {
     ['a..b', true],
     ['a/a', true],
     ['a-b.c/a', true],
-    ['a--b.c/a', false],
+    ['a--b.c/a', true],
     [
       `${'a'.repeat(63)}.${'a'.repeat(63)}.${'a'.repeat(63)}.${'a'.repeat(
         61,
@@ -178,7 +178,7 @@ describe('KubernetesValidatorFunctions', () => {
     ['a..b', true],
     ['a/a', true],
     ['a-b.c/a', true],
-    ['a--b.c/a', false],
+    ['a--b.c/a', true],
     [
       `${'a'.repeat(63)}.${'a'.repeat(63)}.${'a'.repeat(63)}.${'a'.repeat(
         61,