Merge branch 'master' into 1.1716.0

cmd/scw/testdata/test-all-usage-lb-backend-add-servers-usage.golden

@@ -8,7 +8,7 @@ USAGE:
 ARGS:
   backend-id          Backend ID
   server-ip.{index}   Set all IPs to add on your backend
-  [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]     Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for add-servers

cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden

@@ -32,7 +32,7 @@ ARGS:
   [timeout-tunnel]                     Maximum tunnel inactivity time
   [on-marked-down-action]              Modify what occurs when a backend server is marked down (on_marked_down_action_none | shutdown_sessions)
   [proxy-protocol]                     PROXY protocol, forward client's address (must be supported by backend servers software) (proxy_protocol_unknown | proxy_protocol_none | proxy_protocol_v1 | proxy_protocol_v2 | proxy_protocol_v2_ssl | proxy_protocol_v2_ssl_cn)
-  [region=fr-par]                      Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]                      Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 DEPRECATED ARGS:
   [send-proxy-v2]   Deprecated in favor of proxy_protocol field !

cmd/scw/testdata/test-all-usage-lb-backend-delete-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   backend-id        ID of the backend to delete
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for delete

cmd/scw/testdata/test-all-usage-lb-backend-get-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   backend-id        Backend ID
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for get

cmd/scw/testdata/test-all-usage-lb-backend-list-usage.golden

@@ -9,7 +9,7 @@ ARGS:
   lb-id             Load balancer ID
   [name]            Use this to search by name
   [order-by]        Choose order of response (created_at_asc | created_at_desc | name_asc | name_desc)
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for list

cmd/scw/testdata/test-all-usage-lb-backend-remove-servers-usage.golden

@@ -8,7 +8,7 @@ USAGE:
 ARGS:
   backend-id          Backend ID
   server-ip.{index}   Set all IPs to remove of your backend
-  [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]     Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for remove-servers

cmd/scw/testdata/test-all-usage-lb-backend-set-servers-usage.golden

@@ -8,7 +8,7 @@ USAGE:
 ARGS:
   backend-id          Backend ID
   server-ip.{index}   Set all IPs to add on your backend and remove all other
-  [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]     Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for set-servers

cmd/scw/testdata/test-all-usage-lb-backend-update-healthcheck-usage.golden

@@ -20,7 +20,7 @@ ARGS:
   [https-config.method]   
   [https-config.code]     
   [check-send-proxy]      It defines whether the healthcheck should be done considering the proxy protocol
-  [region=fr-par]         Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]         Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for update-healthcheck

cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden

@@ -18,7 +18,7 @@ ARGS:
   [timeout-tunnel]                
   [on-marked-down-action]          (on_marked_down_action_none | shutdown_sessions)
   [proxy-protocol]                 (proxy_protocol_unknown | proxy_protocol_none | proxy_protocol_v1 | proxy_protocol_v2 | proxy_protocol_v2_ssl | proxy_protocol_v2_ssl_cn)
-  [region=fr-par]                 Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]                 Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 DEPRECATED ARGS:
   [send-proxy-v2]   

cmd/scw/testdata/test-all-usage-lb-certificate-create-usage.golden

@@ -11,7 +11,7 @@ ARGS:
   [letsencrypt-common-name]                Main domain name of certificate (make sure this domain exists and resolves to your load balancer HA IP)
   [letsencrypt-alternative-name.{index}]   Alternative domain names (make sure all domain names exists and resolves to your load balancer HA IP)
   [custom-certificate-chain]               The full PEM-formatted include an entire certificate chain including public key, private key, and optionally certificate authorities.
-  [region=fr-par]                          Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]                          Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for create

cmd/scw/testdata/test-all-usage-lb-certificate-delete-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   certificate-id    Certificate ID
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for delete

cmd/scw/testdata/test-all-usage-lb-certificate-get-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   certificate-id    Certificate ID
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for get

cmd/scw/testdata/test-all-usage-lb-certificate-list-usage.golden

@@ -9,7 +9,7 @@ ARGS:
   lb-id             Load balancer ID
   [order-by]        You can order the response by created_at asc/desc or name asc/desc (created_at_asc | created_at_desc | name_asc | name_desc)
   [name]            Use this to search by name
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for list

cmd/scw/testdata/test-all-usage-lb-certificate-update-usage.golden

@@ -8,7 +8,7 @@ USAGE:
 ARGS:
   certificate-id    Certificate ID
   name              Certificate name
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for update

cmd/scw/testdata/test-all-usage-lb-frontend-create-usage.golden

@@ -12,7 +12,7 @@ ARGS:
   backend-id                  Backend ID
   [timeout-client]            Set the maximum inactivity time on the client side
   [certificate-ids.{index}]   List of certificate IDs to bind on the frontend
-  [region=fr-par]             Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]             Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 DEPRECATED ARGS:
   [certificate-id]   Certificate ID, deprecated in favor of certificate_ids array !

cmd/scw/testdata/test-all-usage-lb-frontend-delete-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   frontend-id       Frontend ID to delete
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for delete

cmd/scw/testdata/test-all-usage-lb-frontend-get-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   frontend-id       Frontend ID
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for get

cmd/scw/testdata/test-all-usage-lb-frontend-list-usage.golden

@@ -9,7 +9,7 @@ ARGS:
   lb-id             Load balancer ID
   [name]            Use this to search by name
   [order-by]        Response order (created_at_asc | created_at_desc | name_asc | name_desc)
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for list

cmd/scw/testdata/test-all-usage-lb-frontend-update-usage.golden

@@ -12,7 +12,7 @@ ARGS:
   backend-id                  Backend ID
   [timeout-client]            Client session maximum inactivity time
   [certificate-ids.{index}]   List of certificate IDs to bind on the frontend
