Fix

remyleone · remyleone · commit 89a7add9550b · 2022-05-03T12:56:49.000+02:00
diff --git a/cmd/scw/testdata/test-all-usage-container-container-create-usage.golden b/cmd/scw/testdata/test-all-usage-container-container-create-usage.golden
@@ -23,11 +23,9 @@ ARGS:
   [port]                                         
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
+  [http-option]                                  Configure how HTTP and HTTPS requests are handled
   [region=fr-par]                                Region to target. If none is passed will use default region from the config (fr-par)
 
-DEPRECATED ARGS:
-  [http-option]   Configure how HTTP and HTTPS requests are handled
-
 FLAGS:
   -h, --help   help for create
 
diff --git a/cmd/scw/testdata/test-all-usage-container-container-update-usage.golden b/cmd/scw/testdata/test-all-usage-container-container-update-usage.golden
@@ -23,11 +23,9 @@ ARGS:
   [port]                                         
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
+  [http-option]                                  Configure how HTTP and HTTPS requests are handled
   [region=fr-par]                                Region to target. If none is passed will use default region from the config (fr-par)
 
-DEPRECATED ARGS:
-  [http-option]   Configure how HTTP and HTTPS requests are handled
-
 FLAGS:
   -h, --help   help for update
 
diff --git a/cmd/scw/testdata/test-all-usage-function-function-create-usage.golden b/cmd/scw/testdata/test-all-usage-function-function-create-usage.golden
@@ -20,11 +20,9 @@ ARGS:
   [description]                                  
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
+  [http-option]                                  Configure how HTTP and HTTPS requests are handled
   [region=fr-par]                                Region to target. If none is passed will use default region from the config (fr-par)
 
-DEPRECATED ARGS:
-  [http-option]   Configure how HTTP and HTTPS requests are handled
-
 FLAGS:
   -h, --help   help for create
 
diff --git a/cmd/scw/testdata/test-all-usage-function-function-update-usage.golden b/cmd/scw/testdata/test-all-usage-function-function-update-usage.golden
@@ -20,11 +20,9 @@ ARGS:
   [description]                                  
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
+  [http-option]                                  Configure how HTTP and HTTPS requests are handled
   [region=fr-par]                                Region to target. If none is passed will use default region from the config (fr-par)
 
-DEPRECATED ARGS:
-  [http-option]   Configure how HTTP and HTTPS requests are handled
-
 FLAGS:
   -h, --help   help for update
 
diff --git a/cmd/scw/testdata/test-all-usage-rdb-read-replica-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-read-replica-usage.golden
diff --git a/cmd/scw/testdata/test-all-usage-rdb-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-usage.golden
@@ -6,17 +6,16 @@ USAGE:
   scw rdb <command>
 
 AVAILABLE COMMANDS:
-  acl          Access Control List (ACL) management commands
-  backup       Backup management commands
-  database     Database management commands
-  engine       Database engines commands
-  instance     Instance management commands
-  log          Instance logs management commands
-  node-type    Node types management commands
-  privilege    User privileges management commands
-  read-replica Read replica management
-  snapshot     Block snapshot management
-  user         User management commands
+  acl         Access Control List (ACL) management commands
+  backup      Backup management commands
+  database    Database management commands
+  engine      Database engines commands
+  instance    Instance management commands
+  log         Instance logs management commands
+  node-type   Node types management commands
+  privilege   User privileges management commands
+  snapshot    Block snapshot management
+  user        User management commands
 
 FLAGS:
   -h, --help   help for rdb
diff --git a/docs/commands/container.md b/docs/commands/container.md
@@ -58,7 +58,7 @@ scw container container create [arg=value ...]
 | port |  |  |
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
-| ~~http-option~~ | Deprecated | Configure how HTTP and HTTPS requests are handled |
+| http-option |  | Configure how HTTP and HTTPS requests are handled |
 | region | Default: `fr-par`<br />One of: `fr-par` | Region to target. If none is passed will use default region from the config |
 
 
@@ -179,7 +179,7 @@ scw container container update <container-id ...> [arg=value ...]
 | port |  |  |
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
-| ~~http-option~~ | Deprecated | Configure how HTTP and HTTPS requests are handled |
+| http-option |  | Configure how HTTP and HTTPS requests are handled |
 | region | Default: `fr-par`<br />One of: `fr-par` | Region to target. If none is passed will use default region from the config |
 
 
diff --git a/docs/commands/function.md b/docs/commands/function.md
@@ -127,7 +127,7 @@ scw function function create [arg=value ...]
 | description |  |  |
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
-| ~~http-option~~ | Deprecated | Configure how HTTP and HTTPS requests are handled |
+| http-option |  | Configure how HTTP and HTTPS requests are handled |
 | region | Default: `fr-par`<br />One of: `fr-par` | Region to target. If none is passed will use default region from the config |
 
 
@@ -286,7 +286,7 @@ scw function function update <function-id ...> [arg=value ...]
 | description |  |  |
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
-| ~~http-option~~ | Deprecated | Configure how HTTP and HTTPS requests are handled |
+| http-option |  | Configure how HTTP and HTTPS requests are handled |
 | region | Default: `fr-par`<br />One of: `fr-par` | Region to target. If none is passed will use default region from the config |
 
 
