From 0e2b90d0d88c0f2de2e1acd81bbac32147d696e9 Mon Sep 17 00:00:00 2001
From: Antoine LE TAXIN <aletaxin@scaleway.com>
Date: Wed, 22 Mar 2023 19:10:54 +0100
Subject: [PATCH] fix(regex): add test and fix changeset for new Scaleway
 access key regex

---
 .changeset/chilly-spies-melt.md       |  5 +++++
 .changeset/regex-20230322.md          |  5 -----
 packages/regex/src/__tests__/index.ts | 14 ++++++++++++++
 packages/regex/src/index.ts           |  3 +--
 4 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/chilly-spies-melt.md
 delete mode 100644 .changeset/regex-20230322.md

diff --git a/.changeset/chilly-spies-melt.md b/.changeset/chilly-spies-melt.md
new file mode 100644
index 000000000..02b5c3241
--- /dev/null
+++ b/.changeset/chilly-spies-melt.md
@@ -0,0 +1,5 @@
+---
+'@scaleway/regex': patch
+---
+
+Add Scaleway access key regex.
diff --git a/.changeset/regex-20230322.md b/.changeset/regex-20230322.md
deleted file mode 100644
index 0ad7b21c6..000000000
--- a/.changeset/regex-20230322.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@scaleway/regex': feat
----
-
-Add regex for Scaleway access key.
diff --git a/packages/regex/src/__tests__/index.ts b/packages/regex/src/__tests__/index.ts
index 1d527472d..41b498ad2 100644
--- a/packages/regex/src/__tests__/index.ts
+++ b/packages/regex/src/__tests__/index.ts
@@ -1,5 +1,6 @@
 import {
   absoluteLinuxPath,
+  accessKeyRegex,
   advancedDomainName,
   alpha,
   alphaDashes,
@@ -912,4 +913,17 @@ describe('@regex', () => {
       expect(dashedIpv4.test(string)).toBe(expected)
     })
   })
+
+  describe('accessKeyRegex', () => {
+    test.each([
+      ['12301234567891234567', false],
+      ['ABCABCDEFGHIJKLMNOPQ', false],
+      ['SCWabcdefghijklmnopq', true],
+      ['scw01234567891234567', true],
+      ['SCW01234567891234567', true],
+      ['SCWABCDEFGHIJKLMNOPQ', true],
+    ])('should match regex %s to be %s', (string, expected) => {
+      expect(accessKeyRegex.test(string)).toBe(expected)
+    })
+  })
 })
diff --git a/packages/regex/src/index.ts b/packages/regex/src/index.ts
index 01dcd6604..b8cacd05b 100644
--- a/packages/regex/src/index.ts
+++ b/packages/regex/src/index.ts
@@ -1,3 +1,4 @@
+export const accessKeyRegex = /^SCW[A-Z0-9]{17}$/i
 export const alpha = /^[a-zA-Z]*$/
 export const alphaLower = /^[a-z]+$/
 export const alphanum = /^[a-zA-Z0-9]*$/
@@ -78,5 +79,3 @@ export const ipv6Cidr = new RegExp(`^${cidrv6}$`)
 export const reverseDNS = /^[a-z0-9-]+(\.[a-z0-9-]{1,63})+(\.)$/
 export const dashedIpv4 =
   /(\b25[0-5]|\b2[0-4][0-9]|\b[01]?[0-9][0-9]?)(-(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}/
-
-export const accessKeyRegex = /^SCW[A-Z0-9]{17}$/i