Merge branch 'master' into v1.6237.0

Author: Laure-di

go.mod

@@ -185,7 +185,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.25.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.2.0 // indirect
 	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/net v0.36.0 // indirect
 	golang.org/x/sync v0.12.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/time v0.5.0 // indirect

go.sum

@@ -594,8 +594,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

internal/namespaces/webhosting/v1/webhosting_cli.go

@@ -752,30 +752,30 @@ func webhostingDomainSyncDNSRecords() *core.Command {
 			},
 			{
 				Name:       "update-web-records",
-				Short:      `Whether or not to synchronize the web records.`,
+				Short:      `Whether or not to synchronize the web records (deprecated, use auto_config_domain_dns).`,
 				Required:   false,
-				Deprecated: false,
+				Deprecated: true,
 				Positional: false,
 			},
 			{
 				Name:       "update-mail-records",
-				Short:      `Whether or not to synchronize the mail records.`,
+				Short:      `Whether or not to synchronize the mail records (deprecated, use auto_config_domain_dns).`,
 				Required:   false,
-				Deprecated: false,
+				Deprecated: true,
 				Positional: false,
 			},
 			{
 				Name:       "update-all-records",
-				Short:      `Whether or not to synchronize all types of records. This one has priority.`,
+				Short:      `Whether or not to synchronize all types of records. This one has priority (deprecated, use auto_config_domain_dns).`,
 				Required:   false,
-				Deprecated: false,
+				Deprecated: true,
 				Positional: false,
 			},
 			{
 				Name:       "update-nameservers",
-				Short:      `Whether or not to synchronize domain nameservers.`,
+				Short:      `Whether or not to synchronize domain nameservers (deprecated, use auto_config_domain_dns).`,
 				Required:   false,
-				Deprecated: false,
+				Deprecated: true,
 				Positional: false,
 			},
 			{
@@ -791,6 +791,34 @@ func webhostingDomainSyncDNSRecords() *core.Command {
 				Positional: false,
 				EnumValues: []string{"unknown_type", "a", "cname", "mx", "txt", "ns", "aaaa"},
 			},
+			{
+				Name:       "auto-config-domain-dns.nameservers",
+				Short:      `Whether or not to synchronize domain nameservers.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "auto-config-domain-dns.web-records",
+				Short:      `Whether or not to synchronize web records.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "auto-config-domain-dns.mail-records",
+				Short:      `Whether or not to synchronize mail records.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "auto-config-domain-dns.all-records",
+				Short:      `Whether or not to synchronize all types of records. Takes priority over the other fields.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
@@ -950,6 +978,34 @@ func webhostingHostingCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "auto-config-domain-dns.nameservers",
+				Short:      `Whether or not to synchronize domain nameservers.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "auto-config-domain-dns.web-records",
+				Short:      `Whether or not to synchronize web records.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "auto-config-domain-dns.mail-records",
+				Short:      `Whether or not to synchronize mail records.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "auto-config-domain-dns.all-records",
+				Short:      `Whether or not to synchronize all types of records. Takes priority over the other fields.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {