From 7d768f2c4d45e88ded2bfe5c797670460038b1a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Thu, 12 Sep 2024 17:49:46 +0200 Subject: [PATCH] fix: update list of names --- api/instance/v1/server_utils_test.go | 2 - .../v1/testdata/all-server-user-data.yaml | 196 +----------------- namegenerator/name_generator.go | 3 - 3 files changed, 4 insertions(+), 197 deletions(-) diff --git a/api/instance/v1/server_utils_test.go b/api/instance/v1/server_utils_test.go index cfc475d2..fbe079e1 100644 --- a/api/instance/v1/server_utils_test.go +++ b/api/instance/v1/server_utils_test.go @@ -95,12 +95,10 @@ func TestAPI_AllServerUserData(t *testing.T) { { "hello": "world", "scale": "way", - "xavier": "niel", "tic": "tac", "cloud-init": "on", }, { - "xavier": "niel", "scale": "way", "steve": "wozniak", "cloud-init": "off", diff --git a/api/instance/v1/testdata/all-server-user-data.yaml b/api/instance/v1/testdata/all-server-user-data.yaml index 20d168fe..523d688d 100644 --- a/api/instance/v1/testdata/all-server-user-data.yaml +++ b/api/instance/v1/testdata/all-server-user-data.yaml @@ -131,38 +131,6 @@ interactions: status: 204 No Content code: 204 duration: "" -- request: - body: niel - form: {} - headers: - Content-Type: - - text/plain - User-Agent: - - scaleway-sdk-go/0.0.0 (go1.12.5; darwin; amd64) - url: https://api.scaleway.com/instance/v1/zones/fr-par-1/servers/b2266f9f-d089-41be-84b7-0bd9690fc505/user_data/xavier - method: PATCH - response: - body: "" - headers: - Cache-Control: - - no-cache - Content-Security-Policy: - - default-src 'none'; frame-ancestors 'none' - Content-Type: - - text/plain - Date: - - Mon, 24 Jun 2019 17:26:48 GMT - Server: - - scaleway_api - Strict-Transport-Security: - - max-age=63072000 - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: 204 No Content - code: 204 - duration: "" - request: body: tac form: {} @@ -268,7 +236,7 @@ interactions: url: https://api.scaleway.com/instance/v1/zones/fr-par-1/servers/b2266f9f-d089-41be-84b7-0bd9690fc505/user_data method: GET response: - body: '{"user_data": ["cloud-init", "hello", "scale", "tic", "xavier"]}' + body: '{"user_data": ["cloud-init", "hello", "scale", "tic"]}' headers: Cache-Control: - no-cache @@ -419,38 +387,6 @@ interactions: status: 200 OK code: 200 duration: "" -- request: - body: "" - form: {} - headers: - User-Agent: - - scaleway-sdk-go/0.0.0 (go1.12.5; darwin; amd64) - url: https://api.scaleway.com/instance/v1/zones/fr-par-1/servers/b2266f9f-d089-41be-84b7-0bd9690fc505/user_data/xavier - method: GET - response: - body: niel - headers: - Cache-Control: - - no-cache - Content-Length: - - "4" - Content-Security-Policy: - - default-src 'none'; frame-ancestors 'none' - Content-Type: - - text/plain - Date: - - Mon, 24 Jun 2019 17:26:48 GMT - Server: - - scaleway_api - Strict-Transport-Security: - - max-age=63072000 - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: 200 OK - code: 200 - duration: "" - request: body: "" form: {} @@ -460,7 +396,7 @@ interactions: url: https://api.scaleway.com/instance/v1/zones/fr-par-1/servers/b2266f9f-d089-41be-84b7-0bd9690fc505/user_data method: GET response: - body: '{"user_data": ["cloud-init", "hello", "scale", "tic", "xavier"]}' + body: '{"user_data": ["cloud-init", "hello", "scale", "tic"]}' headers: Cache-Control: - no-cache @@ -603,36 +539,6 @@ interactions: status: 204 No Content code: 204 duration: "" -- request: - body: "" - form: {} - headers: - User-Agent: - - scaleway-sdk-go/0.0.0 (go1.12.5; darwin; amd64) - url: https://api.scaleway.com/instance/v1/zones/fr-par-1/servers/b2266f9f-d089-41be-84b7-0bd9690fc505/user_data/xavier - method: DELETE - response: - body: "" - headers: - Cache-Control: - - no-cache - Content-Security-Policy: - - default-src 'none'; frame-ancestors 'none' - Content-Type: - - application/json - Date: - - Mon, 24 Jun 2019 17:26:49 GMT - Server: - - scaleway_api - Strict-Transport-Security: - - max-age=63072000 - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: 204 No Content - code: 204 - duration: "" - request: body: wozniak form: {} @@ -697,38 +603,6 @@ interactions: status: 204 No Content code: 204 duration: "" -- request: - body: niel - form: {} - headers: - Content-Type: - - text/plain - User-Agent: - - scaleway-sdk-go/0.0.0 (go1.12.5; darwin; amd64) - url: https://api.scaleway.com/instance/v1/zones/fr-par-1/servers/b2266f9f-d089-41be-84b7-0bd9690fc505/user_data/xavier - method: PATCH - response: - body: "" - headers: - Cache-Control: - - no-cache - Content-Security-Policy: - - default-src 'none'; frame-ancestors 'none' - Content-Type: - - text/plain - Date: - - Mon, 24 Jun 2019 17:26:49 GMT - Server: - - scaleway_api - Strict-Transport-Security: - - max-age=63072000 - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: 204 No Content - code: 204 - duration: "" - request: body: way form: {} @@ -770,7 +644,7 @@ interactions: url: https://api.scaleway.com/instance/v1/zones/fr-par-1/servers/b2266f9f-d089-41be-84b7-0bd9690fc505/user_data method: GET response: - body: '{"user_data": ["cloud-init", "scale", "steve", "xavier"]}' + body: '{"user_data": ["cloud-init", "scale", "steve"]}' headers: Cache-Control: - no-cache @@ -889,38 +763,6 @@ interactions: status: 200 OK code: 200 duration: "" -- request: - body: "" - form: {} - headers: - User-Agent: - - scaleway-sdk-go/0.0.0 (go1.12.5; darwin; amd64) - url: https://api.scaleway.com/instance/v1/zones/fr-par-1/servers/b2266f9f-d089-41be-84b7-0bd9690fc505/user_data/xavier - method: GET - response: - body: niel - headers: - Cache-Control: - - no-cache - Content-Length: - - "4" - Content-Security-Policy: - - default-src 'none'; frame-ancestors 'none' - Content-Type: - - text/plain - Date: - - Mon, 24 Jun 2019 17:26:49 GMT - Server: - - scaleway_api - Strict-Transport-Security: - - max-age=63072000 - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: 200 OK - code: 200 - duration: "" - request: body: "" form: {} @@ -930,7 +772,7 @@ interactions: url: https://api.scaleway.com/instance/v1/zones/fr-par-1/servers/b2266f9f-d089-41be-84b7-0bd9690fc505/user_data method: GET response: - body: '{"user_data": ["cloud-init", "scale", "steve", "xavier"]}' + body: '{"user_data": ["cloud-init", "scale", "steve"]}' headers: Cache-Control: - no-cache @@ -1043,36 +885,6 @@ interactions: status: 204 No Content code: 204 duration: "" -- request: - body: "" - form: {} - headers: - User-Agent: - - scaleway-sdk-go/0.0.0 (go1.12.5; darwin; amd64) - url: https://api.scaleway.com/instance/v1/zones/fr-par-1/servers/b2266f9f-d089-41be-84b7-0bd9690fc505/user_data/xavier - method: DELETE - response: - body: "" - headers: - Cache-Control: - - no-cache - Content-Security-Policy: - - default-src 'none'; frame-ancestors 'none' - Content-Type: - - application/json - Date: - - Mon, 24 Jun 2019 17:26:50 GMT - Server: - - scaleway_api - Strict-Transport-Security: - - max-age=63072000 - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: 204 No Content - code: 204 - duration: "" - request: body: "" form: {} diff --git a/namegenerator/name_generator.go b/namegenerator/name_generator.go index b86b52c3..f85eb8bd 100644 --- a/namegenerator/name_generator.go +++ b/namegenerator/name_generator.go @@ -628,9 +628,6 @@ var ( // Isaac Newton invented classic mechanics and modern optics. https://en.wikipedia.org/wiki/Isaac_Newton "newton", - // Xavier Niel - ;) https://en.wikipedia.org/wiki/Xavier_Niel - "niel", - // Florence Nightingale, more prominently known as a nurse, was also the first female member of the Royal Statistical Society and a pioneer in statistical graphics https://en.wikipedia.org/wiki/Florence_Nightingale#Statistics_and_sanitary_reform "nightingale",