diff --git a/docs/commands/rdb.md b/docs/commands/rdb.md
@@ -46,7 +46,6 @@ Database RDB API
 - [User privileges management commands](#user-privileges-management-commands)
   - [List privileges of a given user for a given database on a given instance](#list-privileges-of-a-given-user-for-a-given-database-on-a-given-instance)
   - [Set privileges of a given user for a given database on a given instance](#set-privileges-of-a-given-user-for-a-given-database-on-a-given-instance)
-- [Read replica management](#read-replica-management)
 - [Block snapshot management](#block-snapshot-management)
   - [Create an instance snapshot](#create-an-instance-snapshot)
   - [Delete an instance snapshot](#delete-an-instance-snapshot)
@@ -925,22 +924,6 @@ scw rdb privilege set [arg=value ...]
 
 
 
-## Read replica management
-
-A read replica is a live copy of the main database instance only available for reading. Read replica allows you to scale your database instance for read-heavy database workloads. Read replicas can also be used for Business Intelligence workloads.
-
-
-A read replica is a live copy of the main database instance only available for reading. Read replica allows you to scale your database instance for read-heavy database workloads. Read replicas can also be used for Business Intelligence workloads.
-
-
-**Usage:**
-
-```
-scw rdb read-replica
-```
-
-
-
 ## Block snapshot management
 
 Create, restore and manage block snapshot
diff --git a/go.mod b/go.mod
@@ -32,8 +32,12 @@ require (
 	github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect
 	github.com/chzyer/logex v1.2.0 // indirect
 	github.com/chzyer/test v0.0.0-20210722231415-061457976a23 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/etdub/goparsetime v0.0.0-20160315173935-ea17b0ac3318 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/pkg/errors v0.8.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sergi/go-diff v1.2.0 // indirect
 	golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
diff --git a/internal/namespaces/container/v1beta1/container_cli.go b/internal/namespaces/container/v1beta1/container_cli.go
@@ -498,7 +498,7 @@ func containerContainerCreate() *core.Command {
 				Name:       "http-option",
 				Short:      `Configure how HTTP and HTTPS requests are handled`,
 				Required:   false,
-				Deprecated: true,
+				Deprecated: false,
 				Positional: false,
 			},
 			core.RegionArgSpec(scw.RegionFrPar),
@@ -632,7 +632,7 @@ func containerContainerUpdate() *core.Command {
 				Name:       "http-option",
 				Short:      `Configure how HTTP and HTTPS requests are handled`,
 				Required:   false,
-				Deprecated: true,
+				Deprecated: false,
 				Positional: false,
 			},
 			core.RegionArgSpec(scw.RegionFrPar),
diff --git a/internal/namespaces/function/v1beta1/function_cli.go b/internal/namespaces/function/v1beta1/function_cli.go
@@ -539,7 +539,7 @@ func functionFunctionCreate() *core.Command {
 				Name:       "http-option",
 				Short:      `Configure how HTTP and HTTPS requests are handled`,
 				Required:   false,
-				Deprecated: true,
+				Deprecated: false,
 				Positional: false,
 			},
 			core.RegionArgSpec(scw.RegionFrPar),
@@ -655,7 +655,7 @@ func functionFunctionUpdate() *core.Command {
 				Name:       "http-option",
 				Short:      `Configure how HTTP and HTTPS requests are handled`,
 				Required:   false,
-				Deprecated: true,
+				Deprecated: false,
 				Positional: false,
 			},
 			core.RegionArgSpec(scw.RegionFrPar),
diff --git a/internal/namespaces/rdb/v1/rdb_cli.go b/internal/namespaces/rdb/v1/rdb_cli.go
@@ -30,7 +30,6 @@ func GetGeneratedCommands() *core.Commands {
 		rdbNodeType(),
 		rdbLog(),
 		rdbSnapshot(),
-		rdbReadReplica(),
 		rdbEngineList(),
 		rdbNodeTypeList(),
 		rdbBackupList(),
@@ -182,16 +181,6 @@ func rdbSnapshot() *core.Command {
 	}
 }
 
-func rdbReadReplica() *core.Command {
-	return &core.Command{
-		Short: `Read replica management`,
-		Long: `A read replica is a live copy of the main database instance only available for reading. Read replica allows you to scale your database instance for read-heavy database workloads. Read replicas can also be used for Business Intelligence workloads.
-`,
-		Namespace: "rdb",
-		Resource:  "read-replica",
-	}
-}
-
 func rdbEngineList() *core.Command {
 	return &core.Command{
 		Short:     `List available database engines`,

-Original file line number
+Diff line change
 	github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect
 	github.com/chzyer/logex v1.2.0 // indirect
 	github.com/chzyer/test v0.0.0-20210722231415-061457976a23 // indirect
 +	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/etdub/goparsetime v0.0.0-20160315173935-ea17b0ac3318 // indirect
 +	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/pkg/errors v0.8.1 // indirect
 +	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sergi/go-diff v1.2.0 // indirect
 	golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
 +	gopkg.in/yaml.v2 v2.4.0 // indirect
+)