fix(core): move human from internal to core

Laure-di · Dec 16, 2024 · 95c713e · 95c713e
1 parent 1107990
commit 95c713e
Show file tree

Hide file tree

Showing 106 changed files with 100 additions and 101 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,6 @@ RUN go mod download
 COPY scripts/ scripts/
 COPY cmd/ cmd/
 COPY core/ core/
-COPY human/ human/
 COPY commands/ commands/
 COPY internal/ internal/
 COPY .git/ .git/

diff --git a/cmd/scw-wasm-tester/human.go b/cmd/scw-wasm-tester/human.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/hashicorp/go-version"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 )
 
 func wasmTestMarshalBuildInfo(_ js.Value, _ []js.Value) any {

diff --git a/core/command.go b/core/command.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	"github.com/scaleway/scaleway-cli/v2/internal/alias"
 )
 

diff --git a/core/error.go b/core/error.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 )
 
 // CliError is an all-in-one error structure that can be used in commands to return useful errors to the user.

diff --git a/human/error.go → core/human/error.go b/human/error.go → core/human/error.go
diff --git a/human/marshal.go → core/human/marshal.go b/human/marshal.go → core/human/marshal.go
diff --git a/human/marshal_func.go → core/human/marshal_func.go b/human/marshal_func.go → core/human/marshal_func.go
diff --git a/human/marshal_test.go → core/human/marshal_test.go b/human/marshal_test.go → core/human/marshal_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/alecthomas/assert"
 	"github.com/dustin/go-humanize"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 

diff --git a/human/specs.go → core/human/specs.go b/human/specs.go → core/human/specs.go
diff --git a/human/utils.go → core/human/utils.go b/human/utils.go → core/human/utils.go
diff --git a/core/printer.go b/core/printer.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	"github.com/scaleway/scaleway-cli/v2/internal/gofields"
 	"gopkg.in/yaml.v3"
 )

diff --git a/core/result.go b/core/result.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
 	"github.com/scaleway/scaleway-sdk-go/strcase"

diff --git a/core/testing.go b/core/testing.go
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-version"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	args "github.com/scaleway/scaleway-cli/v2/internal/args"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/platform/terminal"

diff --git a/core/view.go b/core/view.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 )
 
 // View hydrates human.MarshalOpt

diff --git a/internal/interactive/prompt.go b/internal/interactive/prompt.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/chzyer/readline"
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
 )
 

diff --git a/internal/namespaces/alias/alias_test.go b/internal/namespaces/alias/alias_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/alecthomas/assert"
 	"github.com/scaleway/scaleway-cli/v2/commands"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 )
 
 func Test_Alias(t *testing.T) {

diff --git a/internal/namespaces/applesilicon/v1alpha1/custom.go b/internal/namespaces/applesilicon/v1alpha1/custom.go
@@ -2,7 +2,7 @@ package applesilicon
 
 import (
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
 )
 

diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_os.go b/internal/namespaces/applesilicon/v1alpha1/custom_os.go
@@ -1,7 +1,7 @@
 package applesilicon
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
 )
 

diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_server.go b/internal/namespaces/applesilicon/v1alpha1/custom_server.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )

diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_server_types.go b/internal/namespaces/applesilicon/v1alpha1/custom_server_types.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
 )
 

diff --git a/internal/namespaces/baremetal/v1/custom.go b/internal/namespaces/baremetal/v1/custom.go
@@ -2,7 +2,7 @@ package baremetal
 
 import (
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 )
 

diff --git a/internal/namespaces/baremetal/v1/custom_offer.go b/internal/namespaces/baremetal/v1/custom_offer.go
@@ -2,7 +2,7 @@ package baremetal
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 )
 

diff --git a/internal/namespaces/baremetal/v1/custom_server.go b/internal/namespaces/baremetal/v1/custom_server.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 	"github.com/scaleway/scaleway-sdk-go/logger"
 	"github.com/scaleway/scaleway-sdk-go/scw"

diff --git a/internal/namespaces/billing/v2beta1/custom.go b/internal/namespaces/billing/v2beta1/custom.go
@@ -3,7 +3,7 @@ package billing
 import (
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	billing "github.com/scaleway/scaleway-sdk-go/api/billing/v2beta1"
 )
 

diff --git a/internal/namespaces/block/v1alpha1/custom.go b/internal/namespaces/block/v1alpha1/custom.go
@@ -3,7 +3,7 @@ package block
 import (
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 )
 

diff --git a/internal/namespaces/container/v1beta1/custom.go b/internal/namespaces/container/v1beta1/custom.go
@@ -2,7 +2,7 @@ package container
 
 import (
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
 )
 

