fix(human): skip capitalize on uuid (#2510)

scaleway · Sep 19, 2022 · a5fb125 · a5fb125
1 parent 364a689
commit a5fb125
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/internal/human/utils.go b/internal/human/utils.go
@@ -2,11 +2,18 @@ package human
 
 import (
 	"reflect"
+	"strings"
 	"unicode"
 )
 
 // Capitalize returns the given string with a first character in uppercase.
 func Capitalize(s string) string {
+	words := strings.Fields(s)
+	if len(words) > 0 && strings.Contains(words[0], "-") {
+		// First word is probably an id, don't capitalize
+		return s
+	}
+
 	for i, c := range s {
 		return string(unicode.ToUpper(c)) + s[i+1:]
 	}

diff --git a/internal/namespaces/config/testdata/test-config-destroy-command-check-config-file.golden b/internal/namespaces/config/testdata/test-config-destroy-command-check-config-file.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 1 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Scaleway-sdk-go: cannot read config file /tmp/test_config_destroy/.config/scw/config.yaml: no such file or directory
+scaleway-sdk-go: cannot read config file /tmp/test_config_destroy/.config/scw/config.yaml: no such file or directory
 🟥🟥🟥 JSON STDERR 🟥🟥🟥
 {
   "error": "scaleway-sdk-go: cannot read config file /tmp/test_config_destroy/.config/scw/config.yaml: no such file or directory"

diff --git a/...amespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-label.golden b/...amespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-label.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 1 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Scaleway-sdk-go: couldn't find a matching image for the given label (macos), zone (fr-par-1) and commercial type (DEV1-S)
+scaleway-sdk-go: couldn't find a matching image for the given label (macos), zone (fr-par-1) and commercial type (DEV1-S)
 🟥🟥🟥 JSON STDERR 🟥🟥🟥
 {
   "error": "scaleway-sdk-go: couldn't find a matching image for the given label (macos), zone (fr-par-1) and commercial type (DEV1-S)"

diff --git a/...espaces/instance/v1/testdata/test-create-server-errors-error-invalid-instance-type.golden b/...espaces/instance/v1/testdata/test-create-server-errors-error-invalid-instance-type.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 1 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Scaleway-sdk-go: couldn't find a matching image for the given label (ubuntu_bionic), zone (fr-par-1) and commercial type (MACBOOK1-S): couldn't find compatible local image for this image version (47d38b1a-71a9-4f29-80bc-2dbb7bda7f9f)
+scaleway-sdk-go: couldn't find a matching image for the given label (ubuntu_bionic), zone (fr-par-1) and commercial type (MACBOOK1-S): couldn't find compatible local image for this image version (47d38b1a-71a9-4f29-80bc-2dbb7bda7f9f)
 🟥🟥🟥 JSON STDERR 🟥🟥🟥
 {
   "error": "scaleway-sdk-go: couldn't find a matching image for the given label (ubuntu_bionic), zone (fr-par-1) and commercial type (MACBOOK1-S): couldn't find compatible local image for this image version (47d38b1a-71a9-4f29-80bc-2dbb7bda7f9f)"