-  [region=fr-par]             Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]             Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 DEPRECATED ARGS:
   [certificate-id]   Certificate ID, deprecated in favor of `certificate_ids` array!

cmd/scw/testdata/test-all-usage-lbacl-create-usage.golden

@@ -14,7 +14,7 @@ ARGS:
   [match.http-filter-value.{index}]   A list of possible values to match for the given HTTP filter
   [match.invert]                      If set to `true`, the ACL matching condition will be of type "UNLESS"
   index                               Order between your Acls (ascending order, 0 is first acl executed)
-  [region=fr-par]                     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]                     Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for create

cmd/scw/testdata/test-all-usage-lbacl-delete-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   acl-id            ID of your ACL ressource
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for delete

cmd/scw/testdata/test-all-usage-lbacl-get-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   acl-id            ID of your ACL ressource
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for get

cmd/scw/testdata/test-all-usage-lbacl-list-usage.golden

@@ -9,7 +9,7 @@ ARGS:
   frontend-id       ID of your frontend
   [order-by]        You can order the response by created_at asc/desc or name asc/desc (created_at_asc | created_at_desc | name_asc | name_desc)
   [name]            Filter acl per name
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for list

cmd/scw/testdata/test-all-usage-lbacl-update-usage.golden

@@ -14,7 +14,7 @@ ARGS:
   [match.http-filter-value.{index}]   A list of possible values to match for the given HTTP filter
   [match.invert]                      If set to `true`, the ACL matching condition will be of type "UNLESS"
   index                               Order between your Acls (ascending order, 0 is first acl executed)
-  [region=fr-par]                     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]                     Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for update

cmd/scw/testdata/test-all-usage-lbip-create-usage.golden

@@ -9,7 +9,7 @@ ARGS:
   [project-id]        Project ID to use. If none is passed the default project ID will be used
   [reverse]           Reverse domain name
   [organization-id]   Organization ID to use. If none is passed the default organization ID will be used
-  [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]     Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for create

cmd/scw/testdata/test-all-usage-lbip-delete-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   ip-id             IP address ID
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for delete

cmd/scw/testdata/test-all-usage-lbip-get-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   ip-id             IP address ID
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for get

cmd/scw/testdata/test-all-usage-lbip-list-usage.golden

@@ -9,7 +9,7 @@ ARGS:
   [ip-address]        Use this to search by IP address
   [project-id]        Filter IPs by project ID
   [organization-id]   Filter IPs by organization id
-  [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]     Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for list

cmd/scw/testdata/test-all-usage-lbip-update-usage.golden

@@ -8,7 +8,7 @@ USAGE:
 ARGS:
   ip-id             IP address ID
   [reverse]         Reverse DNS
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for update

cmd/scw/testdata/test-all-usage-lblb-create-usage.golden

@@ -14,7 +14,7 @@ ARGS:
   [type=LB-S]                 Load balancer offer type (LB-S | LB-GP-M | LB-GP-L)
   [ssl-compatibility-level]    (ssl_compatibility_level_unknown | ssl_compatibility_level_intermediate | ssl_compatibility_level_modern | ssl_compatibility_level_old)
   [organization-id]           Organization ID to use. If none is passed the default organization ID will be used
-  [region=fr-par]             Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]             Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for create

cmd/scw/testdata/test-all-usage-lblb-delete-usage.golden

@@ -8,7 +8,7 @@ USAGE:
 ARGS:
   lb-id             Load balancer ID
   [release-ip]      Set true if you don't want to keep this IP address
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for delete

cmd/scw/testdata/test-all-usage-lblb-get-stats-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   lb-id             Load balancer ID
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for get-stats

cmd/scw/testdata/test-all-usage-lblb-get-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   lb-id             Load balancer ID
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for get

cmd/scw/testdata/test-all-usage-lblb-list-usage.golden

@@ -10,7 +10,7 @@ ARGS:
   [order-by]           (created_at_asc | created_at_desc | name_asc | name_desc)
   [project-id]        Filter LBs by project ID
   [organization-id]   Filter LBs by organization ID
-  [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]     Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for list

cmd/scw/testdata/test-all-usage-lblb-migrate-usage.golden

@@ -8,7 +8,7 @@ USAGE:
 ARGS:
   lb-id             Load balancer ID
   type              Load balancer type (check /lb-types to list all type) (LB-S | LB-GP-M | LB-GP-L)
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for migrate

cmd/scw/testdata/test-all-usage-lblb-types-list-usage.golden

@@ -6,7 +6,7 @@ USAGE:
   scw lb lb-types list [arg=value ...]
 
 ARGS:
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for list

cmd/scw/testdata/test-all-usage-lblb-update-usage.golden

@@ -11,7 +11,7 @@ ARGS:
   description                 Resource description
   [tags.{index}]              List of keywords
   [ssl-compatibility-level]    (ssl_compatibility_level_unknown | ssl_compatibility_level_intermediate | ssl_compatibility_level_modern | ssl_compatibility_level_old)
-  [region=fr-par]             Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [zone=fr-par-1]             Zone to target. If none is passed will use default zone from the config (fr-par-1 | nl-ams-1 | pl-waw-1)
 
 FLAGS:
   -h, --help   help for update

cmd/scw/testdata/test-all-usage-lblb-wait-usage.golden

@@ -11,7 +11,7 @@ EXAMPLES:
 
 ARGS:
   lb-id             ID of the load balancer you want to wait for.
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | pl-waw-1 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for wait

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/mattn/go-colorable v0.1.7
 	github.com/mattn/go-isatty v0.0.12
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210426103954-8e31911750e7
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210427121621-c670eb8c8e8f
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5