diff --git a/internal/namespaces/container/v1beta1/custom_container.go b/internal/namespaces/container/v1beta1/custom_container.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )

diff --git a/internal/namespaces/container/v1beta1/custom_cron.go b/internal/namespaces/container/v1beta1/custom_cron.go
@@ -2,7 +2,7 @@ package container
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
 )
 

diff --git a/internal/namespaces/container/v1beta1/custom_namespace.go b/internal/namespaces/container/v1beta1/custom_namespace.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )

diff --git a/internal/namespaces/documentdb/v1beta1/custom.go b/internal/namespaces/documentdb/v1beta1/custom.go
@@ -3,7 +3,7 @@ package documentdb
 import (
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	documentdb "github.com/scaleway/scaleway-sdk-go/api/documentdb/v1beta1"
 )
 

diff --git a/internal/namespaces/domain/v2beta1/custom.go b/internal/namespaces/domain/v2beta1/custom.go
@@ -2,7 +2,7 @@ package domain
 
 import (
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1"
 )
 

diff --git a/internal/namespaces/domain/v2beta1/custom_certificate.go b/internal/namespaces/domain/v2beta1/custom_certificate.go
@@ -2,7 +2,7 @@ package domain
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1"
 )
 

diff --git a/internal/namespaces/domain/v2beta1/custom_zone.go b/internal/namespaces/domain/v2beta1/custom_zone.go
@@ -2,7 +2,7 @@ package domain
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1"
 )
 

diff --git a/internal/namespaces/feedback/issue.go b/internal/namespaces/feedback/issue.go
@@ -11,7 +11,7 @@ import (
 	"runtime"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 )
 
 const githubURL = "https://github.com/scaleway/scaleway-cli/issues/new"

diff --git a/internal/namespaces/flexibleip/v1alpha1/custom.go b/internal/namespaces/flexibleip/v1alpha1/custom.go
@@ -2,7 +2,7 @@ package flexibleip
 
 import (
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	fip "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1"
 )
 

diff --git a/internal/namespaces/flexibleip/v1alpha1/custom_ip.go b/internal/namespaces/flexibleip/v1alpha1/custom_ip.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	flexibleip "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )

diff --git a/internal/namespaces/flexibleip/v1alpha1/custom_mac.go b/internal/namespaces/flexibleip/v1alpha1/custom_mac.go
@@ -2,7 +2,7 @@ package flexibleip
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	flexibleip "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1"
 )
 

diff --git a/internal/namespaces/function/v1beta1/custom.go b/internal/namespaces/function/v1beta1/custom.go
@@ -2,7 +2,7 @@ package function
 
 import (
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1"
 )
 

diff --git a/internal/namespaces/function/v1beta1/custom_cron.go b/internal/namespaces/function/v1beta1/custom_cron.go
@@ -2,7 +2,7 @@ package function
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1"
 )
 

diff --git a/internal/namespaces/function/v1beta1/custom_function.go b/internal/namespaces/function/v1beta1/custom_function.go
@@ -2,7 +2,7 @@ package function
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1"
 )
 

diff --git a/internal/namespaces/function/v1beta1/custom_namespace.go b/internal/namespaces/function/v1beta1/custom_namespace.go
@@ -2,7 +2,7 @@ package function
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1"
 )
 

diff --git a/internal/namespaces/iam/v1alpha1/custom.go b/internal/namespaces/iam/v1alpha1/custom.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	"github.com/scaleway/scaleway-cli/v2/internal/args"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"

diff --git a/internal/namespaces/inference/v1beta1/custom.go b/internal/namespaces/inference/v1beta1/custom.go
@@ -2,7 +2,7 @@ package inference
 
 import (
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	inference "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
 )
 

diff --git a/internal/namespaces/inference/v1beta1/custom_deployment.go b/internal/namespaces/inference/v1beta1/custom_deployment.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	inference "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )

diff --git a/internal/namespaces/inference/v1beta1/custom_model.go b/internal/namespaces/inference/v1beta1/custom_model.go
@@ -1,7 +1,7 @@
 package inference
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	inference "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
 )
 

diff --git a/internal/namespaces/inference/v1beta1/custom_node_type.go b/internal/namespaces/inference/v1beta1/custom_node_type.go
@@ -1,7 +1,7 @@
 package inference
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	inference "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
 )
 

diff --git a/internal/namespaces/info/custom.go b/internal/namespaces/info/custom.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 

diff --git a/internal/namespaces/instance/v1/custom.go b/internal/namespaces/instance/v1/custom.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 )
 

diff --git a/internal/namespaces/instance/v1/custom_image.go b/internal/namespaces/instance/v1/custom_image.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-cli/v2/human"
+	"github.com/scaleway/scaleway-cli/v2/core/human"
 	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"