From 60d8fcd5a0b501c77e1d6f56fb26b7310c2b0a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Fri, 13 Jun 2025 14:56:22 +0200 Subject: [PATCH 1/3] chore: migrate from interface{} to any --- .golangci.yml | 5 + cmd/vcr-compressor/main.go | 2 +- cmd/vcr-viewer/main.go | 2 +- internal/acctest/acctest.go | 2 +- internal/acctest/vcr.go | 12 +- internal/cdf/locality.go | 4 +- internal/datasource/schemas.go | 4 +- internal/datasource/search.go | 4 +- internal/dsf/list.go | 8 +- internal/logging/logger.go | 10 +- internal/meta/extractors.go | 20 +-- internal/provider/provider.go | 2 +- internal/services/account/helpers.go | 4 +- internal/services/account/project.go | 8 +- .../services/account/project_data_source.go | 10 +- internal/services/applesilicon/clients.go | 6 +- internal/services/applesilicon/helpers.go | 2 +- internal/services/applesilicon/server.go | 12 +- internal/services/applesilicon/types.go | 12 +- .../az/availability_zones_data_source.go | 2 +- internal/services/baremetal/helpers.go | 26 ++-- .../services/baremetal/offer_data_source.go | 2 +- .../services/baremetal/option_data_source.go | 2 +- internal/services/baremetal/os_data_source.go | 2 +- .../baremetal/partition_schema_data_source.go | 2 +- internal/services/baremetal/server.go | 14 +- .../services/baremetal/server_data_source.go | 2 +- internal/services/baremetal/types.go | 58 ++++---- internal/services/billing/clients.go | 2 +- .../billing/consumption_data_source.go | 6 +- .../services/billing/invoices_data_source.go | 6 +- internal/services/block/helpers_block.go | 6 +- internal/services/block/snapshot.go | 10 +- .../services/block/snapshot_data_source.go | 2 +- internal/services/block/volume.go | 8 +- internal/services/block/volume_data_source.go | 2 +- internal/services/cockpit/alert_manager.go | 28 ++-- internal/services/cockpit/cockpit.go | 8 +- .../services/cockpit/cockpit_data_source.go | 2 +- internal/services/cockpit/grafana_user.go | 6 +- internal/services/cockpit/helpers_cockpit.go | 12 +- internal/services/cockpit/source.go | 8 +- .../services/cockpit/source_data_source.go | 6 +- internal/services/cockpit/token.go | 8 +- internal/services/cockpit/types.go | 22 +-- internal/services/container/container.go | 8 +- .../container/container_data_source.go | 2 +- internal/services/container/cron.go | 8 +- internal/services/container/domain.go | 6 +- .../services/container/helpers_container.go | 42 +++--- .../container/helpers_container_triggers.go | 12 +- internal/services/container/namespace.go | 8 +- .../container/namespace_data_source.go | 2 +- internal/services/container/token.go | 6 +- internal/services/container/trigger.go | 8 +- internal/services/domain/helpers.go | 88 ++++++------ internal/services/domain/helpers_test.go | 22 +-- internal/services/domain/record.go | 10 +- .../services/domain/record_data_source.go | 2 +- internal/services/domain/registration.go | 18 +-- internal/services/domain/types.go | 62 ++++---- internal/services/domain/zone.go | 8 +- internal/services/domain/zone_data_source.go | 2 +- .../services/edgeservices/backend_stage.go | 8 +- internal/services/edgeservices/cache_stage.go | 8 +- internal/services/edgeservices/dns_stage.go | 10 +- internal/services/edgeservices/head_stage.go | 8 +- internal/services/edgeservices/helpers.go | 4 +- internal/services/edgeservices/pipeline.go | 8 +- internal/services/edgeservices/plan.go | 8 +- internal/services/edgeservices/route_stage.go | 8 +- internal/services/edgeservices/tls_stage.go | 8 +- internal/services/edgeservices/types.go | 84 +++++------ internal/services/edgeservices/waf_stage.go | 8 +- internal/services/file/filesystem.go | 8 +- internal/services/file/helpers_file.go | 4 +- .../flexibleip/data_source_flexible_ip.go | 2 +- .../flexibleip/data_source_flexible_ips.go | 6 +- .../flexibleip/helpers_flexible_ip.go | 4 +- internal/services/flexibleip/ip.go | 8 +- internal/services/flexibleip/mac_address.go | 8 +- internal/services/flexibleip/types.go | 4 +- internal/services/function/cron.go | 8 +- .../services/function/data_source_function.go | 2 +- .../data_source_function_namespace.go | 2 +- internal/services/function/domain.go | 6 +- internal/services/function/function.go | 8 +- .../services/function/helpers_function.go | 16 +-- .../services/function/helpers_triggers.go | 12 +- internal/services/function/namespace.go | 8 +- internal/services/function/token.go | 6 +- internal/services/function/trigger.go | 8 +- internal/services/iam/api_key.go | 8 +- internal/services/iam/api_key_data_source.go | 2 +- internal/services/iam/application.go | 8 +- .../services/iam/application_data_source.go | 2 +- internal/services/iam/clients.go | 2 +- internal/services/iam/group.go | 8 +- internal/services/iam/group_data_source.go | 2 +- internal/services/iam/group_membership.go | 6 +- internal/services/iam/policy.go | 8 +- internal/services/iam/ssh_key.go | 8 +- internal/services/iam/ssh_key_data_source.go | 2 +- internal/services/iam/types.go | 18 +-- internal/services/iam/user.go | 8 +- internal/services/iam/user_data_source.go | 2 +- internal/services/inference/deployment.go | 22 +-- .../services/inference/helpers_inference.go | 4 +- internal/services/inference/model.go | 6 +- .../services/inference/model_data_source.go | 2 +- internal/services/inference/types.go | 10 +- .../data_source_instance_private_nic.go | 2 +- .../services/instance/helpers_instance.go | 26 ++-- internal/services/instance/image.go | 8 +- .../services/instance/image_data_source.go | 2 +- .../instance/instancehelpers/block.go | 4 +- internal/services/instance/ip.go | 8 +- internal/services/instance/ip_data_source.go | 2 +- internal/services/instance/ip_reverse_dns.go | 8 +- internal/services/instance/placement_group.go | 8 +- .../instance/placement_group_data_source.go | 2 +- internal/services/instance/private_nic.go | 8 +- internal/services/instance/security_group.go | 30 ++-- .../instance/security_group_data_source.go | 2 +- .../services/instance/security_group_rules.go | 8 +- internal/services/instance/server.go | 50 +++---- .../services/instance/server_data_source.go | 2 +- .../services/instance/servers_data_source.go | 6 +- internal/services/instance/snapshot.go | 10 +- .../services/instance/snapshot_data_source.go | 2 +- internal/services/instance/types.go | 18 +-- internal/services/instance/user_data.go | 8 +- internal/services/instance/volume.go | 8 +- .../services/instance/volume_data_source.go | 2 +- .../services/iot/data_source_iot_device.go | 2 +- internal/services/iot/data_source_iot_hub.go | 2 +- internal/services/iot/device.go | 24 ++-- internal/services/iot/helpers_iot.go | 8 +- internal/services/iot/hub.go | 8 +- internal/services/iot/network.go | 6 +- internal/services/iot/routes.go | 12 +- internal/services/ipam/helpers.go | 10 +- internal/services/ipam/ip.go | 8 +- internal/services/ipam/ip_data_source.go | 8 +- internal/services/ipam/ip_reverse_dns.go | 8 +- internal/services/ipam/ips_data_source.go | 6 +- internal/services/ipam/types.go | 34 ++--- internal/services/jobs/helpers.go | 10 +- internal/services/jobs/jobs.go | 12 +- internal/services/k8s/acl.go | 22 +-- internal/services/k8s/cluster.go | 16 +-- internal/services/k8s/cluster_data_source.go | 2 +- internal/services/k8s/helpers_k8s.go | 12 +- .../services/k8s/k8s_version_data_source.go | 2 +- internal/services/k8s/pool.go | 10 +- internal/services/k8s/pool_data_source.go | 2 +- internal/services/k8s/types.go | 36 ++--- internal/services/lb/acl.go | 8 +- internal/services/lb/acls_data_source.go | 6 +- internal/services/lb/backend.go | 8 +- internal/services/lb/backend_data_source.go | 2 +- internal/services/lb/backends_data_source.go | 6 +- internal/services/lb/certificate.go | 8 +- .../services/lb/certificate_data_source.go | 2 +- .../services/lb/data_source_lb_frontends.go | 6 +- internal/services/lb/data_source_lb_ip.go | 2 +- internal/services/lb/frontend.go | 16 +-- internal/services/lb/frontend_data_source.go | 2 +- internal/services/lb/helpers_lb.go | 22 +-- internal/services/lb/ip.go | 8 +- internal/services/lb/ips_data_source.go | 6 +- internal/services/lb/lb.go | 16 +-- internal/services/lb/lb_data_source.go | 2 +- internal/services/lb/lb_test.go | 4 +- internal/services/lb/lbs_data_source.go | 6 +- internal/services/lb/route.go | 8 +- internal/services/lb/route_data_source.go | 2 +- internal/services/lb/routes_data_source.go | 6 +- internal/services/lb/types.go | 134 +++++++++--------- internal/services/marketplace/helpers.go | 2 +- .../services/marketplace/image_data_source.go | 2 +- internal/services/mnq/helpers_mnq.go | 22 +-- internal/services/mnq/helpers_mnq_queue.go | 10 +- internal/services/mnq/helpers_mnq_sns.go | 8 +- internal/services/mnq/nats_account.go | 8 +- internal/services/mnq/nats_credentials.go | 6 +- internal/services/mnq/sns.go | 6 +- internal/services/mnq/sns_credentials.go | 8 +- internal/services/mnq/sns_data_source.go | 2 +- internal/services/mnq/sns_topic.go | 8 +- .../services/mnq/sns_topic_subscription.go | 6 +- internal/services/mnq/sqs.go | 6 +- internal/services/mnq/sqs_credentials.go | 8 +- internal/services/mnq/sqs_data_source.go | 2 +- internal/services/mnq/sqs_queue.go | 8 +- .../services/mongodb/data_source_instance.go | 2 +- internal/services/mongodb/helpers.go | 12 +- internal/services/mongodb/instance.go | 20 +-- internal/services/mongodb/snapshot.go | 8 +- internal/services/mongodb/types.go | 12 +- internal/services/object/bucket.go | 38 ++--- internal/services/object/bucket_acl.go | 64 ++++----- .../object/bucket_lock_configuration.go | 38 ++--- internal/services/object/bucket_policy.go | 6 +- .../services/object/bucket_policy_test.go | 6 +- .../object/bucket_website_configuration.go | 44 +++--- .../object/data_source_object_bucket.go | 2 +- .../data_source_object_bucket_policy.go | 2 +- internal/services/object/helpers_object.go | 46 +++--- .../services/object/helpers_object_test.go | 8 +- internal/services/object/object.go | 10 +- internal/services/rdb/acl.go | 40 +++--- internal/services/rdb/acl_data_source.go | 2 +- .../rdb/data_source_rdb_database_backup.go | 2 +- .../services/rdb/data_source_rdb_instance.go | 2 +- internal/services/rdb/database.go | 6 +- internal/services/rdb/database_backup.go | 8 +- internal/services/rdb/database_data_source.go | 2 +- internal/services/rdb/helpers.go | 8 +- internal/services/rdb/helpers_test.go | 4 +- internal/services/rdb/instance.go | 10 +- internal/services/rdb/privilege.go | 8 +- .../services/rdb/privilege_data_source.go | 2 +- internal/services/rdb/read_replica.go | 8 +- internal/services/rdb/snapshots.go | 8 +- internal/services/rdb/types.go | 58 ++++---- internal/services/rdb/user.go | 8 +- internal/services/redis/cluster.go | 12 +- .../services/redis/cluster_data_source.go | 2 +- internal/services/redis/helpers.go | 12 +- internal/services/redis/types.go | 38 ++--- internal/services/registry/helpers.go | 4 +- .../services/registry/image_data_source.go | 2 +- internal/services/registry/namespace.go | 8 +- .../registry/namespace_data_source.go | 2 +- internal/services/registry/tag_data_source.go | 2 +- .../scwconfig/scw_config_data_source.go | 2 +- internal/services/sdb/database.go | 8 +- internal/services/sdb/helpers.go | 4 +- internal/services/secret/helpers.go | 20 +-- internal/services/secret/secret.go | 12 +- .../services/secret/secret_data_source.go | 2 +- internal/services/secret/version.go | 10 +- .../services/secret/version_data_source.go | 2 +- internal/services/tem/blockedlist.go | 6 +- internal/services/tem/domain.go | 10 +- internal/services/tem/domain_data_source.go | 2 +- internal/services/tem/domain_validation.go | 6 +- internal/services/tem/helpers.go | 6 +- .../tem/offer_subscription_data_source.go | 2 +- internal/services/tem/types.go | 6 +- internal/services/tem/webhook.go | 12 +- internal/services/vpc/acl.go | 8 +- internal/services/vpc/helpers.go | 10 +- internal/services/vpc/private_network.go | 8 +- .../vpc/private_network_data_source.go | 2 +- internal/services/vpc/route.go | 8 +- internal/services/vpc/routes_data_source.go | 6 +- internal/services/vpc/types.go | 40 +++--- internal/services/vpc/vpc.go | 10 +- internal/services/vpc/vpc_data_source.go | 4 +- internal/services/vpc/vpcs_data_source.go | 6 +- internal/services/vpcgw/dhcp.go | 8 +- internal/services/vpcgw/dhcp_data_source.go | 2 +- internal/services/vpcgw/dhcp_reservation.go | 8 +- .../vpcgw/dhcp_reservation_data_source.go | 2 +- internal/services/vpcgw/helpers.go | 30 ++-- internal/services/vpcgw/ip.go | 8 +- internal/services/vpcgw/ip_data_source.go | 2 +- internal/services/vpcgw/ip_reverse.go | 8 +- internal/services/vpcgw/network.go | 10 +- .../services/vpcgw/network_data_source.go | 2 +- internal/services/vpcgw/pat_rule.go | 8 +- .../services/vpcgw/pat_rule_data_source.go | 2 +- internal/services/vpcgw/public_gateway.go | 8 +- .../vpcgw/public_gateway_data_source.go | 2 +- internal/services/webhosting/helpers.go | 20 +-- .../services/webhosting/offer_data_source.go | 2 +- internal/services/webhosting/types.go | 28 ++-- internal/services/webhosting/webhosting.go | 10 +- .../webhosting/webhosting_data_source.go | 2 +- internal/types/bool.go | 6 +- internal/types/ip.go | 2 +- internal/types/map.go | 18 +-- internal/types/number.go | 10 +- internal/types/scw.go | 4 +- internal/types/string.go | 70 ++++----- internal/types/time.go | 8 +- internal/verify/cron.go | 2 +- internal/verify/date.go | 4 +- internal/verify/email.go | 6 +- internal/verify/email_test.go | 10 +- internal/verify/ip.go | 2 +- internal/verify/uuid.go | 8 +- 294 files changed, 1543 insertions(+), 1538 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 5273a42d4a..472e73e267 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,6 +5,11 @@ formatters: - gofmt # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification [fast: true, auto-fix: true] - gofumpt # Gofumpt checks whether code was gofumpt-ed. [fast: true, auto-fix: true] - goimports # In addition to fixing imports, goimports also formats your code in the same style as gofmt. [fast: true, auto-fix: true] + settings: + gofmt: + rewrite-rules: + - pattern: interface{} + replacement: any linters: # Run golangci-lint linters to see the list of all linters diff --git a/cmd/vcr-compressor/main.go b/cmd/vcr-compressor/main.go index 82961a020b..8a69925102 100644 --- a/cmd/vcr-compressor/main.go +++ b/cmd/vcr-compressor/main.go @@ -68,7 +68,7 @@ func main() { continue } - var m map[string]interface{} + var m map[string]any err := json.Unmarshal([]byte(responseBody), &m) if err != nil { diff --git a/cmd/vcr-viewer/main.go b/cmd/vcr-viewer/main.go index 72eeb9fb16..f89efd566e 100644 --- a/cmd/vcr-viewer/main.go +++ b/cmd/vcr-viewer/main.go @@ -37,7 +37,7 @@ func main() { log.Printf(" Status: %s\n", interaction.Response.Status) log.Printf(" Body: %s\n", interaction.Response.Body) - var m map[string]interface{} + var m map[string]any err := json.Unmarshal([]byte(interaction.Response.Body), &m) if err != nil { diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index d7a051dacc..b54eb1add3 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -131,7 +131,7 @@ func compareJSONFieldsStrings(expected, actual string) bool { // compareJSONBodies compare two given maps that represent json bodies // returns true if both json are equivalent -func compareJSONBodies(expected, actual map[string]interface{}) bool { +func compareJSONBodies(expected, actual map[string]any) bool { // Check for each key in actual requests // Compare its value to cassette content if marshal-able to string for key := range actual { diff --git a/internal/acctest/vcr.go b/internal/acctest/vcr.go index 6cdadaa7a0..d5865989f9 100644 --- a/internal/acctest/vcr.go +++ b/internal/acctest/vcr.go @@ -28,7 +28,7 @@ var UpdateCassettes = flag.Bool("cassettes", os.Getenv("TF_UPDATE_CASSETTES") == // SensitiveFields is a map with keys listing fields that should be anonymized // value will be set in place of its old value -var SensitiveFields = map[string]interface{}{ +var SensitiveFields = map[string]any{ "secret_key": "00000000-0000-0000-0000-000000000000", } @@ -65,7 +65,7 @@ func getTestFilePath(t *testing.T, pkgFolder string, suffix string) string { return filepath.Join(pkgFolder, "testdata", fileName) } -func compareJSONFields(expected, actualI interface{}) bool { +func compareJSONFields(expected, actualI any) bool { switch actual := actualI.(type) { case string: if _, isString := expected.(string); !isString { @@ -138,10 +138,10 @@ func cassetteBodyMatcher(actualRequest *http.Request, cassetteRequest cassette.R return true } - actualJSON := make(map[string]interface{}) - cassetteJSON := make(map[string]interface{}) + actualJSON := make(map[string]any) + cassetteJSON := make(map[string]any) - err = xml.Unmarshal(actualRawBody, new(interface{})) + err = xml.Unmarshal(actualRawBody, new(any)) if err == nil { // match if content is xml return true @@ -236,7 +236,7 @@ func cassetteMatcher(actual *http.Request, expected cassette.Request) bool { } func cassetteSensitiveFieldsAnonymizer(i *cassette.Interaction) error { - var jsonBody map[string]interface{} + var jsonBody map[string]any err := json.Unmarshal([]byte(i.Response.Body), &jsonBody) if err != nil { diff --git a/internal/cdf/locality.go b/internal/cdf/locality.go index 5be96980d5..e2f2ed04c3 100644 --- a/internal/cdf/locality.go +++ b/internal/cdf/locality.go @@ -45,7 +45,7 @@ func expandListKeys(key string, diff *schema.ResourceDiff) []string { // getLocality find the locality of a resource // Will try to get the zone if available then use region // Will also use default zone or region if available -func getLocality(diff *schema.ResourceDiff, m interface{}) string { +func getLocality(diff *schema.ResourceDiff, m any) string { var loc string rawStateType := diff.GetRawState().Type() @@ -67,7 +67,7 @@ func getLocality(diff *schema.ResourceDiff, m interface{}) string { // Should not be used on computed keys, if a computed key is going to change on zone/region change // this function will still block the terraform plan func LocalityCheck(keys ...string) schema.CustomizeDiffFunc { - return func(_ context.Context, diff *schema.ResourceDiff, m interface{}) error { + return func(_ context.Context, diff *schema.ResourceDiff, m any) error { l := getLocality(diff, m) if l == "" { diff --git a/internal/datasource/schemas.go b/internal/datasource/schemas.go index 33b8698ee1..48f9e85ae2 100644 --- a/internal/datasource/schemas.go +++ b/internal/datasource/schemas.go @@ -7,7 +7,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" ) -func NewZonedID(idI interface{}, fallBackZone scw.Zone) string { +func NewZonedID(idI any, fallBackZone scw.Zone) string { zone, id, err := zonal.ParseID(idI.(string)) if err != nil { id = idI.(string) @@ -17,7 +17,7 @@ func NewZonedID(idI interface{}, fallBackZone scw.Zone) string { return zonal.NewIDString(zone, id) } -func NewRegionalID(idI interface{}, fallBackRegion scw.Region) string { +func NewRegionalID(idI any, fallBackRegion scw.Region) string { region, id, err := regional.ParseID(idI.(string)) if err != nil { id = idI.(string) diff --git a/internal/datasource/search.go b/internal/datasource/search.go index 452039e90d..05b67fcabf 100644 --- a/internal/datasource/search.go +++ b/internal/datasource/search.go @@ -60,7 +60,7 @@ func notFound(err error) bool { } type TooManyResultsError struct { - LastRequest interface{} + LastRequest any Count int } @@ -74,7 +74,7 @@ func (e *TooManyResultsError) Is(err error) bool { return ok } -func (e *TooManyResultsError) As(target interface{}) bool { +func (e *TooManyResultsError) As(target any) bool { t, ok := target.(**retry.NotFoundError) if !ok { return false diff --git a/internal/dsf/list.go b/internal/dsf/list.go index cb71f508c9..e7df7c6128 100644 --- a/internal/dsf/list.go +++ b/internal/dsf/list.go @@ -29,14 +29,14 @@ func ExtractBaseKey(k string) string { func GetStringListsFromState(key string, d *schema.ResourceData) ([]string, []string) { oldList, newList := d.GetChange(key) - oldListStr := make([]string, len(oldList.([]interface{}))) - newListStr := make([]string, len(newList.([]interface{}))) + oldListStr := make([]string, len(oldList.([]any))) + newListStr := make([]string, len(newList.([]any))) - for i, v := range oldList.([]interface{}) { + for i, v := range oldList.([]any) { oldListStr[i] = fmt.Sprint(v) } - for i, v := range newList.([]interface{}) { + for i, v := range newList.([]any) { newListStr[i] = fmt.Sprint(v) } diff --git a/internal/logging/logger.go b/internal/logging/logger.go index 102682f9b8..a9a76a628d 100644 --- a/internal/logging/logger.go +++ b/internal/logging/logger.go @@ -20,27 +20,27 @@ type Logger struct{} var L = Logger{} // Debugf logs to the DEBUG log. Arguments are handled in the manner of fmt.Printf. -func (l Logger) Debugf(format string, args ...interface{}) { +func (l Logger) Debugf(format string, args ...any) { log.Printf("[DEBUG] "+format, args...) } // Infof logs to the INFO log. Arguments are handled in the manner of fmt.Printf. -func (l Logger) Infof(format string, args ...interface{}) { +func (l Logger) Infof(format string, args ...any) { log.Printf("[INFO] "+format, args...) } // Warningf logs to the WARNING log. Arguments are handled in the manner of fmt.Printf. -func (l Logger) Warningf(format string, args ...interface{}) { +func (l Logger) Warningf(format string, args ...any) { log.Printf("[WARN] "+format, args...) } // Errorf logs to the ERROR log. Arguments are handled in the manner of fmt.Printf. -func (l Logger) Errorf(format string, args ...interface{}) { +func (l Logger) Errorf(format string, args ...any) { log.Printf("[ERROR] "+format, args...) } // Printf logs to the DEBUG log. Arguments are handled in the manner of fmt.Printf. -func (l Logger) Printf(format string, args ...interface{}) { +func (l Logger) Printf(format string, args ...any) { l.Debugf(format, args...) } diff --git a/internal/meta/extractors.go b/internal/meta/extractors.go index 67e5bae700..ce66771dd9 100644 --- a/internal/meta/extractors.go +++ b/internal/meta/extractors.go @@ -15,15 +15,15 @@ import ( // terraformResourceData is an interface for *schema.ResourceData. (used for mock) type terraformResourceData interface { HasChange(string) bool - GetOk(string) (interface{}, bool) - Get(string) interface{} + GetOk(string) (any, bool) + Get(string) any Id() string } // ExtractZone will try to guess the zone from the following: // - zone field of the resource data // - default zone from config -func ExtractZone(d terraformResourceData, m interface{}) (scw.Zone, error) { +func ExtractZone(d terraformResourceData, m any) (scw.Zone, error) { rawZone, exist := d.GetOk("zone") if exist { return scw.ParseZone(rawZone.(string)) @@ -40,7 +40,7 @@ func ExtractZone(d terraformResourceData, m interface{}) (scw.Zone, error) { // ExtractRegion will try to guess the region from the following: // - region field of the resource data // - default region from config -func ExtractRegion(d terraformResourceData, m interface{}) (scw.Region, error) { +func ExtractRegion(d terraformResourceData, m any) (scw.Region, error) { rawRegion, exist := d.GetOk("region") if exist { return scw.ParseRegion(rawRegion.(string)) @@ -58,7 +58,7 @@ func ExtractRegion(d terraformResourceData, m interface{}) (scw.Region, error) { // - region field of the resource data // - default region given in argument // - default region from config -func ExtractRegionWithDefault(d terraformResourceData, m interface{}, defaultRegion scw.Region) (scw.Region, error) { +func ExtractRegionWithDefault(d terraformResourceData, m any, defaultRegion scw.Region) (scw.Region, error) { rawRegion, exist := d.GetOk("region") if exist { return scw.ParseRegion(rawRegion.(string)) @@ -79,7 +79,7 @@ func ExtractRegionWithDefault(d terraformResourceData, m interface{}, defaultReg // ExtractProjectID will try to guess the project id from the following: // - project_id field of the resource data // - default project id from config -func ExtractProjectID(d terraformResourceData, m interface{}) (projectID string, isDefault bool, err error) { +func ExtractProjectID(d terraformResourceData, m any) (projectID string, isDefault bool, err error) { rawProjectID, exist := d.GetOk("project_id") if exist { return rawProjectID.(string), false, nil @@ -93,15 +93,15 @@ func ExtractProjectID(d terraformResourceData, m interface{}) (projectID string, return "", false, ErrProjectIDNotFound } -func ExtractScwClient(m interface{}) *scw.Client { +func ExtractScwClient(m any) *scw.Client { return m.(*Meta).ScwClient() } -func ExtractHTTPClient(m interface{}) *http.Client { +func ExtractHTTPClient(m any) *http.Client { return m.(*Meta).HTTPClient() } -func getKeyInRawConfigMap(rawConfig map[string]cty.Value, key string, ty cty.Type) (interface{}, bool) { +func getKeyInRawConfigMap(rawConfig map[string]cty.Value, key string, ty cty.Type) (any, bool) { if key == "" { return rawConfig, false } @@ -159,7 +159,7 @@ func getKeyInRawConfigMap(rawConfig map[string]cty.Value, key string, ty cty.Typ // GetRawConfigForKey returns the value for a specific key in the user's raw configuration, which can be useful on resources' update // The value for the key to look for must be a primitive type (bool, string, number) and the expected type of the value should be passed as the ty parameter -func GetRawConfigForKey(d *schema.ResourceData, key string, ty cty.Type) (interface{}, bool) { +func GetRawConfigForKey(d *schema.ResourceData, key string, ty cty.Type) (any, bool) { rawConfig := d.GetRawConfig() if rawConfig.IsNull() { return nil, false diff --git a/internal/provider/provider.go b/internal/provider/provider.go index af671402b8..c13ffcd749 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -341,7 +341,7 @@ func Provider(config *Config) plugin.ProviderFunc { addBetaResources(p) - p.ConfigureContextFunc = func(ctx context.Context, data *schema.ResourceData) (interface{}, diag.Diagnostics) { + p.ConfigureContextFunc = func(ctx context.Context, data *schema.ResourceData) (any, diag.Diagnostics) { terraformVersion := p.TerraformVersion // If we provide meta in config use it. This is useful for tests diff --git a/internal/services/account/helpers.go b/internal/services/account/helpers.go index 65573c470f..3b2e250f31 100644 --- a/internal/services/account/helpers.go +++ b/internal/services/account/helpers.go @@ -10,11 +10,11 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func NewProjectAPI(m interface{}) *accountSDK.ProjectAPI { +func NewProjectAPI(m any) *accountSDK.ProjectAPI { return accountSDK.NewProjectAPI(meta.ExtractScwClient(m)) } -func GetOrganizationID(m interface{}, d *schema.ResourceData) *string { +func GetOrganizationID(m any, d *schema.ResourceData) *string { orgID, orgIDExist := d.GetOk("organization_id") if orgIDExist { diff --git a/internal/services/account/project.go b/internal/services/account/project.go index 9e5d91ce3d..ec62c5e5ec 100644 --- a/internal/services/account/project.go +++ b/internal/services/account/project.go @@ -57,7 +57,7 @@ func ResourceProject() *schema.Resource { } } -func resourceAccountProjectCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceAccountProjectCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { accountAPI := NewProjectAPI(m) request := &accountSDK.ProjectAPICreateProjectRequest{ @@ -79,7 +79,7 @@ func resourceAccountProjectCreate(ctx context.Context, d *schema.ResourceData, m return resourceAccountProjectRead(ctx, d, m) } -func resourceAccountProjectRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceAccountProjectRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { accountAPI := NewProjectAPI(m) res, err := accountAPI.GetProject(&accountSDK.ProjectAPIGetProjectRequest{ @@ -104,7 +104,7 @@ func resourceAccountProjectRead(ctx context.Context, d *schema.ResourceData, m i return nil } -func resourceAccountProjectUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceAccountProjectUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { accountAPI := NewProjectAPI(m) req := &accountSDK.ProjectAPIUpdateProjectRequest{ @@ -133,7 +133,7 @@ func resourceAccountProjectUpdate(ctx context.Context, d *schema.ResourceData, m return resourceAccountProjectRead(ctx, d, m) } -func resourceAccountProjectDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceAccountProjectDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { accountAPI := NewProjectAPI(m) err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *retry.RetryError { diff --git a/internal/services/account/project_data_source.go b/internal/services/account/project_data_source.go index 8a5d77dcae..89e57b188a 100644 --- a/internal/services/account/project_data_source.go +++ b/internal/services/account/project_data_source.go @@ -33,7 +33,7 @@ func DataSourceProject() *schema.Resource { } } -func DataSourceAccountProjectRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceAccountProjectRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { accountAPI := NewProjectAPI(m) var projectID string @@ -144,7 +144,7 @@ func DataSourceProjects() *schema.Resource { } } -func DataSourceAccountProjectsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceAccountProjectsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { accountAPI := NewProjectAPI(m) var orgID *string @@ -173,10 +173,10 @@ func DataSourceAccountProjectsRead(ctx context.Context, d *schema.ResourceData, return nil } -func flattenProjects(projects []*accountSDK.Project) []map[string]interface{} { - flattenedProjects := make([]map[string]interface{}, len(projects)) +func flattenProjects(projects []*accountSDK.Project) []map[string]any { + flattenedProjects := make([]map[string]any, len(projects)) for i, project := range projects { - flattenedProjects[i] = map[string]interface{}{ + flattenedProjects[i] = map[string]any{ "id": project.ID, "name": project.Name, "organization_id": project.OrganizationID, diff --git a/internal/services/applesilicon/clients.go b/internal/services/applesilicon/clients.go index ea5e8cdedc..2928c8b5b0 100644 --- a/internal/services/applesilicon/clients.go +++ b/internal/services/applesilicon/clients.go @@ -9,7 +9,7 @@ import ( ) // newAPIWithZone returns a new apple silicon API and the zone -func newAPIWithZone(d *schema.ResourceData, m interface{}) (*applesilicon.API, scw.Zone, error) { +func newAPIWithZone(d *schema.ResourceData, m any) (*applesilicon.API, scw.Zone, error) { asAPI := applesilicon.NewAPI(meta.ExtractScwClient(m)) zone, err := meta.ExtractZone(d, m) @@ -21,7 +21,7 @@ func newAPIWithZone(d *schema.ResourceData, m interface{}) (*applesilicon.API, s } // NewAPIWithZoneAndID returns an apple silicon API with zone and ID extracted from the state -func NewAPIWithZoneAndID(m interface{}, id string) (*applesilicon.API, scw.Zone, string, error) { +func NewAPIWithZoneAndID(m any, id string) (*applesilicon.API, scw.Zone, string, error) { asAPI := applesilicon.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) @@ -32,7 +32,7 @@ func NewAPIWithZoneAndID(m interface{}, id string) (*applesilicon.API, scw.Zone, return asAPI, zone, ID, nil } -func newPrivateNetworkAPIWithZone(d *schema.ResourceData, m interface{}) (*applesilicon.PrivateNetworkAPI, scw.Zone, error) { +func newPrivateNetworkAPIWithZone(d *schema.ResourceData, m any) (*applesilicon.PrivateNetworkAPI, scw.Zone, error) { privateNetworkAPI := applesilicon.NewPrivateNetworkAPI(meta.ExtractScwClient(m)) zone, err := meta.ExtractZone(d, m) diff --git a/internal/services/applesilicon/helpers.go b/internal/services/applesilicon/helpers.go index 07710d44f8..2d15bc1382 100644 --- a/internal/services/applesilicon/helpers.go +++ b/internal/services/applesilicon/helpers.go @@ -9,7 +9,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors" ) -func detachAllPrivateNetworkFromServer(ctx context.Context, d *schema.ResourceData, m interface{}, serverID string) error { +func detachAllPrivateNetworkFromServer(ctx context.Context, d *schema.ResourceData, m any, serverID string) error { privateNetworkAPI, zone, err := newPrivateNetworkAPIWithZone(d, m) if err != nil { return err diff --git a/internal/services/applesilicon/server.go b/internal/services/applesilicon/server.go index e5c61ebf4b..cb89599096 100644 --- a/internal/services/applesilicon/server.go +++ b/internal/services/applesilicon/server.go @@ -72,7 +72,7 @@ func ResourceServer() *schema.Resource { Description: "The private network ID", Required: true, ValidateDiagFunc: verify.IsUUIDorUUIDWithLocality(), - StateFunc: func(i interface{}) string { + StateFunc: func(i any) string { return locality.ExpandID(i.(string)) }, }, @@ -186,7 +186,7 @@ func ResourceServer() *schema.Resource { } } -func ResourceAppleSiliconServerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceAppleSiliconServerCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { asAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -234,7 +234,7 @@ func ResourceAppleSiliconServerCreate(ctx context.Context, d *schema.ResourceDat return ResourceAppleSiliconServerRead(ctx, d, m) } -func ResourceAppleSiliconServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceAppleSiliconServerRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { asAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -292,7 +292,7 @@ func ResourceAppleSiliconServerRead(ctx context.Context, d *schema.ResourceData, } diags := diag.Diagnostics{} - allPrivateIPs := make([]map[string]interface{}, 0, listPrivateNetworks.TotalCount) + allPrivateIPs := make([]map[string]any, 0, listPrivateNetworks.TotalCount) authorized := true for _, privateNetworkID := range privateNetworkIDs { @@ -338,7 +338,7 @@ func ResourceAppleSiliconServerRead(ctx context.Context, d *schema.ResourceData, return diags } -func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { asAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -399,7 +399,7 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat return ResourceAppleSiliconServerRead(ctx, d, m) } -func ResourceAppleSiliconServerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceAppleSiliconServerDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { asAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/applesilicon/types.go b/internal/services/applesilicon/types.go index 6e9ebcf85b..24e9eec607 100644 --- a/internal/services/applesilicon/types.go +++ b/internal/services/applesilicon/types.go @@ -9,17 +9,17 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func expandPrivateNetworks(pn interface{}) map[string]*[]string { +func expandPrivateNetworks(pn any) map[string]*[]string { privateNetworks := make(map[string]*[]string) for _, op := range pn.(*schema.Set).List() { - rawPN := op.(map[string]interface{}) + rawPN := op.(map[string]any) id := locality.ExpandID(rawPN["id"].(string)) ipamIPIDs := &[]string{} if ipamIPs, ok := rawPN["ipam_ip_ids"]; ok && ipamIPs != nil { - ipamIPsList := ipamIPs.([]interface{}) + ipamIPsList := ipamIPs.([]any) if len(ipamIPsList) > 0 { ips := make([]string, len(ipamIPsList)) @@ -37,10 +37,10 @@ func expandPrivateNetworks(pn interface{}) map[string]*[]string { return privateNetworks } -func flattenPrivateNetworks(region scw.Region, privateNetworks []*applesilicon.ServerPrivateNetwork) interface{} { - flattenedPrivateNetworks := []map[string]interface{}(nil) +func flattenPrivateNetworks(region scw.Region, privateNetworks []*applesilicon.ServerPrivateNetwork) any { + flattenedPrivateNetworks := []map[string]any(nil) for _, privateNetwork := range privateNetworks { - flattenedPrivateNetworks = append(flattenedPrivateNetworks, map[string]interface{}{ + flattenedPrivateNetworks = append(flattenedPrivateNetworks, map[string]any{ "id": regional.NewIDString(region, privateNetwork.PrivateNetworkID), "ipam_ip_ids": regional.NewRegionalIDs(region, privateNetwork.IpamIPIDs), "vlan": types.FlattenUint32Ptr(privateNetwork.Vlan), diff --git a/internal/services/az/availability_zones_data_source.go b/internal/services/az/availability_zones_data_source.go index adcc0868d4..e33f57e2a8 100644 --- a/internal/services/az/availability_zones_data_source.go +++ b/internal/services/az/availability_zones_data_source.go @@ -39,7 +39,7 @@ func DataSourceAvailabilityZones() *schema.Resource { } } -func dataSourceAvailabilityZonesRead(_ context.Context, d *schema.ResourceData, _ interface{}) diag.Diagnostics { +func dataSourceAvailabilityZonesRead(_ context.Context, d *schema.ResourceData, _ any) diag.Diagnostics { regionStr := d.Get("region").(string) if !validation.IsRegion(regionStr) { diff --git a/internal/services/baremetal/helpers.go b/internal/services/baremetal/helpers.go index a7346bb408..6f163ab692 100644 --- a/internal/services/baremetal/helpers.go +++ b/internal/services/baremetal/helpers.go @@ -29,7 +29,7 @@ const ( ) // newAPIWithZone returns a new API and the zone for a Create request -func newAPIWithZone(d *schema.ResourceData, m interface{}) (*baremetal.API, scw.Zone, error) { +func newAPIWithZone(d *schema.ResourceData, m any) (*baremetal.API, scw.Zone, error) { api := baremetal.NewAPI(meta.ExtractScwClient(m)) zone, err := meta.ExtractZone(d, m) @@ -41,7 +41,7 @@ func newAPIWithZone(d *schema.ResourceData, m interface{}) (*baremetal.API, scw. } // NewAPIWithZoneAndID returns an API with zone and ID extracted from the state -func NewAPIWithZoneAndID(m interface{}, id string) (*baremetal.API, zonal.ID, error) { +func NewAPIWithZoneAndID(m any, id string) (*baremetal.API, zonal.ID, error) { api := baremetal.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) @@ -53,7 +53,7 @@ func NewAPIWithZoneAndID(m interface{}, id string) (*baremetal.API, zonal.ID, er } // returns a new private network API and the zone for a Create request -func newPrivateNetworkAPIWithZone(d *schema.ResourceData, m interface{}) (*baremetalV3.PrivateNetworkAPI, scw.Zone, error) { +func newPrivateNetworkAPIWithZone(d *schema.ResourceData, m any) (*baremetalV3.PrivateNetworkAPI, scw.Zone, error) { privateNetworkAPI := baremetalV3.NewPrivateNetworkAPI(meta.ExtractScwClient(m)) zone, err := meta.ExtractZone(d, m) @@ -65,7 +65,7 @@ func newPrivateNetworkAPIWithZone(d *schema.ResourceData, m interface{}) (*barem } // NewPrivateNetworkAPIWithZoneAndID returns a private network API with zone and ID extracted from the state -func NewPrivateNetworkAPIWithZoneAndID(m interface{}, id string) (*baremetalV3.PrivateNetworkAPI, zonal.ID, error) { +func NewPrivateNetworkAPIWithZoneAndID(m any, id string) (*baremetalV3.PrivateNetworkAPI, zonal.ID, error) { privateNetworkAPI := baremetalV3.NewPrivateNetworkAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) @@ -76,7 +76,7 @@ func NewPrivateNetworkAPIWithZoneAndID(m interface{}, id string) (*baremetalV3.P return privateNetworkAPI, zonal.NewID(zone, ID), nil } -func detachAllPrivateNetworkFromServer(ctx context.Context, d *schema.ResourceData, m interface{}, serverID string) error { +func detachAllPrivateNetworkFromServer(ctx context.Context, d *schema.ResourceData, m any, serverID string) error { privateNetworkAPI, zone, err := newPrivateNetworkAPIWithZone(d, m) if err != nil { return err @@ -168,8 +168,8 @@ func compareOptions(slice1, slice2 []*baremetal.ServerOption) []*baremetal.Serve } // customDiffPrivateNetworkOption checks that the private_network option has been set if there is a private_network -func customDiffPrivateNetworkOption() func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error { - return func(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { +func customDiffPrivateNetworkOption() func(ctx context.Context, diff *schema.ResourceDiff, i any) error { + return func(_ context.Context, diff *schema.ResourceDiff, _ any) error { var isPrivateNetworkOption bool _, okPrivateNetwork := diff.GetOk("private_network") @@ -197,8 +197,8 @@ func customDiffPrivateNetworkOption() func(ctx context.Context, diff *schema.Res } } -func privateNetworkSetHash(v interface{}) int { - m := v.(map[string]interface{}) +func privateNetworkSetHash(v any) int { + m := v.(map[string]any) id := locality.ExpandID(m["id"].(string)) var buf bytes.Buffer @@ -206,7 +206,7 @@ func privateNetworkSetHash(v interface{}) int { buf.WriteString(id) if ipamIPs, ok := m["ipam_ip_ids"]; ok && ipamIPs != nil { - ipamIPsList := ipamIPs.([]interface{}) + ipamIPsList := ipamIPs.([]any) var ipamIPIDs []string @@ -227,7 +227,7 @@ func privateNetworkSetHash(v interface{}) int { return schema.HashString(buf.String()) } -func getOfferInformations(ctx context.Context, offer interface{}, id string, i interface{}) (*baremetal.Offer, error) { +func getOfferInformations(ctx context.Context, offer any, id string, i any) (*baremetal.Offer, error) { api, zone, err := NewAPIWithZoneAndID(i, id) if err != nil { return nil, err @@ -245,8 +245,8 @@ func getOfferInformations(ctx context.Context, offer interface{}, id string, i i } } -func customDiffOffer() func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error { - return func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error { +func customDiffOffer() func(ctx context.Context, diff *schema.ResourceDiff, i any) error { + return func(ctx context.Context, diff *schema.ResourceDiff, i any) error { if diff.Get("offer") == "" || !diff.HasChange("offer") || diff.Id() == "" { return nil } diff --git a/internal/services/baremetal/offer_data_source.go b/internal/services/baremetal/offer_data_source.go index b5493986d8..a71ba0695a 100644 --- a/internal/services/baremetal/offer_data_source.go +++ b/internal/services/baremetal/offer_data_source.go @@ -141,7 +141,7 @@ func DataSourceOffer() *schema.Resource { } } -func dataSourceOfferRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func dataSourceOfferRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, fallBackZone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/baremetal/option_data_source.go b/internal/services/baremetal/option_data_source.go index 66f4dda27d..7eef47a06b 100644 --- a/internal/services/baremetal/option_data_source.go +++ b/internal/services/baremetal/option_data_source.go @@ -40,7 +40,7 @@ func DataSourceOption() *schema.Resource { } } -func dataSourceOptionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func dataSourceOptionRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/baremetal/os_data_source.go b/internal/services/baremetal/os_data_source.go index 7f5d7b21f2..8cf6c50d2c 100644 --- a/internal/services/baremetal/os_data_source.go +++ b/internal/services/baremetal/os_data_source.go @@ -41,7 +41,7 @@ func DataSourceOS() *schema.Resource { } } -func DataSourceOSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceOSRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/baremetal/partition_schema_data_source.go b/internal/services/baremetal/partition_schema_data_source.go index ca279bc829..10f764b0bb 100644 --- a/internal/services/baremetal/partition_schema_data_source.go +++ b/internal/services/baremetal/partition_schema_data_source.go @@ -78,7 +78,7 @@ func DataPartitionSchema() *schema.Resource { } } -func dataPartitionSchemaRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func dataPartitionSchemaRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, fallBackZone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/baremetal/server.go b/internal/services/baremetal/server.go index 04c86b193d..95f1d2c566 100644 --- a/internal/services/baremetal/server.go +++ b/internal/services/baremetal/server.go @@ -222,7 +222,7 @@ If this behaviour is wanted, please set 'reinstall_on_ssh_key_changes' argument Description: "The ID of the private network to associate with the server", Required: true, ValidateDiagFunc: verify.IsUUIDorUUIDWithLocality(), - StateFunc: func(i interface{}) string { + StateFunc: func(i any) string { return locality.ExpandID(i.(string)) }, }, @@ -326,7 +326,7 @@ func ResourceServerIP() *schema.Resource { } } -func ResourceServerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceServerCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -447,7 +447,7 @@ func ResourceServerCreate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceServerRead(ctx, d, m) } -func ResourceServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceServerRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zonedID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -536,7 +536,7 @@ func ResourceServerRead(ctx context.Context, d *schema.ResourceData, m interface } // Read private IPs if possible - allPrivateIPs := make([]map[string]interface{}, 0, listPrivateNetworks.TotalCount) + allPrivateIPs := make([]map[string]any, 0, listPrivateNetworks.TotalCount) diags := diag.Diagnostics{} for _, privateNetworkID := range privateNetworkIDs { @@ -575,7 +575,7 @@ func ResourceServerRead(ctx context.Context, d *schema.ResourceData, m interface } //gocyclo:ignore -func ResourceServerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceServerUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zonedID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -763,7 +763,7 @@ func ResourceServerUpdate(ctx context.Context, d *schema.ResourceData, m interfa return append(diags, ResourceServerRead(ctx, d, m)...) } -func ResourceServerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceServerDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zonedID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -805,7 +805,7 @@ func installAttributeMissing(field *baremetal.OSOSField, d *schema.ResourceData, } // validateInstallConfig validates that schema contains attribute required for OS install -func validateInstallConfig(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func validateInstallConfig(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { baremetalAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/baremetal/server_data_source.go b/internal/services/baremetal/server_data_source.go index a2f4f91cfd..dc07627f6e 100644 --- a/internal/services/baremetal/server_data_source.go +++ b/internal/services/baremetal/server_data_source.go @@ -34,7 +34,7 @@ func DataSourceServer() *schema.Resource { } } -func DataSourceServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceServerRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/baremetal/types.go b/internal/services/baremetal/types.go index 3085f0a57c..30b1c3bf7e 100644 --- a/internal/services/baremetal/types.go +++ b/internal/services/baremetal/types.go @@ -11,11 +11,11 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func expandOptions(i interface{}) ([]*baremetal.ServerOption, error) { +func expandOptions(i any) ([]*baremetal.ServerOption, error) { options := []*baremetal.ServerOption(nil) for _, op := range i.(*schema.Set).List() { - rawOption := op.(map[string]interface{}) + rawOption := op.(map[string]any) option := &baremetal.ServerOption{} if optionExpiresAt, hasExpiresAt := rawOption["expires_at"]; hasExpiresAt { @@ -34,17 +34,17 @@ func expandOptions(i interface{}) ([]*baremetal.ServerOption, error) { return options, nil } -func expandPrivateNetworks(pn interface{}) map[string]*[]string { +func expandPrivateNetworks(pn any) map[string]*[]string { privateNetworks := make(map[string]*[]string) for _, op := range pn.(*schema.Set).List() { - rawPN := op.(map[string]interface{}) + rawPN := op.(map[string]any) id := locality.ExpandID(rawPN["id"].(string)) ipamIPIDs := &[]string{} if ipamIPs, ok := rawPN["ipam_ip_ids"]; ok && ipamIPs != nil { - ipamIPsList := ipamIPs.([]interface{}) + ipamIPsList := ipamIPs.([]any) if len(ipamIPsList) > 0 { ips := make([]string, len(ipamIPsList)) for i, ip := range ipamIPsList { @@ -61,14 +61,14 @@ func expandPrivateNetworks(pn interface{}) map[string]*[]string { return privateNetworks } -func flattenCPUs(cpus []*baremetal.CPU) interface{} { +func flattenCPUs(cpus []*baremetal.CPU) any { if cpus == nil { return nil } - flattenedCPUs := []map[string]interface{}(nil) + flattenedCPUs := []map[string]any(nil) for _, cpu := range cpus { - flattenedCPUs = append(flattenedCPUs, map[string]interface{}{ + flattenedCPUs = append(flattenedCPUs, map[string]any{ "name": cpu.Name, "core_count": cpu.CoreCount, "frequency": cpu.Frequency, @@ -79,14 +79,14 @@ func flattenCPUs(cpus []*baremetal.CPU) interface{} { return flattenedCPUs } -func flattenDisks(disks []*baremetal.Disk) interface{} { +func flattenDisks(disks []*baremetal.Disk) any { if disks == nil { return nil } - flattenedDisks := []map[string]interface{}(nil) + flattenedDisks := []map[string]any(nil) for _, disk := range disks { - flattenedDisks = append(flattenedDisks, map[string]interface{}{ + flattenedDisks = append(flattenedDisks, map[string]any{ "type": disk.Type, "capacity": disk.Capacity, }) @@ -95,14 +95,14 @@ func flattenDisks(disks []*baremetal.Disk) interface{} { return flattenedDisks } -func flattenMemory(memories []*baremetal.Memory) interface{} { +func flattenMemory(memories []*baremetal.Memory) any { if memories == nil { return nil } - flattenedMemories := []map[string]interface{}(nil) + flattenedMemories := []map[string]any(nil) for _, memory := range memories { - flattenedMemories = append(flattenedMemories, map[string]interface{}{ + flattenedMemories = append(flattenedMemories, map[string]any{ "type": memory.Type, "capacity": memory.Capacity, "frequency": memory.Frequency, @@ -113,14 +113,14 @@ func flattenMemory(memories []*baremetal.Memory) interface{} { return flattenedMemories } -func flattenIPs(ips []*baremetal.IP) interface{} { +func flattenIPs(ips []*baremetal.IP) any { if ips == nil { return nil } - flatIPs := []map[string]interface{}(nil) + flatIPs := []map[string]any(nil) for _, ip := range ips { - flatIPs = append(flatIPs, map[string]interface{}{ + flatIPs = append(flatIPs, map[string]any{ "id": ip.ID, "address": ip.Address.String(), "reverse": ip.Reverse, @@ -131,16 +131,16 @@ func flattenIPs(ips []*baremetal.IP) interface{} { return flatIPs } -func flattenIPv4s(ips []*baremetal.IP) interface{} { +func flattenIPv4s(ips []*baremetal.IP) any { if ips == nil { return nil } - flatIPs := []map[string]interface{}(nil) + flatIPs := []map[string]any(nil) for _, ip := range ips { if ip.Version == baremetal.IPVersionIPv4 { - flatIPs = append(flatIPs, map[string]interface{}{ + flatIPs = append(flatIPs, map[string]any{ "id": ip.ID, "address": ip.Address.String(), "reverse": ip.Reverse, @@ -152,16 +152,16 @@ func flattenIPv4s(ips []*baremetal.IP) interface{} { return flatIPs } -func flattenIPv6s(ips []*baremetal.IP) interface{} { +func flattenIPv6s(ips []*baremetal.IP) any { if ips == nil { return nil } - flatIPs := []map[string]interface{}(nil) + flatIPs := []map[string]any(nil) for _, ip := range ips { if ip.Version == baremetal.IPVersionIPv6 { - flatIPs = append(flatIPs, map[string]interface{}{ + flatIPs = append(flatIPs, map[string]any{ "id": ip.ID, "address": ip.Address.String(), "reverse": ip.Reverse, @@ -173,14 +173,14 @@ func flattenIPv6s(ips []*baremetal.IP) interface{} { return flatIPs } -func flattenOptions(zone scw.Zone, options []*baremetal.ServerOption) interface{} { +func flattenOptions(zone scw.Zone, options []*baremetal.ServerOption) any { if options == nil { return nil } - flattenedOptions := []map[string]interface{}(nil) + flattenedOptions := []map[string]any(nil) for _, option := range options { - flattenedOptions = append(flattenedOptions, map[string]interface{}{ + flattenedOptions = append(flattenedOptions, map[string]any{ "id": zonal.NewID(zone, option.ID).String(), "expires_at": types.FlattenTime(option.ExpiresAt), "name": option.Name, @@ -190,10 +190,10 @@ func flattenOptions(zone scw.Zone, options []*baremetal.ServerOption) interface{ return flattenedOptions } -func flattenPrivateNetworks(region scw.Region, privateNetworks []*baremetalV3.ServerPrivateNetwork) interface{} { - flattenedPrivateNetworks := []map[string]interface{}(nil) +func flattenPrivateNetworks(region scw.Region, privateNetworks []*baremetalV3.ServerPrivateNetwork) any { + flattenedPrivateNetworks := []map[string]any(nil) for _, privateNetwork := range privateNetworks { - flattenedPrivateNetworks = append(flattenedPrivateNetworks, map[string]interface{}{ + flattenedPrivateNetworks = append(flattenedPrivateNetworks, map[string]any{ "id": regional.NewIDString(region, privateNetwork.PrivateNetworkID), "mapping_id": regional.NewIDString(region, privateNetwork.ID), "ipam_ip_ids": regional.NewRegionalIDs(region, privateNetwork.IpamIPIDs), diff --git a/internal/services/billing/clients.go b/internal/services/billing/clients.go index e6563d02f7..14a4c2585a 100644 --- a/internal/services/billing/clients.go +++ b/internal/services/billing/clients.go @@ -6,6 +6,6 @@ import ( ) // billingAPI returns a new billing API. -func billingAPI(m interface{}) *billing.API { +func billingAPI(m any) *billing.API { return billing.NewAPI(meta.ExtractScwClient(m)) } diff --git a/internal/services/billing/consumption_data_source.go b/internal/services/billing/consumption_data_source.go index c0d7dc5560..9fd489f252 100644 --- a/internal/services/billing/consumption_data_source.go +++ b/internal/services/billing/consumption_data_source.go @@ -70,7 +70,7 @@ func DataSourceConsumptions() *schema.Resource { } } -func DataSourceBillingConsumptionsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceBillingConsumptionsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := billingAPI(m) res, err := api.ListConsumptions(&billing.ListConsumptionsRequest{ @@ -83,10 +83,10 @@ func DataSourceBillingConsumptionsRead(ctx context.Context, d *schema.ResourceDa return diag.FromErr(err) } - consumptions := []interface{}(nil) + consumptions := []any(nil) for _, consumption := range res.Consumptions { - rawConsumption := make(map[string]interface{}) + rawConsumption := make(map[string]any) rawConsumption["value"] = consumption.Value.String() rawConsumption["product_name"] = consumption.ProductName rawConsumption["project_id"] = consumption.ProjectID diff --git a/internal/services/billing/invoices_data_source.go b/internal/services/billing/invoices_data_source.go index c935c99638..10b77d1429 100644 --- a/internal/services/billing/invoices_data_source.go +++ b/internal/services/billing/invoices_data_source.go @@ -126,7 +126,7 @@ func DataSourceInvoices() *schema.Resource { } } -func DataSourceBillingInvoicesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceBillingInvoicesRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := billingAPI(m) res, err := api.ListInvoices(&billing.ListInvoicesRequest{ @@ -139,10 +139,10 @@ func DataSourceBillingInvoicesRead(ctx context.Context, d *schema.ResourceData, return diag.FromErr(err) } - invoices := []interface{}(nil) + invoices := []any(nil) for _, invoice := range res.Invoices { - rawInvoice := make(map[string]interface{}) + rawInvoice := make(map[string]any) rawInvoice["id"] = invoice.ID rawInvoice["organization_name"] = invoice.OrganizationName rawInvoice["start_date"] = types.FlattenTime(invoice.StartDate) diff --git a/internal/services/block/helpers_block.go b/internal/services/block/helpers_block.go index 3d1e55518e..edfab6fc76 100644 --- a/internal/services/block/helpers_block.go +++ b/internal/services/block/helpers_block.go @@ -22,7 +22,7 @@ const ( ) // blockAPIWithZone returns a new block API and the zone for a Create request -func blockAPIWithZone(d *schema.ResourceData, m interface{}) (*block.API, scw.Zone, error) { +func blockAPIWithZone(d *schema.ResourceData, m any) (*block.API, scw.Zone, error) { blockAPI := block.NewAPI(meta.ExtractScwClient(m)) zone, err := meta.ExtractZone(d, m) @@ -34,7 +34,7 @@ func blockAPIWithZone(d *schema.ResourceData, m interface{}) (*block.API, scw.Zo } // NewAPIWithZoneAndID returns a new block API with zone and ID extracted from the state -func NewAPIWithZoneAndID(m interface{}, zonedID string) (*block.API, scw.Zone, string, error) { +func NewAPIWithZoneAndID(m any, zonedID string) (*block.API, scw.Zone, string, error) { blockAPI := block.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(zonedID) @@ -47,7 +47,7 @@ func NewAPIWithZoneAndID(m interface{}, zonedID string) (*block.API, scw.Zone, s // customDiffCannotShrink set key to forceNew if value shrink func customDiffCannotShrink(key string) schema.CustomizeDiffFunc { - return customdiff.ForceNewIf(key, func(_ context.Context, d *schema.ResourceDiff, _ interface{}) bool { + return customdiff.ForceNewIf(key, func(_ context.Context, d *schema.ResourceDiff, _ any) bool { oldValueI, newValueI := d.GetChange(key) oldValue := oldValueI.(int) newValue := newValueI.(int) diff --git a/internal/services/block/snapshot.go b/internal/services/block/snapshot.go index a9e9027033..2fd73b309b 100644 --- a/internal/services/block/snapshot.go +++ b/internal/services/block/snapshot.go @@ -68,7 +68,7 @@ func ResourceSnapshot() *schema.Resource { ForceNew: true, Description: "Bucket containing qcow", DiffSuppressFunc: dsf.Locality, - StateFunc: func(i interface{}) string { + StateFunc: func(i any) string { return regional.ExpandID(i.(string)).ID }, }, @@ -90,7 +90,7 @@ func ResourceSnapshot() *schema.Resource { } } -func ResourceBlockSnapshotCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBlockSnapshotCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := blockAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -135,7 +135,7 @@ func ResourceBlockSnapshotCreate(ctx context.Context, d *schema.ResourceData, m return ResourceBlockSnapshotRead(ctx, d, m) } -func ResourceBlockSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBlockSnapshotRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -167,7 +167,7 @@ func ResourceBlockSnapshotRead(ctx context.Context, d *schema.ResourceData, m in return nil } -func ResourceBlockSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBlockSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -204,7 +204,7 @@ func ResourceBlockSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m return ResourceBlockSnapshotRead(ctx, d, m) } -func ResourceBlockSnapshotDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBlockSnapshotDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/block/snapshot_data_source.go b/internal/services/block/snapshot_data_source.go index b78d35c37a..b017dd1638 100644 --- a/internal/services/block/snapshot_data_source.go +++ b/internal/services/block/snapshot_data_source.go @@ -31,7 +31,7 @@ func DataSourceSnapshot() *schema.Resource { } } -func DataSourceBlockSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceBlockSnapshotRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := blockAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/block/volume.go b/internal/services/block/volume.go index 86b6c02938..7f9d847caf 100644 --- a/internal/services/block/volume.go +++ b/internal/services/block/volume.go @@ -86,7 +86,7 @@ func ResourceVolume() *schema.Resource { } } -func ResourceBlockVolumeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBlockVolumeCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := instancehelpers.InstanceAndBlockAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -142,7 +142,7 @@ func ResourceBlockVolumeCreate(ctx context.Context, d *schema.ResourceData, m in return ResourceBlockVolumeRead(ctx, d, m) } -func ResourceBlockVolumeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBlockVolumeRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -179,7 +179,7 @@ func ResourceBlockVolumeRead(ctx context.Context, d *schema.ResourceData, m inte return nil } -func ResourceBlockVolumeUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBlockVolumeUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -221,7 +221,7 @@ func ResourceBlockVolumeUpdate(ctx context.Context, d *schema.ResourceData, m in return ResourceBlockVolumeRead(ctx, d, m) } -func ResourceBlockVolumeDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBlockVolumeDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/block/volume_data_source.go b/internal/services/block/volume_data_source.go index c9d3608a60..57c74fdfca 100644 --- a/internal/services/block/volume_data_source.go +++ b/internal/services/block/volume_data_source.go @@ -31,7 +31,7 @@ func DataSourceVolume() *schema.Resource { } } -func DataSourceBlockVolumeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceBlockVolumeRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := blockAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/cockpit/alert_manager.go b/internal/services/cockpit/alert_manager.go index 00c7601a24..508c0376ca 100644 --- a/internal/services/cockpit/alert_manager.go +++ b/internal/services/cockpit/alert_manager.go @@ -57,14 +57,14 @@ func ResourceCockpitAlertManager() *schema.Resource { } } -func ResourceCockpitAlertManagerCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceCockpitAlertManagerCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { api, region, err := cockpitAPIWithRegion(d, meta) if err != nil { return diag.FromErr(err) } projectID := d.Get("project_id").(string) - contactPoints := d.Get("contact_points").([]interface{}) + contactPoints := d.Get("contact_points").([]any) EnableManagedAlerts := d.Get("enable_managed_alerts").(bool) _, err = api.EnableAlertManager(&cockpit.RegionalAPIEnableAlertManagerRequest{ @@ -87,7 +87,7 @@ func ResourceCockpitAlertManagerCreate(ctx context.Context, d *schema.ResourceDa if len(contactPoints) > 0 { for _, cp := range contactPoints { - cpMap, ok := cp.(map[string]interface{}) + cpMap, ok := cp.(map[string]any) if !ok { return diag.FromErr(errors.New("invalid contact point format")) } @@ -117,7 +117,7 @@ func ResourceCockpitAlertManagerCreate(ctx context.Context, d *schema.ResourceDa return ResourceCockpitAlertManagerRead(ctx, d, meta) } -func ResourceCockpitAlertManagerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceCockpitAlertManagerRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { api, region, err := cockpitAPIWithRegion(d, meta) if err != nil { return diag.FromErr(err) @@ -145,11 +145,11 @@ func ResourceCockpitAlertManagerRead(ctx context.Context, d *schema.ResourceData return diag.FromErr(err) } - var contactPointsList []map[string]interface{} + var contactPointsList []map[string]any for _, cp := range contactPoints.ContactPoints { if cp.Email != nil { - contactPoint := map[string]interface{}{ + contactPoint := map[string]any{ "email": cp.Email.To, } contactPointsList = append(contactPointsList, contactPoint) @@ -161,7 +161,7 @@ func ResourceCockpitAlertManagerRead(ctx context.Context, d *schema.ResourceData return nil } -func ResourceCockpitAlertManagerUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceCockpitAlertManagerUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { api, region, err := cockpitAPIWithRegion(d, meta) if err != nil { return diag.FromErr(err) @@ -190,21 +190,21 @@ func ResourceCockpitAlertManagerUpdate(ctx context.Context, d *schema.ResourceDa if d.HasChange("contact_points") { oldContactPointsInterface, newContactPointsInterface := d.GetChange("contact_points") - oldContactPoints := oldContactPointsInterface.([]interface{}) - newContactPoints := newContactPointsInterface.([]interface{}) + oldContactPoints := oldContactPointsInterface.([]any) + newContactPoints := newContactPointsInterface.([]any) - oldContactMap := make(map[string]map[string]interface{}) + oldContactMap := make(map[string]map[string]any) for _, oldCP := range oldContactPoints { - cp := oldCP.(map[string]interface{}) + cp := oldCP.(map[string]any) email := cp["email"].(string) oldContactMap[email] = cp } - newContactMap := make(map[string]map[string]interface{}) + newContactMap := make(map[string]map[string]any) for _, newCP := range newContactPoints { - cp := newCP.(map[string]interface{}) + cp := newCP.(map[string]any) email := cp["email"].(string) newContactMap[email] = cp } @@ -241,7 +241,7 @@ func ResourceCockpitAlertManagerUpdate(ctx context.Context, d *schema.ResourceDa return ResourceCockpitAlertManagerRead(ctx, d, meta) } -func ResourceCockpitAlertManagerDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceCockpitAlertManagerDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { api, region, err := cockpitAPIWithRegion(d, meta) if err != nil { return diag.FromErr(err) diff --git a/internal/services/cockpit/cockpit.go b/internal/services/cockpit/cockpit.go index 7090fbdb74..a81cea502b 100644 --- a/internal/services/cockpit/cockpit.go +++ b/internal/services/cockpit/cockpit.go @@ -93,7 +93,7 @@ func ResourceCockpit() *schema.Resource { } } -func ResourceCockpitCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCockpitCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { projectID := d.Get("project_id").(string) if projectID == "" { _, err := getDefaultProjectID(ctx, m) @@ -107,7 +107,7 @@ func ResourceCockpitCreate(ctx context.Context, d *schema.ResourceData, m interf return ResourceCockpitRead(ctx, d, m) } -func ResourceCockpitRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCockpitRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { var diags diag.Diagnostics api, err := NewGlobalAPI(m) @@ -180,7 +180,7 @@ func ResourceCockpitRead(ctx context.Context, d *schema.ResourceData, m interfac return diags } -func ResourceCockpitUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCockpitUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { diags := diag.Diagnostics{} if d.HasChange("plan") { diags = append(diags, diag.Diagnostic{ @@ -195,7 +195,7 @@ func ResourceCockpitUpdate(ctx context.Context, d *schema.ResourceData, m interf return diags } -func ResourceCockpitDelete(_ context.Context, d *schema.ResourceData, _ interface{}) diag.Diagnostics { +func ResourceCockpitDelete(_ context.Context, d *schema.ResourceData, _ any) diag.Diagnostics { d.SetId("") return nil diff --git a/internal/services/cockpit/cockpit_data_source.go b/internal/services/cockpit/cockpit_data_source.go index 194d25eaed..7039ef46b0 100644 --- a/internal/services/cockpit/cockpit_data_source.go +++ b/internal/services/cockpit/cockpit_data_source.go @@ -31,7 +31,7 @@ func DataSourceCockpit() *schema.Resource { } } -func dataSourceCockpitRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func dataSourceCockpitRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { projectID := d.Get("project_id").(string) if projectID == "" { _, err := getDefaultProjectID(ctx, m) diff --git a/internal/services/cockpit/grafana_user.go b/internal/services/cockpit/grafana_user.go index 257cebec79..c3c152e685 100644 --- a/internal/services/cockpit/grafana_user.go +++ b/internal/services/cockpit/grafana_user.go @@ -61,7 +61,7 @@ func ResourceCockpitGrafanaUser() *schema.Resource { } } -func ResourceCockpitGrafanaUserCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCockpitGrafanaUserCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, err := NewGlobalAPI(m) if err != nil { return diag.FromErr(err) @@ -86,7 +86,7 @@ func ResourceCockpitGrafanaUserCreate(ctx context.Context, d *schema.ResourceDat return ResourceCockpitGrafanaUserRead(ctx, d, m) } -func ResourceCockpitGrafanaUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCockpitGrafanaUserRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, projectID, grafanaUserID, err := NewAPIGrafanaUserID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -142,7 +142,7 @@ func ResourceCockpitGrafanaUserRead(ctx context.Context, d *schema.ResourceData, return nil } -func ResourceCockpitGrafanaUserDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCockpitGrafanaUserDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, projectID, grafanaUserID, err := NewAPIGrafanaUserID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/cockpit/helpers_cockpit.go b/internal/services/cockpit/helpers_cockpit.go index 0b4801727d..1637a9be6a 100644 --- a/internal/services/cockpit/helpers_cockpit.go +++ b/internal/services/cockpit/helpers_cockpit.go @@ -27,13 +27,13 @@ const ( ) // NewGlobalAPI returns a new global cockpit API. -func NewGlobalAPI(m interface{}) (*cockpit.GlobalAPI, error) { +func NewGlobalAPI(m any) (*cockpit.GlobalAPI, error) { api := cockpit.NewGlobalAPI(meta.ExtractScwClient(m)) return api, nil } -func cockpitAPIWithRegion(d *schema.ResourceData, m interface{}) (*cockpit.RegionalAPI, scw.Region, error) { +func cockpitAPIWithRegion(d *schema.ResourceData, m any) (*cockpit.RegionalAPI, scw.Region, error) { api := cockpit.NewRegionalAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -44,7 +44,7 @@ func cockpitAPIWithRegion(d *schema.ResourceData, m interface{}) (*cockpit.Regio return api, region, err } -func NewAPIWithRegionAndID(m interface{}, id string) (*cockpit.RegionalAPI, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*cockpit.RegionalAPI, scw.Region, string, error) { api := cockpit.NewRegionalAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) @@ -56,7 +56,7 @@ func NewAPIWithRegionAndID(m interface{}, id string) (*cockpit.RegionalAPI, scw. } // NewAPIGrafanaUserID returns a new cockpit API with the Grafana user ID and the project ID. -func NewAPIGrafanaUserID(m interface{}, id string) (*cockpit.GlobalAPI, string, uint32, error) { +func NewAPIGrafanaUserID(m any, id string) (*cockpit.GlobalAPI, string, uint32, error) { projectID, resourceIDString, err := parseCockpitID(id) if err != nil { return nil, "", 0, err @@ -96,7 +96,7 @@ func cockpitTokenUpgradeV1SchemaType() cty.Type { }) } -func cockpitTokenV1UpgradeFunc(_ context.Context, rawState map[string]interface{}, _ interface{}) (map[string]interface{}, error) { +func cockpitTokenV1UpgradeFunc(_ context.Context, rawState map[string]any, _ any) (map[string]any, error) { defaultRegion := scw.RegionFrPar // Default to the 'fr-par' region as all tokens created with the v1beta1 API were implicitly set to this region if _, ok := rawState["region"]; !ok { @@ -115,7 +115,7 @@ func cockpitTokenV1UpgradeFunc(_ context.Context, rawState map[string]interface{ return rawState, nil } -func getDefaultProjectID(ctx context.Context, m interface{}) (string, error) { +func getDefaultProjectID(ctx context.Context, m any) (string, error) { accountAPI := account.NewProjectAPI(m) res, err := accountAPI.ListProjects(&accountSDK.ProjectAPIListProjectsRequest{ diff --git a/internal/services/cockpit/source.go b/internal/services/cockpit/source.go index d81cc5c85f..c13aa49673 100644 --- a/internal/services/cockpit/source.go +++ b/internal/services/cockpit/source.go @@ -87,7 +87,7 @@ func ResourceCockpitSource() *schema.Resource { } } -func ResourceCockpitSourceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceCockpitSourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { api, region, err := cockpitAPIWithRegion(d, meta) if err != nil { return diag.FromErr(err) @@ -111,7 +111,7 @@ func ResourceCockpitSourceCreate(ctx context.Context, d *schema.ResourceData, me return ResourceCockpitSourceRead(ctx, d, meta) } -func ResourceCockpitSourceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceCockpitSourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(meta, d.Id()) if err != nil { return diag.FromErr(err) @@ -151,7 +151,7 @@ func ResourceCockpitSourceRead(ctx context.Context, d *schema.ResourceData, meta return nil } -func ResourceCockpitSourceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceCockpitSourceUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(meta, d.Id()) if err != nil { return diag.FromErr(err) @@ -182,7 +182,7 @@ func ResourceCockpitSourceUpdate(ctx context.Context, d *schema.ResourceData, me return nil } -func ResourceCockpitSourceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceCockpitSourceDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(meta, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/cockpit/source_data_source.go b/internal/services/cockpit/source_data_source.go index a482abd26f..02e0450dac 100644 --- a/internal/services/cockpit/source_data_source.go +++ b/internal/services/cockpit/source_data_source.go @@ -82,7 +82,7 @@ func DataSourceCockpitSource() *schema.Resource { } } -func dataSourceCockpitSourceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func dataSourceCockpitSourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { if _, ok := d.GetOk("id"); ok { return fetchDataSourceByID(ctx, d, meta) } @@ -90,7 +90,7 @@ func dataSourceCockpitSourceRead(ctx context.Context, d *schema.ResourceData, me return fetchDataSourceByFilters(ctx, d, meta) } -func fetchDataSourceByID(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func fetchDataSourceByID(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { regionalID := d.Get("id").(string) api, region, id, err := NewAPIWithRegionAndID(meta, regionalID) @@ -113,7 +113,7 @@ func fetchDataSourceByID(ctx context.Context, d *schema.ResourceData, meta inter return nil } -func fetchDataSourceByFilters(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func fetchDataSourceByFilters(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { api, region, err := cockpitAPIWithRegion(d, meta) if err != nil { return diag.FromErr(err) diff --git a/internal/services/cockpit/token.go b/internal/services/cockpit/token.go index 43d8e2271f..64f55198fe 100644 --- a/internal/services/cockpit/token.go +++ b/internal/services/cockpit/token.go @@ -140,7 +140,7 @@ func resourceCockpitTokenScopes() *schema.Resource { } } -func ResourceCockpitTokenCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCockpitTokenCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := cockpitAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -152,7 +152,7 @@ func ResourceCockpitTokenCreate(ctx context.Context, d *schema.ResourceData, m i var scopes []cockpit.TokenScope - if !scopesSet || len(rawScopes.([]interface{})) == 0 { + if !scopesSet || len(rawScopes.([]any)) == 0 { schema := resourceCockpitTokenScopes().Schema for key, val := range schema { if defaultVal, ok := val.Default.(bool); ok && defaultVal { @@ -183,7 +183,7 @@ func ResourceCockpitTokenCreate(ctx context.Context, d *schema.ResourceData, m i return ResourceCockpitTokenRead(ctx, d, m) } -func ResourceCockpitTokenRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCockpitTokenRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -213,7 +213,7 @@ func ResourceCockpitTokenRead(ctx context.Context, d *schema.ResourceData, m int return nil } -func ResourceCockpitTokenDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCockpitTokenDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/cockpit/types.go b/internal/services/cockpit/types.go index 4feeab5fca..153f26c9f5 100644 --- a/internal/services/cockpit/types.go +++ b/internal/services/cockpit/types.go @@ -23,7 +23,7 @@ func createGrafanaURL(projectID string, region scw.Region) string { return fmt.Sprintf("https://%s.dashboards.obs.%s.scw.cloud", projectID, region) } -func flattenCockpitEndpoints(dataSources []*cockpit.DataSource, grafanaURL string, alertManagerURL string) []map[string]interface{} { +func flattenCockpitEndpoints(dataSources []*cockpit.DataSource, grafanaURL string, alertManagerURL string) []map[string]any { endpointMap := map[string]string{} for _, dataSource := range dataSources { @@ -37,7 +37,7 @@ func flattenCockpitEndpoints(dataSources []*cockpit.DataSource, grafanaURL strin } } - endpoints := []map[string]interface{}{ + endpoints := []map[string]any{ { "metrics_url": endpointMap["metrics_url"], "logs_url": endpointMap["logs_url"], @@ -50,11 +50,11 @@ func flattenCockpitEndpoints(dataSources []*cockpit.DataSource, grafanaURL strin return endpoints } -func createCockpitPushURLList(endpoints []map[string]interface{}) []map[string]interface{} { - var result []map[string]interface{} +func createCockpitPushURLList(endpoints []map[string]any) []map[string]any { + var result []map[string]any for _, endpoint := range endpoints { - newEndpoint := make(map[string]interface{}) + newEndpoint := make(map[string]any) if metricsURL, ok := endpoint["metrics_url"].(string); ok && metricsURL != "" { newEndpoint["push_metrics_url"] = metricsURL + pathMetricsURL @@ -85,15 +85,15 @@ func createCockpitPushURL(sourceType cockpit.DataSourceType, url string) (string } } -func expandCockpitTokenScopes(raw interface{}) []cockpit.TokenScope { +func expandCockpitTokenScopes(raw any) []cockpit.TokenScope { var expandedScopes []cockpit.TokenScope - scopesList, ok := raw.([]interface{}) + scopesList, ok := raw.([]any) if !ok || len(scopesList) == 0 { return expandedScopes } - scopesMap, ok := scopesList[0].(map[string]interface{}) + scopesMap, ok := scopesList[0].(map[string]any) if !ok { return expandedScopes } @@ -107,8 +107,8 @@ func expandCockpitTokenScopes(raw interface{}) []cockpit.TokenScope { return expandedScopes } -func flattenCockpitTokenScopes(scopes []cockpit.TokenScope) []interface{} { - result := map[string]interface{}{} +func flattenCockpitTokenScopes(scopes []cockpit.TokenScope) []any { + result := map[string]any{} for key := range scopeMapping { result[key] = false } @@ -123,5 +123,5 @@ func flattenCockpitTokenScopes(scopes []cockpit.TokenScope) []interface{} { } } - return []interface{}{result} + return []any{result} } diff --git a/internal/services/container/container.go b/internal/services/container/container.go index 4b7aaea31b..cde9383b2a 100644 --- a/internal/services/container/container.go +++ b/internal/services/container/container.go @@ -285,7 +285,7 @@ func ResourceContainer() *schema.Resource { } } -func ResourceContainerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -338,7 +338,7 @@ func ResourceContainerCreate(ctx context.Context, d *schema.ResourceData, m inte return ResourceContainerRead(ctx, d, m) } -func ResourceContainerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, containerID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -388,7 +388,7 @@ func ResourceContainerRead(ctx context.Context, d *schema.ResourceData, m interf return nil } -func ResourceContainerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, containerID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -426,7 +426,7 @@ func ResourceContainerUpdate(ctx context.Context, d *schema.ResourceData, m inte return ResourceContainerRead(ctx, d, m) } -func ResourceContainerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, containerID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/container/container_data_source.go b/internal/services/container/container_data_source.go index 422431d95e..61681cc57f 100644 --- a/internal/services/container/container_data_source.go +++ b/internal/services/container/container_data_source.go @@ -46,7 +46,7 @@ func DataSourceContainer() *schema.Resource { } } -func DataSourceContainerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceContainerRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/container/cron.go b/internal/services/container/cron.go index 016ab6a131..65207b2a11 100644 --- a/internal/services/container/cron.go +++ b/internal/services/container/cron.go @@ -66,7 +66,7 @@ func ResourceCron() *schema.Resource { } } -func ResourceContainerCronCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerCronCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -106,7 +106,7 @@ func ResourceContainerCronCreate(ctx context.Context, d *schema.ResourceData, m return ResourceContainerCronRead(ctx, d, m) } -func ResourceContainerCronRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerCronRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, containerCronID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -138,7 +138,7 @@ func ResourceContainerCronRead(ctx context.Context, d *schema.ResourceData, m in return nil } -func ResourceContainerCronUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerCronUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, containerCronID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -191,7 +191,7 @@ func ResourceContainerCronUpdate(ctx context.Context, d *schema.ResourceData, m return ResourceContainerCronRead(ctx, d, m) } -func ResourceContainerCronDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerCronDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, containerCronID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/container/domain.go b/internal/services/container/domain.go index 86139bd170..fc6c5e6e8b 100644 --- a/internal/services/container/domain.go +++ b/internal/services/container/domain.go @@ -57,7 +57,7 @@ func ResourceDomain() *schema.Resource { } } -func ResourceContainerDomainCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerDomainCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -92,7 +92,7 @@ func ResourceContainerDomainCreate(ctx context.Context, d *schema.ResourceData, return ResourceContainerDomainRead(ctx, d, m) } -func ResourceContainerDomainRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerDomainRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, domainID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -117,7 +117,7 @@ func ResourceContainerDomainRead(ctx context.Context, d *schema.ResourceData, m return nil } -func ResourceContainerDomainDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerDomainDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, domainID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/container/helpers_container.go b/internal/services/container/helpers_container.go index 9c125651b7..d509396cd5 100644 --- a/internal/services/container/helpers_container.go +++ b/internal/services/container/helpers_container.go @@ -26,7 +26,7 @@ const ( ) // newAPIWithRegion returns a new container API and the region. -func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*container.API, scw.Region, error) { +func newAPIWithRegion(d *schema.ResourceData, m any) (*container.API, scw.Region, error) { api := container.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -38,7 +38,7 @@ func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*container.API, sc } // NewAPIWithRegionAndID returns a new container API, region and ID. -func NewAPIWithRegionAndID(m interface{}, id string) (*container.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*container.API, scw.Region, string, error) { api := container.NewAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) @@ -273,14 +273,14 @@ func setUpdateContainerRequest(d *schema.ResourceData, region scw.Region, contai return req, nil } -func expandHealthCheck(healthCheckSchema interface{}) (*container.ContainerHealthCheckSpec, error) { +func expandHealthCheck(healthCheckSchema any) (*container.ContainerHealthCheckSpec, error) { healthCheck, ok := healthCheckSchema.(*schema.Set) if !ok { return &container.ContainerHealthCheckSpec{}, nil } for _, option := range healthCheck.List() { - rawOption, isRawOption := option.(map[string]interface{}) + rawOption, isRawOption := option.(map[string]any) if !isRawOption { continue } @@ -308,14 +308,14 @@ func expandHealthCheck(healthCheckSchema interface{}) (*container.ContainerHealt return &container.ContainerHealthCheckSpec{}, nil } -func expendHealthCheckHTTP(healthCheckHTTPSchema interface{}) *container.ContainerHealthCheckSpecHTTPProbe { +func expendHealthCheckHTTP(healthCheckHTTPSchema any) *container.ContainerHealthCheckSpecHTTPProbe { healthCheckHTTP, ok := healthCheckHTTPSchema.(*schema.Set) if !ok { return &container.ContainerHealthCheckSpecHTTPProbe{} } for _, option := range healthCheckHTTP.List() { - rawOption, isRawOption := option.(map[string]interface{}) + rawOption, isRawOption := option.(map[string]any) if !isRawOption { continue } @@ -331,7 +331,7 @@ func expendHealthCheckHTTP(healthCheckHTTPSchema interface{}) *container.Contain return &container.ContainerHealthCheckSpecHTTPProbe{} } -func flattenHealthCheck(healthCheck *container.ContainerHealthCheckSpec) interface{} { +func flattenHealthCheck(healthCheck *container.ContainerHealthCheckSpec) any { if healthCheck == nil { return nil } @@ -341,8 +341,8 @@ func flattenHealthCheck(healthCheck *container.ContainerHealthCheckSpec) interfa interval = healthCheck.Interval.ToTimeDuration() } - flattenedHealthCheck := []map[string]interface{}(nil) - flattenedHealthCheck = append(flattenedHealthCheck, map[string]interface{}{ + flattenedHealthCheck := []map[string]any(nil) + flattenedHealthCheck = append(flattenedHealthCheck, map[string]any{ "http": flattenHealthCheckHTTP(healthCheck.HTTP), "failure_threshold": types.FlattenUint32Ptr(&healthCheck.FailureThreshold), "interval": types.FlattenDuration(interval), @@ -351,27 +351,27 @@ func flattenHealthCheck(healthCheck *container.ContainerHealthCheckSpec) interfa return flattenedHealthCheck } -func flattenHealthCheckHTTP(healthCheckHTTP *container.ContainerHealthCheckSpecHTTPProbe) interface{} { +func flattenHealthCheckHTTP(healthCheckHTTP *container.ContainerHealthCheckSpecHTTPProbe) any { if healthCheckHTTP == nil { return nil } - flattenedHealthCheckHTTP := []map[string]interface{}(nil) - flattenedHealthCheckHTTP = append(flattenedHealthCheckHTTP, map[string]interface{}{ + flattenedHealthCheckHTTP := []map[string]any(nil) + flattenedHealthCheckHTTP = append(flattenedHealthCheckHTTP, map[string]any{ "path": types.FlattenStringPtr(&healthCheckHTTP.Path), }) return flattenedHealthCheckHTTP } -func expandScalingOptions(scalingOptionSchema interface{}) (*container.ContainerScalingOption, error) { +func expandScalingOptions(scalingOptionSchema any) (*container.ContainerScalingOption, error) { scalingOption, ok := scalingOptionSchema.(*schema.Set) if !ok { return &container.ContainerScalingOption{}, nil } for _, option := range scalingOption.List() { - rawOption, isRawOption := option.(map[string]interface{}) + rawOption, isRawOption := option.(map[string]any) if !isRawOption { continue } @@ -404,13 +404,13 @@ func expandScalingOptions(scalingOptionSchema interface{}) (*container.Container return &container.ContainerScalingOption{}, nil } -func flattenScalingOption(scalingOption *container.ContainerScalingOption) interface{} { +func flattenScalingOption(scalingOption *container.ContainerScalingOption) any { if scalingOption == nil { return nil } - flattenedScalingOption := []map[string]interface{}(nil) - flattenedScalingOption = append(flattenedScalingOption, map[string]interface{}{ + flattenedScalingOption := []map[string]any(nil) + flattenedScalingOption = append(flattenedScalingOption, map[string]any{ "concurrent_requests_threshold": types.FlattenUint32Ptr(scalingOption.ConcurrentRequestsThreshold), "cpu_usage_threshold": types.FlattenUint32Ptr(scalingOption.CPUUsageThreshold), "memory_usage_threshold": types.FlattenUint32Ptr(scalingOption.MemoryUsageThreshold), @@ -419,12 +419,12 @@ func flattenScalingOption(scalingOption *container.ContainerScalingOption) inter return flattenedScalingOption } -func flattenContainerSecrets(secrets []*container.SecretHashedValue) interface{} { +func flattenContainerSecrets(secrets []*container.SecretHashedValue) any { if len(secrets) == 0 { return nil } - flattenedSecrets := make(map[string]interface{}) + flattenedSecrets := make(map[string]any) for _, secret := range secrets { flattenedSecrets[secret.Key] = secret.HashedValue } @@ -432,8 +432,8 @@ func flattenContainerSecrets(secrets []*container.SecretHashedValue) interface{} return flattenedSecrets } -func expandContainerSecrets(secretsRawMap interface{}) []*container.Secret { - secretsMap := secretsRawMap.(map[string]interface{}) +func expandContainerSecrets(secretsRawMap any) []*container.Secret { + secretsMap := secretsRawMap.(map[string]any) secrets := make([]*container.Secret, 0, len(secretsMap)) for k, v := range secretsMap { diff --git a/internal/services/container/helpers_container_triggers.go b/internal/services/container/helpers_container_triggers.go index 4623635dc1..c94e89c020 100644 --- a/internal/services/container/helpers_container_triggers.go +++ b/internal/services/container/helpers_container_triggers.go @@ -30,8 +30,8 @@ func waitForContainerTrigger(ctx context.Context, containerAPI *container.API, r return trigger, err } -func expandContainerTriggerMnqSqsCreationConfig(i interface{}) *container.CreateTriggerRequestMnqSqsClientConfig { - m := i.(map[string]interface{}) +func expandContainerTriggerMnqSqsCreationConfig(i any) *container.CreateTriggerRequestMnqSqsClientConfig { + m := i.(map[string]any) req := &container.CreateTriggerRequestMnqSqsClientConfig{ Queue: m["queue"].(string), MnqProjectID: m["project_id"].(string), @@ -41,8 +41,8 @@ func expandContainerTriggerMnqSqsCreationConfig(i interface{}) *container.Create return req } -func expandContainerTriggerMnqNatsCreationConfig(i interface{}) *container.CreateTriggerRequestMnqNatsClientConfig { - m := i.(map[string]interface{}) +func expandContainerTriggerMnqNatsCreationConfig(i any) *container.CreateTriggerRequestMnqNatsClientConfig { + m := i.(map[string]any) return &container.CreateTriggerRequestMnqNatsClientConfig{ Subject: m["subject"].(string), @@ -52,8 +52,8 @@ func expandContainerTriggerMnqNatsCreationConfig(i interface{}) *container.Creat } } -func completeContainerTriggerMnqCreationConfig(i interface{}, d *schema.ResourceData, m interface{}, region scw.Region) error { - configMap := i.(map[string]interface{}) +func completeContainerTriggerMnqCreationConfig(i any, d *schema.ResourceData, m any, region scw.Region) error { + configMap := i.(map[string]any) if sqsRegion, exists := configMap["region"]; !exists || sqsRegion == "" { configMap["region"] = region.String() diff --git a/internal/services/container/namespace.go b/internal/services/container/namespace.go index 4358db6751..c90b136f1b 100644 --- a/internal/services/container/namespace.go +++ b/internal/services/container/namespace.go @@ -102,7 +102,7 @@ func ResourceNamespace() *schema.Resource { } } -func ResourceContainerNamespaceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerNamespaceCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -137,7 +137,7 @@ func ResourceContainerNamespaceCreate(ctx context.Context, d *schema.ResourceDat return ResourceContainerNamespaceRead(ctx, d, m) } -func ResourceContainerNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerNamespaceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -168,7 +168,7 @@ func ResourceContainerNamespaceRead(ctx context.Context, d *schema.ResourceData, return nil } -func ResourceContainerNamespaceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerNamespaceUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -208,7 +208,7 @@ func ResourceContainerNamespaceUpdate(ctx context.Context, d *schema.ResourceDat return ResourceContainerNamespaceRead(ctx, d, m) } -func ResourceContainerNamespaceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerNamespaceDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/container/namespace_data_source.go b/internal/services/container/namespace_data_source.go index 3709a3557e..b3b8e86f75 100644 --- a/internal/services/container/namespace_data_source.go +++ b/internal/services/container/namespace_data_source.go @@ -33,7 +33,7 @@ func DataSourceNamespace() *schema.Resource { } } -func DataSourceContainerNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceContainerNamespaceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/container/token.go b/internal/services/container/token.go index 3b4c7bc784..a5a4875cc1 100644 --- a/internal/services/container/token.go +++ b/internal/services/container/token.go @@ -64,7 +64,7 @@ func ResourceToken() *schema.Resource { } } -func ResourceContainerTokenCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerTokenCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -88,7 +88,7 @@ func ResourceContainerTokenCreate(ctx context.Context, d *schema.ResourceData, m return ResourceContainerTokenRead(ctx, d, m) } -func ResourceContainerTokenRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerTokenRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -116,7 +116,7 @@ func ResourceContainerTokenRead(ctx context.Context, d *schema.ResourceData, m i return nil } -func ResourceContainerTokenDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerTokenDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/container/trigger.go b/internal/services/container/trigger.go index d34bece313..69414712b2 100644 --- a/internal/services/container/trigger.go +++ b/internal/services/container/trigger.go @@ -136,7 +136,7 @@ func ResourceTrigger() *schema.Resource { } } -func ResourceContainerTriggerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerTriggerCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -184,7 +184,7 @@ func ResourceContainerTriggerCreate(ctx context.Context, d *schema.ResourceData, return ResourceContainerTriggerRead(ctx, d, m) } -func ResourceContainerTriggerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerTriggerRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -222,7 +222,7 @@ func ResourceContainerTriggerRead(ctx context.Context, d *schema.ResourceData, m return diags } -func ResourceContainerTriggerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerTriggerUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -259,7 +259,7 @@ func ResourceContainerTriggerUpdate(ctx context.Context, d *schema.ResourceData, return ResourceContainerTriggerRead(ctx, d, m) } -func ResourceContainerTriggerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceContainerTriggerDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/domain/helpers.go b/internal/services/domain/helpers.go index 2135396e46..3adbd7536b 100644 --- a/internal/services/domain/helpers.go +++ b/internal/services/domain/helpers.go @@ -19,12 +19,12 @@ const ( ) // NewDomainAPI returns a new domain API. -func NewDomainAPI(m interface{}) *domain.API { +func NewDomainAPI(m any) *domain.API { return domain.NewAPI(meta.ExtractScwClient(m)) } // NewRegistrarDomainAPI returns a new registrar API. -func NewRegistrarDomainAPI(m interface{}) *domain.RegistrarAPI { +func NewRegistrarDomainAPI(m any) *domain.RegistrarAPI { return domain.NewRegistrarAPI(meta.ExtractScwClient(m)) } @@ -62,7 +62,7 @@ func FindDefaultReverse(address string) string { return strings.Join(parts, "-") + ".instances.scw.cloud" } -func ExpandContact(contactMap map[string]interface{}) *domain.Contact { +func ExpandContact(contactMap map[string]any) *domain.Contact { if contactMap == nil { return nil } @@ -120,21 +120,21 @@ func ExpandContact(contactMap map[string]interface{}) *domain.Contact { contact.WhoisOptIn = v } - if extFr, ok := contactMap["extension_fr"].(map[string]interface{}); ok && len(extFr) > 0 { + if extFr, ok := contactMap["extension_fr"].(map[string]any); ok && len(extFr) > 0 { extension := expandContactExtension(extFr, "fr") if extension != nil { contact.ExtensionFr = extension.(*domain.ContactExtensionFR) } } - if extEu, ok := contactMap["extension_eu"].(map[string]interface{}); ok && len(extEu) > 0 { + if extEu, ok := contactMap["extension_eu"].(map[string]any); ok && len(extEu) > 0 { extension := expandContactExtension(extEu, "eu") if extension != nil { contact.ExtensionEu = extension.(*domain.ContactExtensionEU) } } - if extNl, ok := contactMap["extension_nl"].(map[string]interface{}); ok && len(extNl) > 0 { + if extNl, ok := contactMap["extension_nl"].(map[string]any); ok && len(extNl) > 0 { extension := expandContactExtension(extNl, "nl") if extension != nil { contact.ExtensionNl = extension.(*domain.ContactExtensionNL) @@ -144,7 +144,7 @@ func ExpandContact(contactMap map[string]interface{}) *domain.Contact { return contact } -func expandContactExtension(extensionMap map[string]interface{}, extensionType string) interface{} { +func expandContactExtension(extensionMap map[string]any, extensionType string) any { if len(extensionMap) == 0 { return nil } @@ -194,7 +194,7 @@ func expandContactExtension(extensionMap map[string]interface{}, extensionType s } } -func ExpandNewContact(contactMap map[string]interface{}) *domain.NewContact { +func ExpandNewContact(contactMap map[string]any) *domain.NewContact { if contactMap == nil { return nil } @@ -251,21 +251,21 @@ func ExpandNewContact(contactMap map[string]interface{}) *domain.NewContact { contact.State = scw.StringPtr(v) } - if extFr, ok := contactMap["extension_fr"].(map[string]interface{}); ok && len(extFr) > 0 { + if extFr, ok := contactMap["extension_fr"].(map[string]any); ok && len(extFr) > 0 { extension := expandContactExtension(extFr, "fr") if extension != nil { contact.ExtensionFr = extension.(*domain.ContactExtensionFR) } } - if extEu, ok := contactMap["extension_eu"].(map[string]interface{}); ok && len(extEu) > 0 { + if extEu, ok := contactMap["extension_eu"].(map[string]any); ok && len(extEu) > 0 { extension := expandContactExtension(extEu, "eu") if extension != nil { contact.ExtensionEu = extension.(*domain.ContactExtensionEU) } } - if extNl, ok := contactMap["extension_nl"].(map[string]interface{}); ok && len(extNl) > 0 { + if extNl, ok := contactMap["extension_nl"].(map[string]any); ok && len(extNl) > 0 { extension := expandContactExtension(extNl, "nl") if extension != nil { contact.ExtensionNl = extension.(*domain.ContactExtensionNL) @@ -275,7 +275,7 @@ func ExpandNewContact(contactMap map[string]interface{}) *domain.NewContact { return contact } -func parseEnum(data map[string]interface{}, key string, defaultValue string) string { +func parseEnum(data map[string]any, key string, defaultValue string) string { if value, ok := data[key].(string); ok { return value } @@ -283,8 +283,8 @@ func parseEnum(data map[string]interface{}, key string, defaultValue string) str return defaultValue } -func parseStruct[T any](data map[string]interface{}, key string) *T { - if nested, ok := data[key].(map[string]interface{}); ok { +func parseStruct[T any](data map[string]any, key string) *T { + if nested, ok := data[key].(map[string]any); ok { var result T mapToStruct(nested, &result) @@ -295,7 +295,7 @@ func parseStruct[T any](data map[string]interface{}, key string) *T { return nil } -func mapToStruct(data map[string]interface{}, target interface{}) { +func mapToStruct(data map[string]any, target any) { switch t := target.(type) { case *domain.ContactExtensionFRIndividualInfo: if v, ok := data["whois_opt_in"].(bool); ok { @@ -409,12 +409,12 @@ func ExtractDomainsFromTaskID(ctx context.Context, id string, registrarAPI *doma return nil, fmt.Errorf("task with ID '%s' not found", taskID) } -func flattenContact(contact *domain.Contact) []map[string]interface{} { +func flattenContact(contact *domain.Contact) []map[string]any { if contact == nil { return nil } - flattened := map[string]interface{}{ + flattened := map[string]any{ "phone_number": contact.PhoneNumber, "legal_form": string(contact.LegalForm), "firstname": contact.Firstname, @@ -448,15 +448,15 @@ func flattenContact(contact *domain.Contact) []map[string]interface{} { flattened["extension_nl"] = flattenContactExtensionNL(contact.ExtensionNl) } - return []map[string]interface{}{flattened} + return []map[string]any{flattened} } -func flattenContactExtensionFR(ext *domain.ContactExtensionFR) []map[string]interface{} { +func flattenContactExtensionFR(ext *domain.ContactExtensionFR) []map[string]any { if ext == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "mode": string(ext.Mode), "individual_info": flattenContactExtensionFRIndividualInfo(ext.IndividualInfo), @@ -468,24 +468,24 @@ func flattenContactExtensionFR(ext *domain.ContactExtensionFR) []map[string]inte } } -func flattenContactExtensionFRIndividualInfo(info *domain.ContactExtensionFRIndividualInfo) []map[string]interface{} { +func flattenContactExtensionFRIndividualInfo(info *domain.ContactExtensionFRIndividualInfo) []map[string]any { if info == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "whois_opt_in": info.WhoisOptIn, }, } } -func flattenContactExtensionFRDunsInfo(info *domain.ContactExtensionFRDunsInfo) []map[string]interface{} { +func flattenContactExtensionFRDunsInfo(info *domain.ContactExtensionFRDunsInfo) []map[string]any { if info == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "duns_id": info.DunsID, "local_id": info.LocalID, @@ -493,12 +493,12 @@ func flattenContactExtensionFRDunsInfo(info *domain.ContactExtensionFRDunsInfo) } } -func flattenContactExtensionFRAssociationInfo(info *domain.ContactExtensionFRAssociationInfo) []map[string]interface{} { +func flattenContactExtensionFRAssociationInfo(info *domain.ContactExtensionFRAssociationInfo) []map[string]any { if info == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "publication_jo": info.PublicationJo.Format(time.RFC3339), "publication_jo_page": info.PublicationJoPage, @@ -506,48 +506,48 @@ func flattenContactExtensionFRAssociationInfo(info *domain.ContactExtensionFRAss } } -func flattenContactExtensionFRTrademarkInfo(info *domain.ContactExtensionFRTrademarkInfo) []map[string]interface{} { +func flattenContactExtensionFRTrademarkInfo(info *domain.ContactExtensionFRTrademarkInfo) []map[string]any { if info == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "trademark_inpi": info.TrademarkInpi, }, } } -func flattenContactExtensionFRCodeAuthAfnicInfo(info *domain.ContactExtensionFRCodeAuthAfnicInfo) []map[string]interface{} { +func flattenContactExtensionFRCodeAuthAfnicInfo(info *domain.ContactExtensionFRCodeAuthAfnicInfo) []map[string]any { if info == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "code_auth_afnic": info.CodeAuthAfnic, }, } } -func flattenContactExtensionEU(ext *domain.ContactExtensionEU) []map[string]interface{} { +func flattenContactExtensionEU(ext *domain.ContactExtensionEU) []map[string]any { if ext == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "european_citizenship": ext.EuropeanCitizenship, }, } } -func flattenContactExtensionNL(ext *domain.ContactExtensionNL) []map[string]interface{} { +func flattenContactExtensionNL(ext *domain.ContactExtensionNL) []map[string]any { if ext == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "legal_form": string(ext.LegalForm), "legal_form_registration_number": ext.LegalFormRegistrationNumber, @@ -580,39 +580,39 @@ func waitForTaskCompletion(ctx context.Context, registrarAPI *domain.RegistrarAP }) } -func FlattenDSRecord(dsRecords []*domain.DSRecord) []interface{} { +func FlattenDSRecord(dsRecords []*domain.DSRecord) []any { if len(dsRecords) == 0 { - return []interface{}{} + return []any{} } - results := make([]interface{}, 0, len(dsRecords)) + results := make([]any, 0, len(dsRecords)) for _, dsRecord := range dsRecords { - item := map[string]interface{}{ + item := map[string]any{ "key_id": dsRecord.KeyID, "algorithm": string(dsRecord.Algorithm), } if dsRecord.Digest != nil { - digest := map[string]interface{}{ + digest := map[string]any{ "type": string(dsRecord.Digest.Type), "digest": dsRecord.Digest.Digest, } if dsRecord.Digest.PublicKey != nil { - digest["public_key"] = []interface{}{ - map[string]interface{}{ + digest["public_key"] = []any{ + map[string]any{ "key": dsRecord.Digest.PublicKey.Key, }, } } - item["digest"] = []interface{}{digest} + item["digest"] = []any{digest} } if dsRecord.PublicKey != nil { - item["public_key"] = []interface{}{ - map[string]interface{}{ + item["public_key"] = []any{ + map[string]any{ "key": dsRecord.PublicKey.Key, }, } diff --git a/internal/services/domain/helpers_test.go b/internal/services/domain/helpers_test.go index e0e42e8e8c..f2398fa5e1 100644 --- a/internal/services/domain/helpers_test.go +++ b/internal/services/domain/helpers_test.go @@ -11,14 +11,14 @@ import ( func TestExpandContact(t *testing.T) { tests := []struct { - contactMap map[string]interface{} + contactMap map[string]any expected *domainSDK.Contact name string expectError bool }{ { name: "minimal valid contact", - contactMap: map[string]interface{}{ + contactMap: map[string]any{ "phone_number": "123456789", "legal_form": "individual", "firstname": "John", @@ -43,7 +43,7 @@ func TestExpandContact(t *testing.T) { }, { name: "full contact with extensions", - contactMap: map[string]interface{}{ + contactMap: map[string]any{ "phone_number": "987654321", "legal_form": "corporate", "firstname": "Jane", @@ -53,9 +53,9 @@ func TestExpandContact(t *testing.T) { "zip": "10001", "city": "New York", "country": "US", - "extension_fr": map[string]interface{}{ + "extension_fr": map[string]any{ "mode": "individual", - "individual_info": map[string]interface{}{ + "individual_info": map[string]any{ "whois_opt_in": true, }, }, @@ -94,14 +94,14 @@ func TestExpandContact(t *testing.T) { func TestExpandNewContact(t *testing.T) { tests := []struct { - contactMap map[string]interface{} + contactMap map[string]any expected *domainSDK.NewContact name string expectError bool }{ { name: "minimal valid new contact", - contactMap: map[string]interface{}{ + contactMap: map[string]any{ "phone_number": "123456789", "legal_form": "individual", "firstname": "John", @@ -126,7 +126,7 @@ func TestExpandNewContact(t *testing.T) { }, { name: "new contact with optional fields", - contactMap: map[string]interface{}{ + contactMap: map[string]any{ "phone_number": "987654321", "legal_form": "corporate", "firstname": "Jane", @@ -169,7 +169,7 @@ func TestExpandNewContact(t *testing.T) { }, { name: "new contact with extensions", - contactMap: map[string]interface{}{ + contactMap: map[string]any{ "phone_number": "654987321", "legal_form": "individual", "firstname": "Alice", @@ -179,9 +179,9 @@ func TestExpandNewContact(t *testing.T) { "zip": "30301", "city": "Atlanta", "country": "US", - "extension_fr": map[string]interface{}{ + "extension_fr": map[string]any{ "mode": "individual", - "individual_info": map[string]interface{}{ + "individual_info": map[string]any{ "whois_opt_in": true, }, }, diff --git a/internal/services/domain/record.go b/internal/services/domain/record.go index 623a709c92..63f0eb2e50 100644 --- a/internal/services/domain/record.go +++ b/internal/services/domain/record.go @@ -72,7 +72,7 @@ func ResourceRecord() *schema.Resource { Description: "The name of the record", ForceNew: true, Optional: true, - StateFunc: func(val interface{}) string { + StateFunc: func(val any) string { value := val.(string) if value == "@" { return "" @@ -249,7 +249,7 @@ func ResourceRecord() *schema.Resource { } } -func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { domainAPI := NewDomainAPI(m) dnsZone := d.Get("dns_zone").(string) @@ -316,7 +316,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, m interfa return resourceDomainRecordRead(ctx, d, m) } -func resourceDomainRecordRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceDomainRecordRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { domainAPI := NewDomainAPI(m) var record *domain.Record @@ -433,7 +433,7 @@ func resourceDomainRecordRead(ctx context.Context, d *schema.ResourceData, m int return nil } -func resourceDomainRecordUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceDomainRecordUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { if !d.HasChanges(changeKeys...) { return resourceDomainRecordRead(ctx, d, m) } @@ -480,7 +480,7 @@ func resourceDomainRecordUpdate(ctx context.Context, d *schema.ResourceData, m i return resourceDomainRecordRead(ctx, d, m) } -func resourceDomainRecordDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceDomainRecordDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { domainAPI := NewDomainAPI(m) recordID := locality.ExpandID(d.Id()) diff --git a/internal/services/domain/record_data_source.go b/internal/services/domain/record_data_source.go index c0f0461560..ee375a49b6 100644 --- a/internal/services/domain/record_data_source.go +++ b/internal/services/domain/record_data_source.go @@ -37,7 +37,7 @@ func DataSourceRecord() *schema.Resource { } } -func DataSourceRecordRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceRecordRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { domainAPI := NewDomainAPI(m) recordID, ok := d.GetOk("record_id") diff --git a/internal/services/domain/registration.go b/internal/services/domain/registration.go index 039812a06c..a0ddfa52e5 100644 --- a/internal/services/domain/registration.go +++ b/internal/services/domain/registration.go @@ -410,13 +410,13 @@ func contactSchema() map[string]*schema.Schema { } } -func resourceRegistrationCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceRegistrationCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { registrarAPI := NewRegistrarDomainAPI(m) projectID := d.Get("project_id").(string) domainNames := make([]string, 0) - for _, v := range d.Get("domain_names").([]interface{}) { + for _, v := range d.Get("domain_names").([]any) { domainNames = append(domainNames, v.(string)) } @@ -433,9 +433,9 @@ func resourceRegistrationCreate(ctx context.Context, d *schema.ResourceData, m i if ownerContactID != "" { buyDomainsRequest.OwnerContactID = &ownerContactID } else if ownerContacts, ok := d.GetOk("owner_contact"); ok { - contacts := ownerContacts.([]interface{}) + contacts := ownerContacts.([]any) if len(contacts) > 0 { - buyDomainsRequest.OwnerContact = ExpandNewContact(contacts[0].(map[string]interface{})) + buyDomainsRequest.OwnerContact = ExpandNewContact(contacts[0].(map[string]any)) } } @@ -479,7 +479,7 @@ func resourceRegistrationCreate(ctx context.Context, d *schema.ResourceData, m i return resourceRegistrationsRead(ctx, d, m) } -func resourceRegistrationsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceRegistrationsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { registrarAPI := NewRegistrarDomainAPI(m) id := d.Id() @@ -522,11 +522,11 @@ func resourceRegistrationsRead(ctx context.Context, d *schema.ResourceData, m in computedDnssec := firstResp.Dnssec.Status == domain.DomainFeatureStatusEnabled - var computedDSRecord []interface{} + var computedDSRecord []any if firstResp.Dnssec != nil { computedDSRecord = FlattenDSRecord(firstResp.Dnssec.DsRecords) } else { - computedDSRecord = []interface{}{} + computedDSRecord = []any{} } _ = d.Set("domain_names", domainNames) @@ -548,7 +548,7 @@ func resourceRegistrationsRead(ctx context.Context, d *schema.ResourceData, m in return nil } -func resourceRegistrationUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceRegistrationUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { registrarAPI := NewRegistrarDomainAPI(m) id := d.Id() @@ -641,7 +641,7 @@ func resourceRegistrationUpdate(ctx context.Context, d *schema.ResourceData, m i return resourceRegistrationsRead(ctx, d, m) } -func resourceRegistrationDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceRegistrationDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { registrarAPI := NewRegistrarDomainAPI(m) id := d.Id() diff --git a/internal/services/domain/types.go b/internal/services/domain/types.go index 9922722966..a3bcfaa7dc 100644 --- a/internal/services/domain/types.go +++ b/internal/services/domain/types.go @@ -8,7 +8,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func flattenDomainData(data string, recordType domain.RecordType) interface{} { +func flattenDomainData(data string, recordType domain.RecordType) any { switch recordType { case domain.RecordTypeMX: // API return this format: "{priority} {data}" dataSplit := strings.SplitN(data, " ", 2) @@ -22,20 +22,20 @@ func flattenDomainData(data string, recordType domain.RecordType) interface{} { return data } -func flattenDomainGeoIP(config *domain.RecordGeoIPConfig) interface{} { - flattenedResult := []map[string]interface{}{} +func flattenDomainGeoIP(config *domain.RecordGeoIPConfig) any { + flattenedResult := []map[string]any{} if config == nil { return flattenedResult } - flattenedResult = []map[string]interface{}{{}} + flattenedResult = []map[string]any{{}} if len(config.Matches) > 0 { - matches := []map[string]interface{}{} + matches := []map[string]any{} for _, match := range config.Matches { - rawMatch := map[string]interface{}{ + rawMatch := map[string]any{ "data": match.Data, } if len(match.Continents) > 0 { @@ -55,18 +55,18 @@ func flattenDomainGeoIP(config *domain.RecordGeoIPConfig) interface{} { return flattenedResult } -func expandDomainGeoIPConfig(defaultData string, i interface{}, ok bool) *domain.RecordGeoIPConfig { +func expandDomainGeoIPConfig(defaultData string, i any, ok bool) *domain.RecordGeoIPConfig { if i == nil || !ok { return nil } - rawMap := i.([]interface{})[0].(map[string]interface{}) + rawMap := i.([]any)[0].(map[string]any) config := domain.RecordGeoIPConfig{ Default: defaultData, } - rawMatches, ok := rawMap["matches"].([]interface{}) + rawMatches, ok := rawMap["matches"].([]any) if !ok && len(rawMatches) > 0 { return &config } @@ -74,13 +74,13 @@ func expandDomainGeoIPConfig(defaultData string, i interface{}, ok bool) *domain matches := []*domain.RecordGeoIPConfigMatch{} for _, rawMatch := range rawMatches { - rawMatchMap := rawMatch.(map[string]interface{}) + rawMatchMap := rawMatch.(map[string]any) match := &domain.RecordGeoIPConfigMatch{ Data: rawMatchMap["data"].(string), } - rawContinents, ok := rawMatchMap["continents"].([]interface{}) + rawContinents, ok := rawMatchMap["continents"].([]any) if ok { match.Continents = []string{} for _, rawContinent := range rawContinents { @@ -88,7 +88,7 @@ func expandDomainGeoIPConfig(defaultData string, i interface{}, ok bool) *domain } } - rawCountries, ok := rawMatchMap["countries"].([]interface{}) + rawCountries, ok := rawMatchMap["countries"].([]any) if ok { match.Countries = []string{} for _, rawCountry := range rawCountries { @@ -104,14 +104,14 @@ func expandDomainGeoIPConfig(defaultData string, i interface{}, ok bool) *domain return &config } -func flattenDomainHTTPService(config *domain.RecordHTTPServiceConfig) interface{} { - flattened := []map[string]interface{}{} +func flattenDomainHTTPService(config *domain.RecordHTTPServiceConfig) any { + flattened := []map[string]any{} if config == nil { return flattened } - ips := []interface{}{} + ips := []any{} if len(config.IPs) > 0 { for _, ip := range config.IPs { @@ -119,7 +119,7 @@ func flattenDomainHTTPService(config *domain.RecordHTTPServiceConfig) interface{ } } - return []map[string]interface{}{ + return []map[string]any{ { "must_contain": types.FlattenStringPtr(config.MustContain), "url": config.URL, @@ -130,16 +130,16 @@ func flattenDomainHTTPService(config *domain.RecordHTTPServiceConfig) interface{ } } -func expandDomainHTTPService(i interface{}, ok bool) *domain.RecordHTTPServiceConfig { +func expandDomainHTTPService(i any, ok bool) *domain.RecordHTTPServiceConfig { if i == nil || !ok { return nil } - rawMap := i.([]interface{})[0].(map[string]interface{}) + rawMap := i.([]any)[0].(map[string]any) ips := []net.IP{} - rawIPs, ok := rawMap["ips"].([]interface{}) + rawIPs, ok := rawMap["ips"].([]any) if ok { for _, rawIP := range rawIPs { ips = append(ips, net.ParseIP(rawIP.(string))) @@ -155,8 +155,8 @@ func expandDomainHTTPService(i interface{}, ok bool) *domain.RecordHTTPServiceCo } } -func flattenDomainWeighted(config *domain.RecordWeightedConfig) interface{} { - flattened := []map[string]interface{}{} +func flattenDomainWeighted(config *domain.RecordWeightedConfig) any { + flattened := []map[string]any{} if config == nil { return flattened @@ -164,7 +164,7 @@ func flattenDomainWeighted(config *domain.RecordWeightedConfig) interface{} { if len(config.WeightedIPs) > 0 { for _, weightedIPs := range config.WeightedIPs { - flattened = append(flattened, map[string]interface{}{ + flattened = append(flattened, map[string]any{ "ip": weightedIPs.IP.String(), "weight": int(weightedIPs.Weight), }) @@ -174,16 +174,16 @@ func flattenDomainWeighted(config *domain.RecordWeightedConfig) interface{} { return flattened } -func expandDomainWeighted(i interface{}, ok bool) *domain.RecordWeightedConfig { +func expandDomainWeighted(i any, ok bool) *domain.RecordWeightedConfig { if i == nil || !ok { return nil } weightedIPs := []*domain.RecordWeightedConfigWeightedIP{} - if raw := i.([]interface{}); len(raw) > 0 { + if raw := i.([]any); len(raw) > 0 { for _, rawWeighted := range raw { - rawMap := rawWeighted.(map[string]interface{}) + rawMap := rawWeighted.(map[string]any) weightedIPs = append(weightedIPs, &domain.RecordWeightedConfigWeightedIP{ IP: net.ParseIP(rawMap["ip"].(string)), Weight: uint32(rawMap["weight"].(int)), @@ -196,8 +196,8 @@ func expandDomainWeighted(i interface{}, ok bool) *domain.RecordWeightedConfig { } } -func flattenDomainView(config *domain.RecordViewConfig) interface{} { - flattened := []map[string]interface{}{} +func flattenDomainView(config *domain.RecordViewConfig) any { + flattened := []map[string]any{} if config == nil { return flattened @@ -205,7 +205,7 @@ func flattenDomainView(config *domain.RecordViewConfig) interface{} { if len(config.Views) > 0 { for _, view := range config.Views { - flattened = append(flattened, map[string]interface{}{ + flattened = append(flattened, map[string]any{ "subnet": view.Subnet, "data": view.Data, }) @@ -215,16 +215,16 @@ func flattenDomainView(config *domain.RecordViewConfig) interface{} { return flattened } -func expandDomainView(i interface{}, ok bool) *domain.RecordViewConfig { +func expandDomainView(i any, ok bool) *domain.RecordViewConfig { if i == nil || !ok { return nil } views := []*domain.RecordViewConfigView{} - if raw := i.([]interface{}); len(raw) > 0 { + if raw := i.([]any); len(raw) > 0 { for _, rawWeighted := range raw { - rawMap := rawWeighted.(map[string]interface{}) + rawMap := rawWeighted.(map[string]any) views = append(views, &domain.RecordViewConfigView{ Subnet: rawMap["subnet"].(string), Data: rawMap["data"].(string), diff --git a/internal/services/domain/zone.go b/internal/services/domain/zone.go index 9ce854463b..4f5cc21806 100644 --- a/internal/services/domain/zone.go +++ b/internal/services/domain/zone.go @@ -83,7 +83,7 @@ func ResourceZone() *schema.Resource { } } -func resourceDomainZoneCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceDomainZoneCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { domainAPI := NewDomainAPI(m) domainName := strings.ToLower(d.Get("domain").(string)) @@ -126,7 +126,7 @@ func resourceDomainZoneCreate(ctx context.Context, d *schema.ResourceData, m int return resourceDomainZoneRead(ctx, d, m) } -func resourceDomainZoneRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceDomainZoneRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { domainAPI := NewDomainAPI(m) var zone *domain.DNSZone @@ -168,7 +168,7 @@ func resourceDomainZoneRead(ctx context.Context, d *schema.ResourceData, m inter return nil } -func resourceZoneUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceZoneUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { domainAPI := NewDomainAPI(m) if d.HasChangesExcept("subdomain") { @@ -185,7 +185,7 @@ func resourceZoneUpdate(ctx context.Context, d *schema.ResourceData, m interface return resourceDomainZoneRead(ctx, d, m) } -func resourceZoneDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceZoneDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { domainAPI := NewDomainAPI(m) _, err := waitForDNSZone(ctx, domainAPI, d.Id(), d.Timeout(schema.TimeoutDelete)) diff --git a/internal/services/domain/zone_data_source.go b/internal/services/domain/zone_data_source.go index 50b008f09c..24ed38606b 100644 --- a/internal/services/domain/zone_data_source.go +++ b/internal/services/domain/zone_data_source.go @@ -21,7 +21,7 @@ func DataSourceZone() *schema.Resource { } } -func DataSourceZoneRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceZoneRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { d.SetId(fmt.Sprintf("%s.%s", d.Get("subdomain").(string), d.Get("domain").(string))) return resourceDomainZoneRead(ctx, d, m) diff --git a/internal/services/edgeservices/backend_stage.go b/internal/services/edgeservices/backend_stage.go index 7976de0f5f..e671453c53 100644 --- a/internal/services/edgeservices/backend_stage.go +++ b/internal/services/edgeservices/backend_stage.go @@ -111,7 +111,7 @@ func ResourceBackendStage() *schema.Resource { } } -func ResourceBackendStageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBackendStageCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) req := &edgeservices.CreateBackendStageRequest{ @@ -136,7 +136,7 @@ func ResourceBackendStageCreate(ctx context.Context, d *schema.ResourceData, m i return ResourceBackendStageRead(ctx, d, m) } -func ResourceBackendStageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBackendStageRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) backendStage, err := api.GetBackendStage(&edgeservices.GetBackendStageRequest{ @@ -167,7 +167,7 @@ func ResourceBackendStageRead(ctx context.Context, d *schema.ResourceData, m int return nil } -func ResourceBackendStageUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBackendStageUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) hasChanged := false @@ -196,7 +196,7 @@ func ResourceBackendStageUpdate(ctx context.Context, d *schema.ResourceData, m i return ResourceBackendStageRead(ctx, d, m) } -func ResourceBackendStageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBackendStageDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) err := api.DeleteBackendStage(&edgeservices.DeleteBackendStageRequest{ diff --git a/internal/services/edgeservices/cache_stage.go b/internal/services/edgeservices/cache_stage.go index 14c90137a8..18168aa2e2 100644 --- a/internal/services/edgeservices/cache_stage.go +++ b/internal/services/edgeservices/cache_stage.go @@ -101,7 +101,7 @@ func ResourceCacheStage() *schema.Resource { } } -func ResourceCacheStageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCacheStageCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) cacheStage, err := api.CreateCacheStage(&edgeservices.CreateCacheStageRequest{ @@ -120,7 +120,7 @@ func ResourceCacheStageCreate(ctx context.Context, d *schema.ResourceData, m int return ResourceCacheStageRead(ctx, d, m) } -func ResourceCacheStageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCacheStageRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) cacheStage, err := api.GetCacheStage(&edgeservices.GetCacheStageRequest{ @@ -147,7 +147,7 @@ func ResourceCacheStageRead(ctx context.Context, d *schema.ResourceData, m inter return nil } -func ResourceCacheStageUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCacheStageUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) hasChanged := false @@ -204,7 +204,7 @@ func ResourceCacheStageUpdate(ctx context.Context, d *schema.ResourceData, m int return ResourceCacheStageRead(ctx, d, m) } -func ResourceCacheStageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceCacheStageDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) err := api.DeleteCacheStage(&edgeservices.DeleteCacheStageRequest{ diff --git a/internal/services/edgeservices/dns_stage.go b/internal/services/edgeservices/dns_stage.go index b3017837ba..d74ad717d8 100644 --- a/internal/services/edgeservices/dns_stage.go +++ b/internal/services/edgeservices/dns_stage.go @@ -78,7 +78,7 @@ func ResourceDNSStage() *schema.Resource { } } -func ResourceDNSStageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDNSStageCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) dnsStage, err := api.CreateDNSStage(&edgeservices.CreateDNSStageRequest{ @@ -97,7 +97,7 @@ func ResourceDNSStageCreate(ctx context.Context, d *schema.ResourceData, m inter return ResourceDNSStageRead(ctx, d, m) } -func ResourceDNSStageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDNSStageRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) dnsStage, err := api.GetDNSStage(&edgeservices.GetDNSStageRequest{ @@ -121,7 +121,7 @@ func ResourceDNSStageRead(ctx context.Context, d *schema.ResourceData, m interfa _ = d.Set("updated_at", types.FlattenTime(dnsStage.UpdatedAt)) _ = d.Set("type", dnsStage.Type.String()) - oldFQDNs := d.Get("fqdns").([]interface{}) + oldFQDNs := d.Get("fqdns").([]any) oldFQDNsSet := make(map[string]bool) for _, fqdn := range oldFQDNs { @@ -160,7 +160,7 @@ func ResourceDNSStageRead(ctx context.Context, d *schema.ResourceData, m interfa return nil } -func ResourceDNSStageUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDNSStageUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) hasChanged := false @@ -199,7 +199,7 @@ func ResourceDNSStageUpdate(ctx context.Context, d *schema.ResourceData, m inter return ResourceDNSStageRead(ctx, d, m) } -func ResourceDNSStageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDNSStageDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) err := api.DeleteDNSStage(&edgeservices.DeleteDNSStageRequest{ diff --git a/internal/services/edgeservices/head_stage.go b/internal/services/edgeservices/head_stage.go index 5464727d30..9f188cc97a 100644 --- a/internal/services/edgeservices/head_stage.go +++ b/internal/services/edgeservices/head_stage.go @@ -37,7 +37,7 @@ func ResourceHeadStage() *schema.Resource { } } -func ResourceHeadStageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceHeadStageCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) dnsStage, err := api.SetHeadStage(&edgeservices.SetHeadStageRequest{ @@ -57,11 +57,11 @@ func ResourceHeadStageCreate(ctx context.Context, d *schema.ResourceData, m inte return ResourceHeadStageRead(ctx, d, m) } -func ResourceHeadStageRead(_ context.Context, _ *schema.ResourceData, _ interface{}) diag.Diagnostics { +func ResourceHeadStageRead(_ context.Context, _ *schema.ResourceData, _ any) diag.Diagnostics { return nil } -func ResourceHeadStageUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceHeadStageUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) if d.HasChange("head_stage_id") { @@ -82,7 +82,7 @@ func ResourceHeadStageUpdate(ctx context.Context, d *schema.ResourceData, m inte return ResourceHeadStageRead(ctx, d, m) } -func ResourceHeadStageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceHeadStageDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) _, err := api.SetHeadStage(&edgeservices.SetHeadStageRequest{ diff --git a/internal/services/edgeservices/helpers.go b/internal/services/edgeservices/helpers.go index b9398eeaa7..0101174866 100644 --- a/internal/services/edgeservices/helpers.go +++ b/internal/services/edgeservices/helpers.go @@ -8,12 +8,12 @@ import ( ) // NewEdgeServicesAPI returns a new edge_services API -func NewEdgeServicesAPI(m interface{}) *edgeservices.API { +func NewEdgeServicesAPI(m any) *edgeservices.API { return edgeservices.NewAPI(meta.ExtractScwClient(m)) } // NewEdgeServicesAPIWithRegion returns a new edge_services API and the region -func NewEdgeServicesAPIWithRegion(d *schema.ResourceData, m interface{}) (*edgeservices.API, scw.Region, error) { +func NewEdgeServicesAPIWithRegion(d *schema.ResourceData, m any) (*edgeservices.API, scw.Region, error) { api := edgeservices.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) diff --git a/internal/services/edgeservices/pipeline.go b/internal/services/edgeservices/pipeline.go index 358a207d75..1764753fcd 100644 --- a/internal/services/edgeservices/pipeline.go +++ b/internal/services/edgeservices/pipeline.go @@ -60,7 +60,7 @@ func ResourcePipeline() *schema.Resource { } } -func ResourcePipelineCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourcePipelineCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) pipeline, err := api.CreatePipeline(&edgeservices.CreatePipelineRequest{ @@ -77,7 +77,7 @@ func ResourcePipelineCreate(ctx context.Context, d *schema.ResourceData, m inter return ResourcePipelineRead(ctx, d, m) } -func ResourcePipelineRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourcePipelineRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) pipeline, err := api.GetPipeline(&edgeservices.GetPipelineRequest{ @@ -103,7 +103,7 @@ func ResourcePipelineRead(ctx context.Context, d *schema.ResourceData, m interfa return nil } -func ResourcePipelineUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourcePipelineUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) hasChanged := false @@ -132,7 +132,7 @@ func ResourcePipelineUpdate(ctx context.Context, d *schema.ResourceData, m inter return ResourcePipelineRead(ctx, d, m) } -func ResourcePipelineDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourcePipelineDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) err := api.DeletePipeline(&edgeservices.DeletePipelineRequest{ diff --git a/internal/services/edgeservices/plan.go b/internal/services/edgeservices/plan.go index f529f66715..f637b32694 100644 --- a/internal/services/edgeservices/plan.go +++ b/internal/services/edgeservices/plan.go @@ -36,7 +36,7 @@ func ResourcePlan() *schema.Resource { } } -func ResourcePlanCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourcePlanCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) plan, err := api.SelectPlan(&edgeservices.SelectPlanRequest{ @@ -52,7 +52,7 @@ func ResourcePlanCreate(ctx context.Context, d *schema.ResourceData, m interface return nil } -func ResourcePlanRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourcePlanRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) plan, err := api.GetCurrentPlan(&edgeservices.GetCurrentPlanRequest{ @@ -73,7 +73,7 @@ func ResourcePlanRead(ctx context.Context, d *schema.ResourceData, m interface{} return nil } -func ResourcePlanUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourcePlanUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) if d.HasChange("name") { @@ -89,7 +89,7 @@ func ResourcePlanUpdate(ctx context.Context, d *schema.ResourceData, m interface return ResourcePlanRead(ctx, d, m) } -func ResourcePlanDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourcePlanDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) err := api.DeleteCurrentPlan(&edgeservices.DeleteCurrentPlanRequest{ diff --git a/internal/services/edgeservices/route_stage.go b/internal/services/edgeservices/route_stage.go index ad9b5d4d46..78880cb9ae 100644 --- a/internal/services/edgeservices/route_stage.go +++ b/internal/services/edgeservices/route_stage.go @@ -104,7 +104,7 @@ func ResourceRouteStage() *schema.Resource { } } -func ResourceRouteStageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRouteStageCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) routeStage, err := api.CreateRouteStage(&edgeservices.CreateRouteStageRequest{ @@ -128,7 +128,7 @@ func ResourceRouteStageCreate(ctx context.Context, d *schema.ResourceData, m int return ResourceRouteStageRead(ctx, d, m) } -func ResourceRouteStageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRouteStageRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) routeStage, err := api.GetRouteStage(&edgeservices.GetRouteStageRequest{ @@ -161,7 +161,7 @@ func ResourceRouteStageRead(ctx context.Context, d *schema.ResourceData, m inter return nil } -func ResourceRouteStageUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRouteStageUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) hasChanged := false @@ -195,7 +195,7 @@ func ResourceRouteStageUpdate(ctx context.Context, d *schema.ResourceData, m int return ResourceRouteStageRead(ctx, d, m) } -func ResourceRouteStageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRouteStageDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) err := api.DeleteRouteStage(&edgeservices.DeleteRouteStageRequest{ diff --git a/internal/services/edgeservices/tls_stage.go b/internal/services/edgeservices/tls_stage.go index c317263b13..7fb52be44e 100644 --- a/internal/services/edgeservices/tls_stage.go +++ b/internal/services/edgeservices/tls_stage.go @@ -100,7 +100,7 @@ func ResourceTLSStage() *schema.Resource { } } -func ResourceTLSStageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceTLSStageCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := NewEdgeServicesAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -124,7 +124,7 @@ func ResourceTLSStageCreate(ctx context.Context, d *schema.ResourceData, m inter return ResourceTLSStageRead(ctx, d, m) } -func ResourceTLSStageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceTLSStageRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) tlsStage, err := api.GetTLSStage(&edgeservices.GetTLSStageRequest{ @@ -154,7 +154,7 @@ func ResourceTLSStageRead(ctx context.Context, d *schema.ResourceData, m interfa return nil } -func ResourceTLSStageUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceTLSStageUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := NewEdgeServicesAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -206,7 +206,7 @@ func ResourceTLSStageUpdate(ctx context.Context, d *schema.ResourceData, m inter return ResourceTLSStageRead(ctx, d, m) } -func ResourceTLSStageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceTLSStageDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) err := api.DeleteTLSStage(&edgeservices.DeleteTLSStageRequest{ diff --git a/internal/services/edgeservices/types.go b/internal/services/edgeservices/types.go index 4ff7ba2ce5..d2bf19e4be 100644 --- a/internal/services/edgeservices/types.go +++ b/internal/services/edgeservices/types.go @@ -8,12 +8,12 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func expandS3BackendConfig(raw interface{}) *edge_services.ScalewayS3BackendConfig { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandS3BackendConfig(raw any) *edge_services.ScalewayS3BackendConfig { + if raw == nil || len(raw.([]any)) != 1 { return nil } - rawMap := raw.([]interface{})[0].(map[string]interface{}) + rawMap := raw.([]any)[0].(map[string]any) return &edge_services.ScalewayS3BackendConfig{ BucketName: types.ExpandStringPtr(rawMap["bucket_name"].(string)), @@ -22,8 +22,8 @@ func expandS3BackendConfig(raw interface{}) *edge_services.ScalewayS3BackendConf } } -func flattenS3BackendConfig(s3backend *edge_services.ScalewayS3BackendConfig) []map[string]interface{} { - return []map[string]interface{}{ +func flattenS3BackendConfig(s3backend *edge_services.ScalewayS3BackendConfig) []map[string]any { + return []map[string]any{ { "bucket_name": types.FlattenStringPtr(s3backend.BucketName), "bucket_region": types.FlattenStringPtr(s3backend.BucketRegion), @@ -32,7 +32,7 @@ func flattenS3BackendConfig(s3backend *edge_services.ScalewayS3BackendConfig) [] } } -func expandPurge(raw interface{}) []*edge_services.PurgeRequest { +func expandPurge(raw any) []*edge_services.PurgeRequest { if raw == nil { return nil } @@ -40,7 +40,7 @@ func expandPurge(raw interface{}) []*edge_services.PurgeRequest { purgeRequests := []*edge_services.PurgeRequest(nil) for _, pr := range raw.(*schema.Set).List() { - rawPr := pr.(map[string]interface{}) + rawPr := pr.(map[string]any) purgeRequest := &edge_services.PurgeRequest{} purgeRequest.PipelineID = rawPr["pipeline_id"].(string) purgeRequest.Assets = types.ExpandStringsPtr(rawPr["assets"]) @@ -52,12 +52,12 @@ func expandPurge(raw interface{}) []*edge_services.PurgeRequest { return purgeRequests } -func expandTLSSecrets(raw interface{}, region scw.Region) []*edge_services.TLSSecret { +func expandTLSSecrets(raw any, region scw.Region) []*edge_services.TLSSecret { secrets := []*edge_services.TLSSecret(nil) - rawSecrets := raw.([]interface{}) + rawSecrets := raw.([]any) for _, rawSecret := range rawSecrets { - mapSecret := rawSecret.(map[string]interface{}) + mapSecret := rawSecret.(map[string]any) secret := &edge_services.TLSSecret{ SecretID: locality.ExpandID(mapSecret["secret_id"]), Region: region, @@ -68,15 +68,15 @@ func expandTLSSecrets(raw interface{}, region scw.Region) []*edge_services.TLSSe return secrets } -func flattenTLSSecrets(secrets []*edge_services.TLSSecret) interface{} { +func flattenTLSSecrets(secrets []*edge_services.TLSSecret) any { if len(secrets) == 0 || secrets == nil { return nil } - secretsI := []map[string]interface{}(nil) + secretsI := []map[string]any(nil) for _, secret := range secrets { - secretMap := map[string]interface{}{ + secretMap := map[string]any{ "secret_id": secret.SecretID, "region": secret.Region.String(), } @@ -86,19 +86,19 @@ func flattenTLSSecrets(secrets []*edge_services.TLSSecret) interface{} { return secretsI } -func expandLBBackendConfig(raw interface{}) *edge_services.ScalewayLBBackendConfig { +func expandLBBackendConfig(raw any) *edge_services.ScalewayLBBackendConfig { lbConfigs := []*edge_services.ScalewayLB(nil) - rawLbConfigs := raw.([]interface{}) + rawLbConfigs := raw.([]any) for _, rawLbConfig := range rawLbConfigs { - outerMap := rawLbConfig.(map[string]interface{}) + outerMap := rawLbConfig.(map[string]any) - lbConfigList, ok := outerMap["lb_config"].([]interface{}) + lbConfigList, ok := outerMap["lb_config"].([]any) if !ok || len(lbConfigList) == 0 { continue } - innerMap := lbConfigList[0].(map[string]interface{}) + innerMap := lbConfigList[0].(map[string]any) lbConfig := &edge_services.ScalewayLB{ ID: locality.ExpandID(innerMap["id"]), Zone: scw.Zone(innerMap["zone"].(string)), @@ -114,15 +114,15 @@ func expandLBBackendConfig(raw interface{}) *edge_services.ScalewayLBBackendConf } } -func flattenLBBackendConfig(lbConfigs *edge_services.ScalewayLBBackendConfig) interface{} { +func flattenLBBackendConfig(lbConfigs *edge_services.ScalewayLBBackendConfig) any { if lbConfigs == nil { return nil } - lbConfigsI := []map[string]interface{}(nil) + lbConfigsI := []map[string]any(nil) for _, lbConfig := range lbConfigs.LBs { - secretMap := map[string]interface{}{ + secretMap := map[string]any{ "id": lbConfig.ID, "frontend_id": lbConfig.FrontendID, "is_ssl": types.FlattenBoolPtr(lbConfig.IsSsl), @@ -141,16 +141,16 @@ func wrapSecretsInConfig(secrets []*edge_services.TLSSecret) *edge_services.TLSS } } -func expandRouteRules(raw interface{}) []*edge_services.SetRouteRulesRequestRouteRule { +func expandRouteRules(raw any) []*edge_services.SetRouteRulesRequestRouteRule { if raw == nil { return nil } - rulesList := raw.([]interface{}) + rulesList := raw.([]any) result := make([]*edge_services.SetRouteRulesRequestRouteRule, 0, len(rulesList)) for _, rawRule := range rulesList { - ruleMap := rawRule.(map[string]interface{}) + ruleMap := rawRule.(map[string]any) rule := &edge_services.SetRouteRulesRequestRouteRule{ BackendStageID: types.ExpandStringPtr(ruleMap["backend_stage_id"].(string)), } @@ -167,17 +167,17 @@ func expandRouteRules(raw interface{}) []*edge_services.SetRouteRulesRequestRout return result } -func expandRuleHTTPMatch(raw interface{}) *edge_services.RuleHTTPMatch { - list, ok := raw.([]interface{}) +func expandRuleHTTPMatch(raw any) *edge_services.RuleHTTPMatch { + list, ok := raw.([]any) if !ok || len(list) < 1 { return nil } - ruleMap := list[0].(map[string]interface{}) + ruleMap := list[0].(map[string]any) result := &edge_services.RuleHTTPMatch{} if v, exists := ruleMap["method_filters"]; exists && v != nil { - filters := v.([]interface{}) + filters := v.([]any) result.MethodFilters = make([]edge_services.RuleHTTPMatchMethodFilter, len(filters)) for i, item := range filters { @@ -192,13 +192,13 @@ func expandRuleHTTPMatch(raw interface{}) *edge_services.RuleHTTPMatch { return result } -func expandRuleHTTPMatchPathFilter(raw interface{}) *edge_services.RuleHTTPMatchPathFilter { - list, ok := raw.([]interface{}) +func expandRuleHTTPMatchPathFilter(raw any) *edge_services.RuleHTTPMatchPathFilter { + list, ok := raw.([]any) if !ok || len(list) < 1 { return nil } - mapPF := list[0].(map[string]interface{}) + mapPF := list[0].(map[string]any) return &edge_services.RuleHTTPMatchPathFilter{ PathFilterType: edge_services.RuleHTTPMatchPathFilterPathFilterType(mapPF["path_filter_type"].(string)), @@ -206,15 +206,15 @@ func expandRuleHTTPMatchPathFilter(raw interface{}) *edge_services.RuleHTTPMatch } } -func flattenRouteRules(rules []*edge_services.RouteRule) []interface{} { +func flattenRouteRules(rules []*edge_services.RouteRule) []any { if rules == nil { return nil } - result := make([]interface{}, 0, len(rules)) + result := make([]any, 0, len(rules)) for _, rule := range rules { - m := map[string]interface{}{ + m := map[string]any{ "backend_stage_id": types.FlattenStringPtr(rule.BackendStageID), "rule_http_match": flattenRuleHTTPMatch(rule.RuleHTTPMatch), } @@ -224,38 +224,38 @@ func flattenRouteRules(rules []*edge_services.RouteRule) []interface{} { return result } -func flattenRuleHTTPMatch(match *edge_services.RuleHTTPMatch) []interface{} { +func flattenRuleHTTPMatch(match *edge_services.RuleHTTPMatch) []any { if match == nil { return nil } - m := map[string]interface{}{} + m := map[string]any{} if len(match.MethodFilters) > 0 { - filters := make([]interface{}, len(match.MethodFilters)) + filters := make([]any, len(match.MethodFilters)) for i, v := range match.MethodFilters { filters[i] = string(v) } m["method_filters"] = filters } else { - m["method_filters"] = []interface{}{} + m["method_filters"] = []any{} } m["path_filter"] = flattenRuleHTTPMatchPathFilter(match.PathFilter) - return []interface{}{m} + return []any{m} } -func flattenRuleHTTPMatchPathFilter(pathFilter *edge_services.RuleHTTPMatchPathFilter) []interface{} { +func flattenRuleHTTPMatchPathFilter(pathFilter *edge_services.RuleHTTPMatchPathFilter) []any { if pathFilter == nil { return nil } - m := map[string]interface{}{ + m := map[string]any{ "path_filter_type": pathFilter.PathFilterType.String(), "value": pathFilter.Value, } - return []interface{}{m} + return []any{m} } diff --git a/internal/services/edgeservices/waf_stage.go b/internal/services/edgeservices/waf_stage.go index 7af4b0ebce..6cda8bec97 100644 --- a/internal/services/edgeservices/waf_stage.go +++ b/internal/services/edgeservices/waf_stage.go @@ -60,7 +60,7 @@ func ResourceWAFStage() *schema.Resource { } } -func ResourceWAFStageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceWAFStageCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) wafStage, err := api.CreateWafStage(&edgeservices.CreateWafStageRequest{ @@ -78,7 +78,7 @@ func ResourceWAFStageCreate(ctx context.Context, d *schema.ResourceData, m inter return ResourceWAFStageRead(ctx, d, m) } -func ResourceWAFStageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceWAFStageRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) wafStage, err := api.GetWafStage(&edgeservices.GetWafStageRequest{ @@ -104,7 +104,7 @@ func ResourceWAFStageRead(ctx context.Context, d *schema.ResourceData, m interfa return nil } -func ResourceWAFStageUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceWAFStageUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) hasChanged := false @@ -138,7 +138,7 @@ func ResourceWAFStageUpdate(ctx context.Context, d *schema.ResourceData, m inter return ResourceWAFStageRead(ctx, d, m) } -func ResourceWAFStageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceWAFStageDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewEdgeServicesAPI(m) err := api.DeleteWafStage(&edgeservices.DeleteWafStageRequest{ diff --git a/internal/services/file/filesystem.go b/internal/services/file/filesystem.go index 2bf9f3b390..3e577e741e 100644 --- a/internal/services/file/filesystem.go +++ b/internal/services/file/filesystem.go @@ -77,7 +77,7 @@ func ResourceFileSystem() *schema.Resource { } } -func ResourceFileSystemCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFileSystemCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := fileSystemAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -106,7 +106,7 @@ func ResourceFileSystemCreate(ctx context.Context, d *schema.ResourceData, m int return ResourceFileSystemRead(ctx, d, m) } -func ResourceFileSystemRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFileSystemRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -137,7 +137,7 @@ func ResourceFileSystemRead(ctx context.Context, d *schema.ResourceData, m inter return nil } -func ResourceFileSystemUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFileSystemUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -178,7 +178,7 @@ func ResourceFileSystemUpdate(ctx context.Context, d *schema.ResourceData, m int return ResourceFileSystemRead(ctx, d, m) } -func ResourceFileSystemDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFileSystemDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/file/helpers_file.go b/internal/services/file/helpers_file.go index b66bd75370..11c82b6b3e 100644 --- a/internal/services/file/helpers_file.go +++ b/internal/services/file/helpers_file.go @@ -15,7 +15,7 @@ const ( defaultFileSystemRetryInterval = 5 * time.Second ) -func fileSystemAPIWithZone(d *schema.ResourceData, m interface{}) (*file.API, scw.Region, error) { +func fileSystemAPIWithZone(d *schema.ResourceData, m any) (*file.API, scw.Region, error) { fileAPI := file.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -26,7 +26,7 @@ func fileSystemAPIWithZone(d *schema.ResourceData, m interface{}) (*file.API, sc return fileAPI, region, nil } -func NewAPIWithRegionAndID(m interface{}, regionID string) (*file.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, regionID string) (*file.API, scw.Region, string, error) { fileAPI := file.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionID) diff --git a/internal/services/flexibleip/data_source_flexible_ip.go b/internal/services/flexibleip/data_source_flexible_ip.go index faf4d0c4e9..7158e15a17 100644 --- a/internal/services/flexibleip/data_source_flexible_ip.go +++ b/internal/services/flexibleip/data_source_flexible_ip.go @@ -44,7 +44,7 @@ func DataSourceFlexibleIP() *schema.Resource { } } -func DataSourceFlexibleIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceFlexibleIPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/flexibleip/data_source_flexible_ips.go b/internal/services/flexibleip/data_source_flexible_ips.go index fc133c16f7..767bae02bb 100644 --- a/internal/services/flexibleip/data_source_flexible_ips.go +++ b/internal/services/flexibleip/data_source_flexible_ips.go @@ -126,7 +126,7 @@ func DataSourceFlexibleIPs() *schema.Resource { } } -func DataSourceFlexibleIPsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceFlexibleIPsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -142,10 +142,10 @@ func DataSourceFlexibleIPsRead(ctx context.Context, d *schema.ResourceData, m in return diag.FromErr(err) } - fips := []interface{}(nil) + fips := []any(nil) for _, fip := range res.FlexibleIPs { - rawFip := make(map[string]interface{}) + rawFip := make(map[string]any) rawFip["id"] = zonal.NewID(fip.Zone, fip.ID).String() rawFip["organization_id"] = fip.OrganizationID rawFip["project_id"] = fip.ProjectID diff --git a/internal/services/flexibleip/helpers_flexible_ip.go b/internal/services/flexibleip/helpers_flexible_ip.go index f805559a89..f5ebac579e 100644 --- a/internal/services/flexibleip/helpers_flexible_ip.go +++ b/internal/services/flexibleip/helpers_flexible_ip.go @@ -18,7 +18,7 @@ const ( ) // fipAPIWithZone returns an lb API WITH zone for a Create request -func fipAPIWithZone(d *schema.ResourceData, m interface{}) (*flexibleip.API, scw.Zone, error) { +func fipAPIWithZone(d *schema.ResourceData, m any) (*flexibleip.API, scw.Zone, error) { api := flexibleip.NewAPI(meta.ExtractScwClient(m)) zone, err := meta.ExtractZone(d, m) @@ -30,7 +30,7 @@ func fipAPIWithZone(d *schema.ResourceData, m interface{}) (*flexibleip.API, scw } // NewAPIWithZoneAndID returns an flexibleip API with zone and ID extracted from the state -func NewAPIWithZoneAndID(m interface{}, id string) (*flexibleip.API, scw.Zone, string, error) { +func NewAPIWithZoneAndID(m any, id string) (*flexibleip.API, scw.Zone, string, error) { fipAPI := flexibleip.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) diff --git a/internal/services/flexibleip/ip.go b/internal/services/flexibleip/ip.go index cfa754743b..b49172b6f2 100644 --- a/internal/services/flexibleip/ip.go +++ b/internal/services/flexibleip/ip.go @@ -92,7 +92,7 @@ func ResourceIP() *schema.Resource { } } -func ResourceFlexibleIPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFlexibleIPCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -121,7 +121,7 @@ func ResourceFlexibleIPCreate(ctx context.Context, d *schema.ResourceData, m int return ResourceFlexibleIPRead(ctx, d, m) } -func ResourceFlexibleIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFlexibleIPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { fipAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -167,7 +167,7 @@ func ResourceFlexibleIPRead(ctx context.Context, d *schema.ResourceData, m inter return nil } -func ResourceFlexibleIPUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFlexibleIPUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { fipAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -241,7 +241,7 @@ func ResourceFlexibleIPUpdate(ctx context.Context, d *schema.ResourceData, m int return ResourceFlexibleIPRead(ctx, d, m) } -func ResourceFlexibleIPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFlexibleIPDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { fipAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/flexibleip/mac_address.go b/internal/services/flexibleip/mac_address.go index 446b533f09..41c46c254a 100644 --- a/internal/services/flexibleip/mac_address.go +++ b/internal/services/flexibleip/mac_address.go @@ -82,7 +82,7 @@ func ResourceMACAddress() *schema.Resource { } } -func ResourceFlexibleIPMACCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFlexibleIPMACCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -136,7 +136,7 @@ func ResourceFlexibleIPMACCreate(ctx context.Context, d *schema.ResourceData, m return ResourceFlexibleIPMACRead(ctx, d, m) } -func ResourceFlexibleIPMACRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFlexibleIPMACRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -172,7 +172,7 @@ func ResourceFlexibleIPMACRead(ctx context.Context, d *schema.ResourceData, m in return nil } -func ResourceFlexibleIPMACUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFlexibleIPMACUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -258,7 +258,7 @@ func ResourceFlexibleIPMACUpdate(ctx context.Context, d *schema.ResourceData, m return ResourceFlexibleIPMACRead(ctx, d, m) } -func ResourceFlexibleIPMACDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFlexibleIPMACDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/flexibleip/types.go b/internal/services/flexibleip/types.go index 7620ce3e90..aa4479d652 100644 --- a/internal/services/flexibleip/types.go +++ b/internal/services/flexibleip/types.go @@ -5,12 +5,12 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func flattenFlexibleIPMacAddress(mac *flexibleip.MACAddress) interface{} { +func flattenFlexibleIPMacAddress(mac *flexibleip.MACAddress) any { if mac == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "id": mac.ID, "mac_address": mac.MacAddress, diff --git a/internal/services/function/cron.go b/internal/services/function/cron.go index e881e12b5f..04c70f43ed 100644 --- a/internal/services/function/cron.go +++ b/internal/services/function/cron.go @@ -66,7 +66,7 @@ func ResourceCron() *schema.Resource { } } -func ResourceFunctionCronCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionCronCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -110,7 +110,7 @@ func ResourceFunctionCronCreate(ctx context.Context, d *schema.ResourceData, m i return ResourceFunctionCronRead(ctx, d, m) } -func ResourceFunctionCronRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionCronRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -143,7 +143,7 @@ func ResourceFunctionCronRead(ctx context.Context, d *schema.ResourceData, m int return nil } -func ResourceFunctionCronUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionCronUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -190,7 +190,7 @@ func ResourceFunctionCronUpdate(ctx context.Context, d *schema.ResourceData, m i return ResourceFunctionCronRead(ctx, d, m) } -func ResourceFunctionCronDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionCronDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/function/data_source_function.go b/internal/services/function/data_source_function.go index 9185291cbe..b47263b220 100644 --- a/internal/services/function/data_source_function.go +++ b/internal/services/function/data_source_function.go @@ -31,7 +31,7 @@ func DataSourceFunction() *schema.Resource { } } -func DataSourceFunctionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceFunctionRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/function/data_source_function_namespace.go b/internal/services/function/data_source_function_namespace.go index 940c38ee01..7c6e255496 100644 --- a/internal/services/function/data_source_function_namespace.go +++ b/internal/services/function/data_source_function_namespace.go @@ -33,7 +33,7 @@ func DataSourceNamespace() *schema.Resource { } } -func DataSourceFunctionNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceFunctionNamespaceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/function/domain.go b/internal/services/function/domain.go index f71b412c7a..21cb5793de 100644 --- a/internal/services/function/domain.go +++ b/internal/services/function/domain.go @@ -56,7 +56,7 @@ func ResourceDomain() *schema.Resource { } } -func ResourceFunctionDomainCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionDomainCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -92,7 +92,7 @@ func ResourceFunctionDomainCreate(ctx context.Context, d *schema.ResourceData, m return ResourceFunctionDomainRead(ctx, d, m) } -func ResourceFunctionDomainRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionDomainRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -117,7 +117,7 @@ func ResourceFunctionDomainRead(ctx context.Context, d *schema.ResourceData, m i return nil } -func ResourceFunctionDomainDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionDomainDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/function/function.go b/internal/services/function/function.go index 747a516407..f69cf41f62 100644 --- a/internal/services/function/function.go +++ b/internal/services/function/function.go @@ -178,7 +178,7 @@ func ResourceFunction() *schema.Resource { } } -func ResourceFunctionCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -270,7 +270,7 @@ func ResourceFunctionCreate(ctx context.Context, d *schema.ResourceData, m inter return append(diags, ResourceFunctionRead(ctx, d, m)...) } -func ResourceFunctionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -327,7 +327,7 @@ func ResourceFunctionRead(ctx context.Context, d *schema.ResourceData, m interfa return diags } -func ResourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -456,7 +456,7 @@ func ResourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, m inter return ResourceFunctionRead(ctx, d, m) } -func ResourceFunctionDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/function/helpers_function.go b/internal/services/function/helpers_function.go index 3a352ceb77..ae3db47b7e 100644 --- a/internal/services/function/helpers_function.go +++ b/internal/services/function/helpers_function.go @@ -29,7 +29,7 @@ const ( ) // functionAPIWithRegion returns a new container registry API and the region. -func functionAPIWithRegion(d *schema.ResourceData, m interface{}) (*function.API, scw.Region, error) { +func functionAPIWithRegion(d *schema.ResourceData, m any) (*function.API, scw.Region, error) { api := function.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -41,7 +41,7 @@ func functionAPIWithRegion(d *schema.ResourceData, m interface{}) (*function.API } // NewAPIWithRegionAndID returns a new container registry API, region and ID. -func NewAPIWithRegionAndID(m interface{}, id string) (*function.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*function.API, scw.Region, string, error) { api := function.NewAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) @@ -52,7 +52,7 @@ func NewAPIWithRegionAndID(m interface{}, id string) (*function.API, scw.Region, return api, region, id, nil } -func functionUpload(ctx context.Context, m interface{}, functionAPI *function.API, region scw.Region, functionID string, zipFile string) error { +func functionUpload(ctx context.Context, m any, functionAPI *function.API, region scw.Region, functionID string, zipFile string) error { zipStat, err := os.Stat(zipFile) if err != nil { return fmt.Errorf("failed to stat zip file: %w", err) @@ -105,7 +105,7 @@ func functionUpload(ctx context.Context, m interface{}, functionAPI *function.AP return fmt.Errorf("failed to dump request: %w", err) } - tflog.Debug(ctx, "Request dump", map[string]interface{}{ + tflog.Debug(ctx, "Request dump", map[string]any{ "url": uploadURL.URL, "response": string(respDump), "request": string(reqDump), @@ -130,8 +130,8 @@ func functionDeploy(ctx context.Context, functionAPI *function.API, region scw.R return nil } -func expandFunctionsSecrets(secretsRawMap interface{}) []*function.Secret { - secretsMap := secretsRawMap.(map[string]interface{}) +func expandFunctionsSecrets(secretsRawMap any) []*function.Secret { + secretsMap := secretsRawMap.(map[string]any) secrets := make([]*function.Secret, 0, len(secretsMap)) for k, v := range secretsMap { @@ -176,12 +176,12 @@ func retryCreateFunctionDomain(ctx context.Context, functionAPI *function.API, r } } -func flattenFunctionSecrets(secrets []*function.SecretHashedValue) interface{} { +func flattenFunctionSecrets(secrets []*function.SecretHashedValue) any { if len(secrets) == 0 { return nil } - flattenedSecrets := make(map[string]interface{}) + flattenedSecrets := make(map[string]any) for _, secret := range secrets { flattenedSecrets[secret.Key] = secret.HashedValue } diff --git a/internal/services/function/helpers_triggers.go b/internal/services/function/helpers_triggers.go index cd7e7282b5..cccb991106 100644 --- a/internal/services/function/helpers_triggers.go +++ b/internal/services/function/helpers_triggers.go @@ -8,8 +8,8 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) -func expandFunctionTriggerMnqSqsCreationConfig(i interface{}) *function.CreateTriggerRequestMnqSqsClientConfig { - m := i.(map[string]interface{}) +func expandFunctionTriggerMnqSqsCreationConfig(i any) *function.CreateTriggerRequestMnqSqsClientConfig { + m := i.(map[string]any) req := &function.CreateTriggerRequestMnqSqsClientConfig{ Queue: m["queue"].(string), MnqProjectID: m["project_id"].(string), @@ -19,8 +19,8 @@ func expandFunctionTriggerMnqSqsCreationConfig(i interface{}) *function.CreateTr return req } -func expandFunctionTriggerMnqNatsCreationConfig(i interface{}) *function.CreateTriggerRequestMnqNatsClientConfig { - m := i.(map[string]interface{}) +func expandFunctionTriggerMnqNatsCreationConfig(i any) *function.CreateTriggerRequestMnqNatsClientConfig { + m := i.(map[string]any) return &function.CreateTriggerRequestMnqNatsClientConfig{ Subject: locality.ExpandID(m["subject"]), @@ -30,8 +30,8 @@ func expandFunctionTriggerMnqNatsCreationConfig(i interface{}) *function.CreateT } } -func completeFunctionTriggerMnqCreationConfig(i interface{}, d *schema.ResourceData, m interface{}, region scw.Region) error { - configMap := i.(map[string]interface{}) +func completeFunctionTriggerMnqCreationConfig(i any, d *schema.ResourceData, m any, region scw.Region) error { + configMap := i.(map[string]any) if sqsRegion, exists := configMap["region"]; !exists || sqsRegion == "" { configMap["region"] = region.String() diff --git a/internal/services/function/namespace.go b/internal/services/function/namespace.go index 43c8cdeba6..7202e85234 100644 --- a/internal/services/function/namespace.go +++ b/internal/services/function/namespace.go @@ -93,7 +93,7 @@ func ResourceNamespace() *schema.Resource { } } -func ResourceFunctionNamespaceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionNamespaceCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -128,7 +128,7 @@ func ResourceFunctionNamespaceCreate(ctx context.Context, d *schema.ResourceData return ResourceFunctionNamespaceRead(ctx, d, m) } -func ResourceFunctionNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionNamespaceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -159,7 +159,7 @@ func ResourceFunctionNamespaceRead(ctx context.Context, d *schema.ResourceData, return nil } -func ResourceFunctionNamespaceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionNamespaceUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -205,7 +205,7 @@ func ResourceFunctionNamespaceUpdate(ctx context.Context, d *schema.ResourceData return ResourceFunctionNamespaceRead(ctx, d, m) } -func ResourceFunctionNamespaceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionNamespaceDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/function/token.go b/internal/services/function/token.go index 1e563947d0..6dcbb20d73 100644 --- a/internal/services/function/token.go +++ b/internal/services/function/token.go @@ -66,7 +66,7 @@ func ResourceToken() *schema.Resource { } } -func ResourceFunctionTokenCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionTokenCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -90,7 +90,7 @@ func ResourceFunctionTokenCreate(ctx context.Context, d *schema.ResourceData, m return ResourceFunctionTokenRead(ctx, d, m) } -func ResourceFunctionTokenRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionTokenRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -118,7 +118,7 @@ func ResourceFunctionTokenRead(ctx context.Context, d *schema.ResourceData, m in return nil } -func ResourceFunctionTokenDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionTokenDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, ID, err := container.NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/function/trigger.go b/internal/services/function/trigger.go index e418feafda..76d344db98 100644 --- a/internal/services/function/trigger.go +++ b/internal/services/function/trigger.go @@ -136,7 +136,7 @@ func ResourceTrigger() *schema.Resource { } } -func ResourceFunctionTriggerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionTriggerCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -184,7 +184,7 @@ func ResourceFunctionTriggerCreate(ctx context.Context, d *schema.ResourceData, return ResourceFunctionTriggerRead(ctx, d, m) } -func ResourceFunctionTriggerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionTriggerRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -222,7 +222,7 @@ func ResourceFunctionTriggerRead(ctx context.Context, d *schema.ResourceData, m return diags } -func ResourceFunctionTriggerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionTriggerUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -259,7 +259,7 @@ func ResourceFunctionTriggerUpdate(ctx context.Context, d *schema.ResourceData, return ResourceFunctionTriggerRead(ctx, d, m) } -func ResourceFunctionTriggerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceFunctionTriggerDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/iam/api_key.go b/internal/services/iam/api_key.go index f2791a77f7..126ce20d18 100644 --- a/internal/services/iam/api_key.go +++ b/internal/services/iam/api_key.go @@ -89,7 +89,7 @@ func ResourceAPIKey() *schema.Resource { } } -func resourceIamAPIKeyCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamAPIKeyCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) res, err := api.CreateAPIKey(&iam.CreateAPIKeyRequest{ @@ -110,7 +110,7 @@ func resourceIamAPIKeyCreate(ctx context.Context, d *schema.ResourceData, m inte return resourceIamAPIKeyRead(ctx, d, m) } -func resourceIamAPIKeyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamAPIKeyRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) res, err := api.GetAPIKey(&iam.GetAPIKeyRequest{ @@ -147,7 +147,7 @@ func resourceIamAPIKeyRead(ctx context.Context, d *schema.ResourceData, m interf return nil } -func resourceIamAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) req := &iam.UpdateAPIKeyRequest{ @@ -176,7 +176,7 @@ func resourceIamAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, m inte return resourceIamAPIKeyRead(ctx, d, m) } -func resourceIamAPIKeyDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamAPIKeyDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) err := api.DeleteAPIKey(&iam.DeleteAPIKeyRequest{ diff --git a/internal/services/iam/api_key_data_source.go b/internal/services/iam/api_key_data_source.go index 46e72cc8f2..f5b8bcc31f 100644 --- a/internal/services/iam/api_key_data_source.go +++ b/internal/services/iam/api_key_data_source.go @@ -21,7 +21,7 @@ func DataSourceAPIKey() *schema.Resource { } } -func DataSourceIamAPIKeyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceIamAPIKeyRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { accessKey := d.Get("access_key").(string) d.SetId(accessKey) diff --git a/internal/services/iam/application.go b/internal/services/iam/application.go index 068030ffb9..d66dda43e3 100644 --- a/internal/services/iam/application.go +++ b/internal/services/iam/application.go @@ -62,7 +62,7 @@ func ResourceApplication() *schema.Resource { } } -func resourceIamApplicationCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamApplicationCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) app, err := api.CreateApplication(&iam.CreateApplicationRequest{ @@ -80,7 +80,7 @@ func resourceIamApplicationCreate(ctx context.Context, d *schema.ResourceData, m return resourceIamApplicationRead(ctx, d, m) } -func resourceIamApplicationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamApplicationRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) app, err := api.GetApplication(&iam.GetApplicationRequest{ @@ -107,7 +107,7 @@ func resourceIamApplicationRead(ctx context.Context, d *schema.ResourceData, m i return nil } -func resourceIamApplicationUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamApplicationUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) req := &iam.UpdateApplicationRequest{ @@ -141,7 +141,7 @@ func resourceIamApplicationUpdate(ctx context.Context, d *schema.ResourceData, m return resourceIamApplicationRead(ctx, d, m) } -func resourceIamApplicationDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamApplicationDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) err := api.DeleteApplication(&iam.DeleteApplicationRequest{ diff --git a/internal/services/iam/application_data_source.go b/internal/services/iam/application_data_source.go index 9e008dd6bd..9d5366289b 100644 --- a/internal/services/iam/application_data_source.go +++ b/internal/services/iam/application_data_source.go @@ -39,7 +39,7 @@ func DataSourceApplication() *schema.Resource { } } -func DataSourceIamApplicationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceIamApplicationRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) appID, appIDExists := d.GetOk("application_id") diff --git a/internal/services/iam/clients.go b/internal/services/iam/clients.go index 8991919fb6..165414c0d1 100644 --- a/internal/services/iam/clients.go +++ b/internal/services/iam/clients.go @@ -6,6 +6,6 @@ import ( ) // NewAPI returns a new iam API for a Create request -func NewAPI(m interface{}) *iam.API { +func NewAPI(m any) *iam.API { return iam.NewAPI(meta.ExtractScwClient(m)) } diff --git a/internal/services/iam/group.go b/internal/services/iam/group.go index 8ff3c3968c..293370f8e5 100644 --- a/internal/services/iam/group.go +++ b/internal/services/iam/group.go @@ -82,7 +82,7 @@ func ResourceGroup() *schema.Resource { } } -func resourceIamGroupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamGroupCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) req := &iam.CreateGroupRequest{ OrganizationID: d.Get("organization_id").(string), @@ -115,7 +115,7 @@ func resourceIamGroupCreate(ctx context.Context, d *schema.ResourceData, m inter return resourceIamGroupRead(ctx, d, m) } -func resourceIamGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamGroupRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) group, err := api.GetGroup(&iam.GetGroupRequest{ @@ -146,7 +146,7 @@ func resourceIamGroupRead(ctx context.Context, d *schema.ResourceData, m interfa return nil } -func resourceIamGroupUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamGroupUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) group, err := api.GetGroup(&iam.GetGroupRequest{ @@ -207,7 +207,7 @@ func resourceIamGroupUpdate(ctx context.Context, d *schema.ResourceData, m inter return resourceIamGroupRead(ctx, d, m) } -func resourceIamGroupDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamGroupDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) err := api.DeleteGroup(&iam.DeleteGroupRequest{ diff --git a/internal/services/iam/group_data_source.go b/internal/services/iam/group_data_source.go index 5dcd4ce67b..b052049b2f 100644 --- a/internal/services/iam/group_data_source.go +++ b/internal/services/iam/group_data_source.go @@ -39,7 +39,7 @@ func DataSourceGroup() *schema.Resource { } } -func DataSourceIamGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceIamGroupRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) groupID, groupIDExists := d.GetOk("group_id") diff --git a/internal/services/iam/group_membership.go b/internal/services/iam/group_membership.go index e3458dc407..cd730eb13d 100644 --- a/internal/services/iam/group_membership.go +++ b/internal/services/iam/group_membership.go @@ -47,7 +47,7 @@ func ResourceGroupMembership() *schema.Resource { } } -func resourceIamGroupMembershipCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamGroupMembershipCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) userID := types.ExpandStringPtr(d.Get("user_id")) @@ -67,7 +67,7 @@ func resourceIamGroupMembershipCreate(ctx context.Context, d *schema.ResourceDat return resourceIamGroupMembershipRead(ctx, d, m) } -func resourceIamGroupMembershipRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamGroupMembershipRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) groupID, userID, applicationID, err := ExpandGroupMembershipID(d.Id()) @@ -121,7 +121,7 @@ func resourceIamGroupMembershipRead(ctx context.Context, d *schema.ResourceData, return nil } -func resourceIamGroupMembershipDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamGroupMembershipDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) groupID, userID, applicationID, err := ExpandGroupMembershipID(d.Id()) diff --git a/internal/services/iam/policy.go b/internal/services/iam/policy.go index 473d21dd06..43fd24175e 100644 --- a/internal/services/iam/policy.go +++ b/internal/services/iam/policy.go @@ -128,7 +128,7 @@ func ResourcePolicy() *schema.Resource { } } -func resourceIamPolicyCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamPolicyCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) pol, err := api.CreatePolicy(&iam.CreatePolicyRequest{ @@ -151,7 +151,7 @@ func resourceIamPolicyCreate(ctx context.Context, d *schema.ResourceData, m inte return resourceIamPolicyRead(ctx, d, m) } -func resourceIamPolicyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamPolicyRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) pol, err := api.GetPolicy(&iam.GetPolicyRequest{ @@ -201,7 +201,7 @@ func resourceIamPolicyRead(ctx context.Context, d *schema.ResourceData, m interf return nil } -func resourceIamPolicyUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamPolicyUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) req := &iam.UpdatePolicyRequest{ @@ -265,7 +265,7 @@ func resourceIamPolicyUpdate(ctx context.Context, d *schema.ResourceData, m inte return resourceIamPolicyRead(ctx, d, m) } -func resourceIamPolicyDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamPolicyDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) err := api.DeletePolicy(&iam.DeletePolicyRequest{ diff --git a/internal/services/iam/ssh_key.go b/internal/services/iam/ssh_key.go index d39e2c978a..7818b27ebf 100644 --- a/internal/services/iam/ssh_key.go +++ b/internal/services/iam/ssh_key.go @@ -84,7 +84,7 @@ func ResourceSSKKey() *schema.Resource { } } -func resourceIamSSKKeyCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamSSKKeyCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) res, err := api.CreateSSHKey(&iam.CreateSSHKeyRequest{ @@ -111,7 +111,7 @@ func resourceIamSSKKeyCreate(ctx context.Context, d *schema.ResourceData, m inte return resourceIamSSHKeyRead(ctx, d, m) } -func resourceIamSSHKeyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamSSHKeyRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) res, err := api.GetSSHKey(&iam.GetSSHKeyRequest{ @@ -139,7 +139,7 @@ func resourceIamSSHKeyRead(ctx context.Context, d *schema.ResourceData, m interf return nil } -func resourceIamSSKKeyUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamSSKKeyUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) req := &iam.UpdateSSHKeyRequest{ @@ -183,7 +183,7 @@ func resourceIamSSKKeyUpdate(ctx context.Context, d *schema.ResourceData, m inte return resourceIamSSHKeyRead(ctx, d, m) } -func resourceIamSSKKeyDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamSSKKeyDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) err := api.DeleteSSHKey(&iam.DeleteSSHKeyRequest{ diff --git a/internal/services/iam/ssh_key_data_source.go b/internal/services/iam/ssh_key_data_source.go index cf1fba6394..975361f2bf 100644 --- a/internal/services/iam/ssh_key_data_source.go +++ b/internal/services/iam/ssh_key_data_source.go @@ -31,7 +31,7 @@ func DataSourceSSHKey() *schema.Resource { } } -func DataSourceIamSSHKeyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceIamSSHKeyRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iamAPI := NewAPI(m) sshKeyID, sshKeyIDExists := d.GetOk("ssh_key_id") diff --git a/internal/services/iam/types.go b/internal/services/iam/types.go index a9ecfa9106..7304511494 100644 --- a/internal/services/iam/types.go +++ b/internal/services/iam/types.go @@ -7,7 +7,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func expandPermissionSetNames(rawPermissions interface{}) *[]string { +func expandPermissionSetNames(rawPermissions any) *[]string { permissions := []string{} permissionSet := rawPermissions.(*schema.Set) @@ -19,22 +19,22 @@ func expandPermissionSetNames(rawPermissions interface{}) *[]string { } func flattenPermissionSetNames(permissions []string) *schema.Set { - rawPermissions := []interface{}(nil) + rawPermissions := []any(nil) for _, perm := range permissions { rawPermissions = append(rawPermissions, perm) } - return schema.NewSet(func(i interface{}) int { + return schema.NewSet(func(i any) int { return types.StringHashcode(i.(string)) }, rawPermissions) } -func expandPolicyRuleSpecs(d interface{}) []*iam.RuleSpecs { +func expandPolicyRuleSpecs(d any) []*iam.RuleSpecs { rules := []*iam.RuleSpecs(nil) - rawRules := d.([]interface{}) + rawRules := d.([]any) for _, rawRule := range rawRules { - mapRule := rawRule.(map[string]interface{}) + mapRule := rawRule.(map[string]any) rule := &iam.RuleSpecs{ PermissionSetNames: expandPermissionSetNames(mapRule["permission_set_names"]), Condition: mapRule["condition"].(string), @@ -54,11 +54,11 @@ func expandPolicyRuleSpecs(d interface{}) []*iam.RuleSpecs { return rules } -func flattenPolicyRules(rules []*iam.Rule) interface{} { - rawRules := []interface{}(nil) +func flattenPolicyRules(rules []*iam.Rule) any { + rawRules := []any(nil) for _, rule := range rules { - rawRule := map[string]interface{}{} + rawRule := map[string]any{} if rule.OrganizationID != nil { rawRule["organization_id"] = types.FlattenStringPtr(rule.OrganizationID) } else { diff --git a/internal/services/iam/user.go b/internal/services/iam/user.go index 953ff90257..69acaea51d 100644 --- a/internal/services/iam/user.go +++ b/internal/services/iam/user.go @@ -128,7 +128,7 @@ func ResourceUser() *schema.Resource { } } -func resourceIamUserCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamUserCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) req := &iam.CreateUserRequest{ @@ -157,7 +157,7 @@ func resourceIamUserCreate(ctx context.Context, d *schema.ResourceData, m interf return resourceIamUserRead(ctx, d, m) } -func resourceIamUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamUserRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) user, err := api.GetUser(&iam.GetUserRequest{ @@ -196,7 +196,7 @@ func resourceIamUserRead(ctx context.Context, d *schema.ResourceData, m interfac return nil } -func resourceIamUserUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamUserUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) user, err := api.GetUser(&iam.GetUserRequest{ @@ -238,7 +238,7 @@ func resourceIamUserUpdate(ctx context.Context, d *schema.ResourceData, m interf return resourceIamUserRead(ctx, d, m) } -func resourceIamUserDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceIamUserDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := NewAPI(m) err := api.DeleteUser(&iam.DeleteUserRequest{ diff --git a/internal/services/iam/user_data_source.go b/internal/services/iam/user_data_source.go index 8e744a73a7..5c882c0dd8 100644 --- a/internal/services/iam/user_data_source.go +++ b/internal/services/iam/user_data_source.go @@ -49,7 +49,7 @@ func DataSourceUser() *schema.Resource { } } -func DataSourceIamUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceIamUserRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iamAPI := NewAPI(m) var email, organizationID string diff --git a/internal/services/inference/deployment.go b/internal/services/inference/deployment.go index 8d478f2a29..9b2278ef82 100644 --- a/internal/services/inference/deployment.go +++ b/internal/services/inference/deployment.go @@ -203,7 +203,7 @@ func ResourceDeployment() *schema.Resource { } } -func ResourceDeploymentCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDeploymentCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := NewAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -256,7 +256,7 @@ func buildEndpoints(d *schema.ResourceData) []*inference.EndpointSpec { var endpoints []*inference.EndpointSpec if publicEndpoint, ok := d.GetOk("public_endpoint"); ok { - publicEndpointMap := publicEndpoint.([]interface{})[0].(map[string]interface{}) + publicEndpointMap := publicEndpoint.([]any)[0].(map[string]any) if publicEndpointMap["is_enabled"].(bool) { publicEp := inference.EndpointSpec{ PublicNetwork: &inference.EndpointPublicNetworkDetails{}, @@ -267,7 +267,7 @@ func buildEndpoints(d *schema.ResourceData) []*inference.EndpointSpec { } if privateEndpoint, ok := d.GetOk("private_endpoint"); ok { - privateEndpointMap := privateEndpoint.([]interface{})[0].(map[string]interface{}) + privateEndpointMap := privateEndpoint.([]any)[0].(map[string]any) if privateID, exists := privateEndpointMap["private_network_id"]; exists { privateEp := inference.EndpointSpec{ PrivateNetwork: &inference.EndpointPrivateNetworkDetails{ @@ -282,7 +282,7 @@ func buildEndpoints(d *schema.ResourceData) []*inference.EndpointSpec { return endpoints } -func ResourceDeploymentRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDeploymentRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -313,13 +313,13 @@ func ResourceDeploymentRead(ctx context.Context, d *schema.ResourceData, m inter _ = d.Set("created_at", types.FlattenTime(deployment.CreatedAt)) _ = d.Set("updated_at", types.FlattenTime(deployment.UpdatedAt)) - var privateEndpoints []map[string]interface{} + var privateEndpoints []map[string]any - var publicEndpoints []map[string]interface{} + var publicEndpoints []map[string]any for _, endpoint := range deployment.Endpoints { if endpoint.PrivateNetwork != nil { - privateEndpointSpec := map[string]interface{}{ + privateEndpointSpec := map[string]any{ "id": endpoint.ID, "private_network_id": regional.NewID(deployment.Region, endpoint.PrivateNetwork.PrivateNetworkID).String(), "disable_auth": endpoint.DisableAuth, @@ -329,7 +329,7 @@ func ResourceDeploymentRead(ctx context.Context, d *schema.ResourceData, m inter } if endpoint.PublicNetwork != nil { - publicEndpointSpec := map[string]interface{}{ + publicEndpointSpec := map[string]any{ "id": endpoint.ID, "is_enabled": true, "disable_auth": endpoint.DisableAuth, @@ -340,7 +340,7 @@ func ResourceDeploymentRead(ctx context.Context, d *schema.ResourceData, m inter } diags := diag.Diagnostics{} - privateIPs := []map[string]interface{}(nil) + privateIPs := []map[string]any(nil) authorized := true if privateEndpoints != nil { @@ -399,7 +399,7 @@ func ResourceDeploymentRead(ctx context.Context, d *schema.ResourceData, m inter return diags } -func ResourceDeploymentUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDeploymentUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -444,7 +444,7 @@ func ResourceDeploymentUpdate(ctx context.Context, d *schema.ResourceData, m int return ResourceDeploymentRead(ctx, d, m) } -func ResourceDeploymentDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDeploymentDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/inference/helpers_inference.go b/internal/services/inference/helpers_inference.go index 3db5b11f86..88fde23a8e 100644 --- a/internal/services/inference/helpers_inference.go +++ b/internal/services/inference/helpers_inference.go @@ -18,7 +18,7 @@ const ( ) // NewAPIWithRegion returns a new inference API and the region for a Create request -func NewAPIWithRegion(d *schema.ResourceData, m interface{}) (*inference.API, scw.Region, error) { +func NewAPIWithRegion(d *schema.ResourceData, m any) (*inference.API, scw.Region, error) { inferenceAPI := inference.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -30,7 +30,7 @@ func NewAPIWithRegion(d *schema.ResourceData, m interface{}) (*inference.API, sc } // NewAPIWithRegionAndID returns a new inference API with region and ID extracted from the state -func NewAPIWithRegionAndID(m interface{}, regionalID string) (*inference.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, regionalID string) (*inference.API, scw.Region, string, error) { inferenceAPI := inference.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionalID) diff --git a/internal/services/inference/model.go b/internal/services/inference/model.go index a0371d660c..3fa25013f2 100644 --- a/internal/services/inference/model.go +++ b/internal/services/inference/model.go @@ -135,7 +135,7 @@ func ResourceModel() *schema.Resource { } } -func ResourceModelCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceModelCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := NewAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -177,7 +177,7 @@ func ResourceModelCreate(ctx context.Context, d *schema.ResourceData, m interfac return ResourceModelRead(ctx, d, m) } -func ResourceModelRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceModelRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -208,7 +208,7 @@ func ResourceModelRead(ctx context.Context, d *schema.ResourceData, m interface{ return nil } -func ResourceModelDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceModelDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/inference/model_data_source.go b/internal/services/inference/model_data_source.go index f77e647f50..a1c5454f62 100644 --- a/internal/services/inference/model_data_source.go +++ b/internal/services/inference/model_data_source.go @@ -32,7 +32,7 @@ func DataSourceModel() *schema.Resource { } } -func DataSourceModelRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceModelRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := NewAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/inference/types.go b/internal/services/inference/types.go index b7f6842bab..29229c0f32 100644 --- a/internal/services/inference/types.go +++ b/internal/services/inference/types.go @@ -2,12 +2,12 @@ package inference import "github.com/scaleway/scaleway-sdk-go/api/inference/v1" -func flattenNodeSupport(nodesSupportInfo []*inference.ModelSupportInfo) []interface{} { +func flattenNodeSupport(nodesSupportInfo []*inference.ModelSupportInfo) []any { if len(nodesSupportInfo) == 0 { return nil } - var result []interface{} + var result []any for _, nodeSupport := range nodesSupportInfo { if nodeSupport == nil { @@ -15,21 +15,21 @@ func flattenNodeSupport(nodesSupportInfo []*inference.ModelSupportInfo) []interf } for _, node := range nodeSupport.Nodes { - flattenQuantization := make([]interface{}, 0, len(node.Quantizations)) + flattenQuantization := make([]any, 0, len(node.Quantizations)) for _, quantization := range node.Quantizations { if quantization == nil { continue } - flattenQuantization = append(flattenQuantization, map[string]interface{}{ + flattenQuantization = append(flattenQuantization, map[string]any{ "quantization_bits": quantization.QuantizationBits, "allowed": quantization.Allowed, "max_context_size": quantization.MaxContextSize, }) } - result = append(result, map[string]interface{}{ + result = append(result, map[string]any{ "node_type_name": node.NodeTypeName, "quantization": flattenQuantization, }) diff --git a/internal/services/instance/data_source_instance_private_nic.go b/internal/services/instance/data_source_instance_private_nic.go index 9ee1758690..221475d574 100644 --- a/internal/services/instance/data_source_instance_private_nic.go +++ b/internal/services/instance/data_source_instance_private_nic.go @@ -39,7 +39,7 @@ func DataSourcePrivateNIC() *schema.Resource { } } -func DataSourceInstancePrivateNICRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceInstancePrivateNICRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/helpers_instance.go b/internal/services/instance/helpers_instance.go index 0b79c0dbce..e9d2ad9a2e 100644 --- a/internal/services/instance/helpers_instance.go +++ b/internal/services/instance/helpers_instance.go @@ -48,7 +48,7 @@ const ( ) // newAPIWithZone returns a new instance API and the zone for a Create request -func newAPIWithZone(d *schema.ResourceData, m interface{}) (*instance.API, scw.Zone, error) { +func newAPIWithZone(d *schema.ResourceData, m any) (*instance.API, scw.Zone, error) { instanceAPI := instance.NewAPI(meta.ExtractScwClient(m)) zone, err := meta.ExtractZone(d, m) @@ -60,7 +60,7 @@ func newAPIWithZone(d *schema.ResourceData, m interface{}) (*instance.API, scw.Z } // NewAPIWithZoneAndID returns an instance API with zone and ID extracted from the state -func NewAPIWithZoneAndID(m interface{}, zonedID string) (*instance.API, scw.Zone, string, error) { +func NewAPIWithZoneAndID(m any, zonedID string) (*instance.API, scw.Zone, string, error) { instanceAPI := instance.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(zonedID) @@ -72,7 +72,7 @@ func NewAPIWithZoneAndID(m interface{}, zonedID string) (*instance.API, scw.Zone } // NewAPIWithZoneAndNestedID returns an instance API with zone and inner/outer ID extracted from the state -func NewAPIWithZoneAndNestedID(m interface{}, zonedNestedID string) (*instance.API, scw.Zone, string, string, error) { +func NewAPIWithZoneAndNestedID(m any, zonedNestedID string) (*instance.API, scw.Zone, string, string, error) { instanceAPI := instance.NewAPI(meta.ExtractScwClient(m)) zone, innerID, outerID, err := zonal.ParseNestedID(zonedNestedID) @@ -268,7 +268,7 @@ func validateLocalVolumeSizes(volumes map[string]*instance.VolumeServerTemplate, } func preparePrivateNIC( - ctx context.Context, data interface{}, + ctx context.Context, data any, server *instance.Server, vpcAPI *vpc.API, ) ([]*instance.CreatePrivateNICRequest, error) { if data == nil { @@ -277,8 +277,8 @@ func preparePrivateNIC( var res []*instance.CreatePrivateNICRequest - for _, pn := range data.([]interface{}) { - r := pn.(map[string]interface{}) + for _, pn := range data.([]any) { + r := pn.(map[string]any) zonedID, pnExist := r["pn_id"] privateNetworkID := locality.ExpandID(zonedID.(string)) @@ -325,7 +325,7 @@ func newPrivateNICHandler(api *instance.API, server string, zone scw.Zone) (*pri return handler, handler.flatPrivateNICs() } -func (ph *privateNICsHandler) detach(ctx context.Context, o interface{}, timeout time.Duration) error { +func (ph *privateNICsHandler) detach(ctx context.Context, o any, timeout time.Duration) error { oPtr := types.ExpandStringPtr(o) if oPtr != nil && len(*oPtr) > 0 { idPN := locality.ExpandID(*oPtr) @@ -362,7 +362,7 @@ func (ph *privateNICsHandler) detach(ctx context.Context, o interface{}, timeout return nil } -func (ph *privateNICsHandler) attach(ctx context.Context, n interface{}, timeout time.Duration) error { +func (ph *privateNICsHandler) attach(ctx context.Context, n any, timeout time.Duration) error { if nPtr := types.ExpandStringPtr(n); nPtr != nil { // check if new private network was already attached on instance server privateNetworkID := locality.ExpandID(*nPtr) @@ -393,9 +393,9 @@ func (ph *privateNICsHandler) attach(ctx context.Context, n interface{}, timeout func (ph *privateNICsHandler) set(d *schema.ResourceData) error { raw := d.Get("private_network") - privateNetworks := []map[string]interface{}(nil) + privateNetworks := []map[string]any(nil) - for index := range raw.([]interface{}) { + for index := range raw.([]any) { pnKey := fmt.Sprintf("private_network.%d.pn_id", index) keyValue := d.Get(pnKey) @@ -404,13 +404,13 @@ func (ph *privateNICsHandler) set(d *schema.ResourceData) error { continue } - privateNetworks = append(privateNetworks, keyRaw.(map[string]interface{})) + privateNetworks = append(privateNetworks, keyRaw.(map[string]any)) } return d.Set("private_network", privateNetworks) } -func (ph *privateNICsHandler) get(key string) (interface{}, error) { +func (ph *privateNICsHandler) get(key string) (any, error) { loc, id, err := locality.ParseLocalizedID(key) if err != nil { return nil, err @@ -421,7 +421,7 @@ func (ph *privateNICsHandler) get(key string) (interface{}, error) { return nil, fmt.Errorf("could not find private network ID %s on locality %s", key, loc) } - return map[string]interface{}{ + return map[string]any{ "pn_id": key, "mac_address": pn.MacAddress, "status": pn.State.String(), diff --git a/internal/services/instance/image.go b/internal/services/instance/image.go index 11bd3283e4..c6273f0891 100644 --- a/internal/services/instance/image.go +++ b/internal/services/instance/image.go @@ -177,7 +177,7 @@ func ResourceImage() *schema.Resource { } } -func ResourceInstanceImageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceImageCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := instancehelpers.InstanceAndBlockAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -226,7 +226,7 @@ func ResourceInstanceImageCreate(ctx context.Context, d *schema.ResourceData, m return ResourceInstanceImageRead(ctx, d, m) } -func ResourceInstanceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceImageRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -263,7 +263,7 @@ func ResourceInstanceImageRead(ctx context.Context, d *schema.ResourceData, m in return nil } -func ResourceInstanceImageUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceImageUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := instancehelpers.InstanceAndBlockAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -336,7 +336,7 @@ func ResourceInstanceImageUpdate(ctx context.Context, d *schema.ResourceData, m return ResourceInstanceImageRead(ctx, d, m) } -func ResourceInstanceImageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceImageDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/image_data_source.go b/internal/services/instance/image_data_source.go index 56560d25bf..1ddc972dee 100644 --- a/internal/services/instance/image_data_source.go +++ b/internal/services/instance/image_data_source.go @@ -97,7 +97,7 @@ func DataSourceImage() *schema.Resource { } } -func DataSourceInstanceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceInstanceImageRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/instancehelpers/block.go b/internal/services/instance/instancehelpers/block.go index 9103b24afd..ea81b8992b 100644 --- a/internal/services/instance/instancehelpers/block.go +++ b/internal/services/instance/instancehelpers/block.go @@ -12,7 +12,7 @@ import ( ) // InstanceAndBlockAPIWithZone returns a new instance API and the zone for a Create request -func InstanceAndBlockAPIWithZone(d *schema.ResourceData, m interface{}) (*BlockAndInstanceAPI, scw.Zone, error) { +func InstanceAndBlockAPIWithZone(d *schema.ResourceData, m any) (*BlockAndInstanceAPI, scw.Zone, error) { zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err @@ -22,7 +22,7 @@ func InstanceAndBlockAPIWithZone(d *schema.ResourceData, m interface{}) (*BlockA } // InstanceAndBlockAPIWithZoneAndID returns an instance API with zone and ID extracted from the state -func InstanceAndBlockAPIWithZoneAndID(m interface{}, zonedID string) (*BlockAndInstanceAPI, scw.Zone, string, error) { +func InstanceAndBlockAPIWithZoneAndID(m any, zonedID string) (*BlockAndInstanceAPI, scw.Zone, string, error) { zone, ID, err := zonal.ParseID(zonedID) if err != nil { return nil, "", "", err diff --git a/internal/services/instance/ip.go b/internal/services/instance/ip.go index 66c7a6a7f9..fa372b5f83 100644 --- a/internal/services/instance/ip.go +++ b/internal/services/instance/ip.go @@ -71,7 +71,7 @@ func ResourceIP() *schema.Resource { } } -func ResourceInstanceIPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceIPCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -113,7 +113,7 @@ func ResourceInstanceIPCreate(ctx context.Context, d *schema.ResourceData, m int return ResourceInstanceIPRead(ctx, d, m) } -func ResourceInstanceIPUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceIPUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -136,7 +136,7 @@ func ResourceInstanceIPUpdate(ctx context.Context, d *schema.ResourceData, m int return ResourceInstanceIPRead(ctx, d, m) } -func ResourceInstanceIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceIPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -191,7 +191,7 @@ func ResourceInstanceIPRead(ctx context.Context, d *schema.ResourceData, m inter return nil } -func ResourceInstanceIPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceIPDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/ip_data_source.go b/internal/services/instance/ip_data_source.go index a522f7c8ba..83825c857b 100644 --- a/internal/services/instance/ip_data_source.go +++ b/internal/services/instance/ip_data_source.go @@ -41,7 +41,7 @@ func DataSourceIP() *schema.Resource { } } -func DataSourceInstanceIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceInstanceIPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/ip_reverse_dns.go b/internal/services/instance/ip_reverse_dns.go index 100cfc0b22..9e29a83565 100644 --- a/internal/services/instance/ip_reverse_dns.go +++ b/internal/services/instance/ip_reverse_dns.go @@ -47,7 +47,7 @@ func ResourceIPReverseDNS() *schema.Resource { } } -func ResourceInstanceIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -86,7 +86,7 @@ func ResourceInstanceIPReverseDNSCreate(ctx context.Context, d *schema.ResourceD return ResourceInstanceIPReverseDNSRead(ctx, d, m) } -func ResourceInstanceIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -113,7 +113,7 @@ func ResourceInstanceIPReverseDNSRead(ctx context.Context, d *schema.ResourceDat return nil } -func ResourceInstanceIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -142,7 +142,7 @@ func ResourceInstanceIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceD return ResourceInstanceIPReverseDNSRead(ctx, d, m) } -func ResourceInstanceIPReverseDNSDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceIPReverseDNSDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/placement_group.go b/internal/services/instance/placement_group.go index 91cf80a98e..7307f848f6 100644 --- a/internal/services/instance/placement_group.go +++ b/internal/services/instance/placement_group.go @@ -68,7 +68,7 @@ func ResourcePlacementGroup() *schema.Resource { } } -func ResourceInstancePlacementGroupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstancePlacementGroupCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -91,7 +91,7 @@ func ResourceInstancePlacementGroupCreate(ctx context.Context, d *schema.Resourc return ResourceInstancePlacementGroupRead(ctx, d, m) } -func ResourceInstancePlacementGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstancePlacementGroupRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -123,7 +123,7 @@ func ResourceInstancePlacementGroupRead(ctx context.Context, d *schema.ResourceD return nil } -func ResourceInstancePlacementGroupUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstancePlacementGroupUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -169,7 +169,7 @@ func ResourceInstancePlacementGroupUpdate(ctx context.Context, d *schema.Resourc return ResourceInstancePlacementGroupRead(ctx, d, m) } -func ResourceInstancePlacementGroupDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstancePlacementGroupDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/placement_group_data_source.go b/internal/services/instance/placement_group_data_source.go index 02497d9b40..1c17c25531 100644 --- a/internal/services/instance/placement_group_data_source.go +++ b/internal/services/instance/placement_group_data_source.go @@ -32,7 +32,7 @@ func DataSourcePlacementGroup() *schema.Resource { } } -func DataSourcePlacementGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourcePlacementGroupRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/private_nic.go b/internal/services/instance/private_nic.go index 8f2062b649..400f18cd27 100644 --- a/internal/services/instance/private_nic.go +++ b/internal/services/instance/private_nic.go @@ -107,7 +107,7 @@ func ResourcePrivateNIC() *schema.Resource { } } -func ResourceInstancePrivateNICCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstancePrivateNICCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -151,7 +151,7 @@ func ResourceInstancePrivateNICCreate(ctx context.Context, d *schema.ResourceDat return ResourceInstancePrivateNICRead(ctx, d, m) } -func ResourceInstancePrivateNICRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstancePrivateNICRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, _, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -240,7 +240,7 @@ func ResourceInstancePrivateNICRead(ctx context.Context, d *schema.ResourceData, return diags } -func ResourceInstancePrivateNICUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstancePrivateNICUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, _, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -269,7 +269,7 @@ func ResourceInstancePrivateNICUpdate(ctx context.Context, d *schema.ResourceDat return ResourceInstancePrivateNICRead(ctx, d, m) } -func ResourceInstancePrivateNICDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstancePrivateNICDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, _, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/security_group.go b/internal/services/instance/security_group.go index de07572ac2..6e44c34574 100644 --- a/internal/services/instance/security_group.go +++ b/internal/services/instance/security_group.go @@ -103,7 +103,7 @@ func ResourceSecurityGroup() *schema.Resource { } } -func ResourceInstanceSecurityGroupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceSecurityGroupCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -139,7 +139,7 @@ func ResourceInstanceSecurityGroupCreate(ctx context.Context, d *schema.Resource return ResourceInstanceSecurityGroupUpdate(ctx, d, m) } -func ResourceInstanceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -183,7 +183,7 @@ func ResourceInstanceSecurityGroupRead(ctx context.Context, d *schema.ResourceDa return nil } -func getSecurityGroupRules(ctx context.Context, instanceAPI *instanceSDK.API, zone scw.Zone, securityGroupID string, d *schema.ResourceData) ([]interface{}, []interface{}, error) { +func getSecurityGroupRules(ctx context.Context, instanceAPI *instanceSDK.API, zone scw.Zone, securityGroupID string, d *schema.ResourceData) ([]any, []any, error) { resRules, err := instanceAPI.ListSecurityGroupRules(&instanceSDK.ListSecurityGroupRulesRequest{ Zone: zone, SecurityGroupID: locality.ExpandID(securityGroupID), @@ -201,9 +201,9 @@ func getSecurityGroupRules(ctx context.Context, instanceAPI *instanceSDK.API, zo instanceSDK.SecurityGroupRuleDirectionOutbound: {}, } - stateRules := map[instanceSDK.SecurityGroupRuleDirection][]interface{}{ - instanceSDK.SecurityGroupRuleDirectionInbound: d.Get("inbound_rule").([]interface{}), - instanceSDK.SecurityGroupRuleDirectionOutbound: d.Get("outbound_rule").([]interface{}), + stateRules := map[instanceSDK.SecurityGroupRuleDirection][]any{ + instanceSDK.SecurityGroupRuleDirectionInbound: d.Get("inbound_rule").([]any), + instanceSDK.SecurityGroupRuleDirectionOutbound: d.Get("outbound_rule").([]any), } for _, apiRule := range resRules.Rules { @@ -248,7 +248,7 @@ func getSecurityGroupRules(ctx context.Context, instanceAPI *instanceSDK.API, zo return stateRules[instanceSDK.SecurityGroupRuleDirectionInbound], stateRules[instanceSDK.SecurityGroupRuleDirectionOutbound], nil } -func ResourceInstanceSecurityGroupUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceSecurityGroupUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, _, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -315,9 +315,9 @@ func ResourceInstanceSecurityGroupUpdate(ctx context.Context, d *schema.Resource // updateSecurityGroupeRules handles updating SecurityGroupRules func updateSecurityGroupeRules(ctx context.Context, d *schema.ResourceData, zone scw.Zone, securityGroupID string, instanceAPI *instanceSDK.API) error { - stateRules := map[instanceSDK.SecurityGroupRuleDirection][]interface{}{ - instanceSDK.SecurityGroupRuleDirectionInbound: d.Get("inbound_rule").([]interface{}), - instanceSDK.SecurityGroupRuleDirectionOutbound: d.Get("outbound_rule").([]interface{}), + stateRules := map[instanceSDK.SecurityGroupRuleDirection][]any{ + instanceSDK.SecurityGroupRuleDirectionInbound: d.Get("inbound_rule").([]any), + instanceSDK.SecurityGroupRuleDirectionOutbound: d.Get("outbound_rule").([]any), } setGroupRules := []*instanceSDK.SetSecurityGroupRulesRequestRule{} @@ -355,7 +355,7 @@ func updateSecurityGroupeRules(ctx context.Context, d *schema.ResourceData, zone return nil } -func ResourceInstanceSecurityGroupDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceSecurityGroupDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, _, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -423,8 +423,8 @@ func securityGroupRuleSchema() *schema.Resource { } // securityGroupRuleExpand transform a state rule to an api one. -func securityGroupRuleExpand(i interface{}) (*instanceSDK.SecurityGroupRule, error) { - rawRule := i.(map[string]interface{}) +func securityGroupRuleExpand(i any) (*instanceSDK.SecurityGroupRule, error) { + rawRule := i.(map[string]any) portFrom, portTo := uint32(0), uint32(0) @@ -474,7 +474,7 @@ func securityGroupRuleExpand(i interface{}) (*instanceSDK.SecurityGroupRule, err } // securityGroupRuleFlatten transform an api rule to a state one. -func securityGroupRuleFlatten(rule *instanceSDK.SecurityGroupRule) (map[string]interface{}, error) { +func securityGroupRuleFlatten(rule *instanceSDK.SecurityGroupRule) (map[string]any, error) { portFrom, portTo := uint32(0), uint32(0) if rule.DestPortFrom != nil { @@ -490,7 +490,7 @@ func securityGroupRuleFlatten(rule *instanceSDK.SecurityGroupRule) (map[string]i return nil, err } - res := map[string]interface{}{ + res := map[string]any{ "protocol": rule.Protocol.String(), "ip_range": ipnetRange, "port_range": fmt.Sprintf("%d-%d", portFrom, portTo), diff --git a/internal/services/instance/security_group_data_source.go b/internal/services/instance/security_group_data_source.go index 2befd3e23f..1af5fa9bf8 100644 --- a/internal/services/instance/security_group_data_source.go +++ b/internal/services/instance/security_group_data_source.go @@ -35,7 +35,7 @@ func DataSourceSecurityGroup() *schema.Resource { } } -func DataSourceInstanceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceInstanceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/security_group_rules.go b/internal/services/instance/security_group_rules.go index 7d6d9b0c98..ab9c943588 100644 --- a/internal/services/instance/security_group_rules.go +++ b/internal/services/instance/security_group_rules.go @@ -45,14 +45,14 @@ func ResourceSecurityGroupRules() *schema.Resource { } } -func ResourceInstanceSecurityGroupRulesCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceSecurityGroupRulesCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { d.SetId(d.Get("security_group_id").(string)) // We call update instead of read as it will take care of creating rules. return ResourceInstanceSecurityGroupRulesUpdate(ctx, d, m) } -func ResourceInstanceSecurityGroupRulesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceSecurityGroupRulesRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { securityGroupZonedID := d.Id() instanceAPI, zone, securityGroupID, err := NewAPIWithZoneAndID(m, securityGroupZonedID) @@ -79,7 +79,7 @@ func ResourceInstanceSecurityGroupRulesRead(ctx context.Context, d *schema.Resou return nil } -func ResourceInstanceSecurityGroupRulesUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceSecurityGroupRulesUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { securityGroupZonedID := d.Id() instanceAPI, zone, securityGroupID, err := NewAPIWithZoneAndID(m, securityGroupZonedID) @@ -95,7 +95,7 @@ func ResourceInstanceSecurityGroupRulesUpdate(ctx context.Context, d *schema.Res return ResourceInstanceSecurityGroupRulesRead(ctx, d, m) } -func ResourceInstanceSecurityGroupRulesDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceSecurityGroupRulesDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { securityGroupZonedID := d.Id() instanceAPI, zone, securityGroupID, err := NewAPIWithZoneAndID(m, securityGroupZonedID) diff --git a/internal/services/instance/server.go b/internal/services/instance/server.go index 15261e2dd6..ebba13d059 100644 --- a/internal/services/instance/server.go +++ b/internal/services/instance/server.go @@ -138,7 +138,7 @@ func ResourceServer() *schema.Resource { Computed: true, ForceNew: true, Description: "Volume type of the root volume", - ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics { + ValidateDiagFunc: func(i any, path cty.Path) diag.Diagnostics { diags := verify.ValidateEnum[instanceSDK.VolumeVolumeType]()(i, path) if i.(string) == "b_ssd" { diags = append(diags, diag.Diagnostic{ @@ -390,7 +390,7 @@ func ResourceServer() *schema.Resource { } //gocyclo:ignore -func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := instancehelpers.InstanceAndBlockAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -453,7 +453,7 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m req.Volumes["0"] = prepareRootVolume(rootVolume, serverType, imageUUID).VolumeTemplate() if raw, ok := d.GetOk("additional_volume_ids"); ok { - for i, volumeID := range raw.([]interface{}) { + for i, volumeID := range raw.([]any) { // We have to get the volume to know whether it is a local or a block volume volumeTemplate, err := instanceServerAdditionalVolumeTemplate(api, zone, volumeID.(string)) if err != nil { @@ -526,7 +526,7 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m } if rawUserData, ok := d.GetOk("user_data"); ok { - for key, value := range rawUserData.(map[string]interface{}) { + for key, value := range rawUserData.(map[string]any) { userDataRequests.UserData[key] = bytes.NewBufferString(value.(string)) } } @@ -605,7 +605,7 @@ func errorCheck(err error, message string) bool { } //gocyclo:ignore -func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := instancehelpers.InstanceAndBlockAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -688,13 +688,13 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i if len(server.PublicIPs) > 0 { _ = d.Set("public_ips", flattenServerPublicIPs(server.Zone, server.PublicIPs)) } else { - _ = d.Set("public_ips", []interface{}{}) + _ = d.Set("public_ips", []any{}) } if _, hasIPIDs := d.GetOk("ip_ids"); hasIPIDs { _ = d.Set("ip_ids", flattenServerIPIDs(server.PublicIPs)) } else { - _ = d.Set("ip_ids", []interface{}{}) + _ = d.Set("ip_ids", []any{}) } if server.IPv6 != nil { //nolint:staticcheck @@ -717,9 +717,9 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i for i, serverVolume := range sortVolumeServer(server.Volumes) { if i == 0 { - rootVolume := map[string]interface{}{} + rootVolume := map[string]any{} - vs, ok := d.Get("root_volume").([]map[string]interface{}) + vs, ok := d.Get("root_volume").([]map[string]any) if ok && len(vs) > 0 { rootVolume = vs[0] } @@ -749,7 +749,7 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i rootVolume["boot"] = serverVolume.Boot rootVolume["name"] = serverVolume.Name - _ = d.Set("root_volume", []map[string]interface{}{rootVolume}) + _ = d.Set("root_volume", []map[string]any{rootVolume}) } else { additionalVolumesIDs = append(additionalVolumesIDs, zonal.NewID(zone, serverVolume.ID).String()) } @@ -768,7 +768,7 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i ServerID: id, }, scw.WithContext(ctx)) - userData := make(map[string]interface{}) + userData := make(map[string]any) for key, value := range allUserData.UserData { userDataValue, err := io.ReadAll(value) @@ -836,7 +836,7 @@ You can check the full list of compatible server types: } // Read server's private IPs if possible - allPrivateIPs := []map[string]interface{}(nil) + allPrivateIPs := []map[string]any(nil) resourceType := ipamAPI.ResourceTypeInstancePrivateNic region, err := zone.Region() @@ -883,7 +883,7 @@ You can check the full list of compatible server types: } //gocyclo:ignore -func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := instancehelpers.InstanceAndBlockAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -1045,7 +1045,7 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m } if allUserData, ok := d.GetOk("user_data"); ok { - userDataMap := allUserData.(map[string]interface{}) + userDataMap := allUserData.(map[string]any) for key, value := range userDataMap { userDataRequests.UserData[key] = bytes.NewBufferString(value.(string)) } @@ -1080,7 +1080,7 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m if raw, ok := d.GetOk("private_network"); ok { // retrieve all current private network interfaces - for index := range raw.([]interface{}) { + for index := range raw.([]any) { pnKey := fmt.Sprintf("private_network.%d.pn_id", index) if d.HasChange(pnKey) { o, n := d.GetChange(pnKey) @@ -1105,8 +1105,8 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m } else { // retrieve old private network config o, _ := d.GetChange("private_network") - for _, raw := range o.([]interface{}) { - pn, pnExist := raw.(map[string]interface{}) + for _, raw := range o.([]any) { + pn, pnExist := raw.(map[string]any) if pnExist { _, err := waitForServer(ctx, api.API, zone, id, d.Timeout(schema.TimeoutUpdate)) if err != nil { @@ -1163,7 +1163,7 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m return append(warnings, ResourceInstanceServerRead(ctx, d, m)...) } -func ResourceInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := instancehelpers.InstanceAndBlockAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -1207,7 +1207,7 @@ func ResourceInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m return diag.FromErr(err) } - for index := range raw.([]interface{}) { + for index := range raw.([]any) { pnKey := fmt.Sprintf("private_network.%d.pn_id", index) pn := d.Get(pnKey) @@ -1285,7 +1285,7 @@ func instanceServerCanMigrate(api *instanceSDK.API, server *instanceSDK.Server, return nil } -func customDiffInstanceRootVolumeSize(_ context.Context, diff *schema.ResourceDiff, meta interface{}) error { +func customDiffInstanceRootVolumeSize(_ context.Context, diff *schema.ResourceDiff, meta any) error { if !diff.HasChange("root_volume.0.size_in_gb") || diff.Id() == "" { return nil } @@ -1312,7 +1312,7 @@ func customDiffInstanceRootVolumeSize(_ context.Context, diff *schema.ResourceDi return nil } -func customDiffInstanceServerType(_ context.Context, diff *schema.ResourceDiff, meta interface{}) error { +func customDiffInstanceServerType(_ context.Context, diff *schema.ResourceDiff, meta any) error { if !diff.HasChange("type") || diff.Id() == "" { return nil } @@ -1345,7 +1345,7 @@ func customDiffInstanceServerType(_ context.Context, diff *schema.ResourceDiff, return nil } -func customDiffInstanceServerImage(ctx context.Context, diff *schema.ResourceDiff, m interface{}) error { +func customDiffInstanceServerImage(ctx context.Context, diff *schema.ResourceDiff, m any) error { if diff.Get("image") == "" || !diff.HasChange("image") || diff.Id() == "" { return nil } @@ -1440,7 +1440,7 @@ func ResourceInstanceServerUpdateIPs(ctx context.Context, d *schema.ResourceData return err } - schemaIPs := d.Get("ip_ids").([]interface{}) + schemaIPs := d.Get("ip_ids").([]any) requestedIPs := make(map[string]bool, len(schemaIPs)) // Gather request IPs in a map @@ -1548,10 +1548,10 @@ func instanceServerVolumesUpdate(ctx context.Context, d *schema.ResourceData, ap } if !hasAdditionalVolumes { - raw = []interface{}{} // Set an empty list if not volumes exist + raw = []any{} // Set an empty list if not volumes exist } - for i, volumeID := range raw.([]interface{}) { + for i, volumeID := range raw.([]any) { volumeHasChange := d.HasChange("additional_volume_ids." + strconv.Itoa(i)) volume, err := api.GetUnknownVolume(&instancehelpers.GetUnknownVolumeRequest{ diff --git a/internal/services/instance/server_data_source.go b/internal/services/instance/server_data_source.go index c40517a362..8da98796c9 100644 --- a/internal/services/instance/server_data_source.go +++ b/internal/services/instance/server_data_source.go @@ -35,7 +35,7 @@ func DataSourceServer() *schema.Resource { } } -func DataSourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/servers_data_source.go b/internal/services/instance/servers_data_source.go index 19767e5ee5..e0c9aa26c3 100644 --- a/internal/services/instance/servers_data_source.go +++ b/internal/services/instance/servers_data_source.go @@ -142,7 +142,7 @@ func DataSourceServers() *schema.Resource { } } -func DataSourceInstanceServersRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceInstanceServersRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -160,10 +160,10 @@ func DataSourceInstanceServersRead(ctx context.Context, d *schema.ResourceData, var diags diag.Diagnostics - servers := []interface{}(nil) + servers := []any(nil) for _, server := range res.Servers { - rawServer := make(map[string]interface{}) + rawServer := make(map[string]any) rawServer["id"] = zonal.NewID(server.Zone, server.ID).String() if server.PublicIP != nil { //nolint:staticcheck diff --git a/internal/services/instance/snapshot.go b/internal/services/instance/snapshot.go index 0b5614e0ab..ad9235506f 100644 --- a/internal/services/instance/snapshot.go +++ b/internal/services/instance/snapshot.go @@ -84,7 +84,7 @@ func ResourceSnapshot() *schema.Resource { ForceNew: true, Description: "Bucket containing qcow", DiffSuppressFunc: dsf.Locality, - StateFunc: func(i interface{}) string { + StateFunc: func(i any) string { return regional.ExpandID(i.(string)).ID }, }, @@ -113,7 +113,7 @@ func ResourceSnapshot() *schema.Resource { } } -func ResourceInstanceSnapshotCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceSnapshotCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -166,7 +166,7 @@ func ResourceInstanceSnapshotCreate(ctx context.Context, d *schema.ResourceData, return ResourceInstanceSnapshotRead(ctx, d, m) } -func ResourceInstanceSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceSnapshotRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -199,7 +199,7 @@ func ResourceInstanceSnapshotRead(ctx context.Context, d *schema.ResourceData, m return nil } -func ResourceInstanceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -225,7 +225,7 @@ func ResourceInstanceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, return ResourceInstanceSnapshotRead(ctx, d, m) } -func ResourceInstanceSnapshotDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceSnapshotDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/snapshot_data_source.go b/internal/services/instance/snapshot_data_source.go index 318aa0dbab..2f23782ff7 100644 --- a/internal/services/instance/snapshot_data_source.go +++ b/internal/services/instance/snapshot_data_source.go @@ -34,7 +34,7 @@ func DataSourceSnapshot() *schema.Resource { } } -func DataSourceInstanceSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceInstanceSnapshotRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/types.go b/internal/services/instance/types.go index b4e8d1d554..7afb3f6d67 100644 --- a/internal/services/instance/types.go +++ b/internal/services/instance/types.go @@ -57,17 +57,17 @@ func expandImageExtraVolumesUpdateTemplates(snapshotIDs []string) map[string]*in return volTemplates } -func flattenImageExtraVolumes(volumes map[string]*instance.Volume, zone scw.Zone) interface{} { - volumesFlat := []map[string]interface{}(nil) +func flattenImageExtraVolumes(volumes map[string]*instance.Volume, zone scw.Zone) any { + volumesFlat := []map[string]any(nil) for _, volume := range volumes { - server := map[string]interface{}{} + server := map[string]any{} if volume.Server != nil { server["id"] = volume.Server.ID server["name"] = volume.Server.Name } - volumeFlat := map[string]interface{}{ + volumeFlat := map[string]any{ "id": zonal.NewIDString(zone, volume.ID), "name": volume.Name, "export_uri": volume.ExportURI, //nolint:staticcheck @@ -88,11 +88,11 @@ func flattenImageExtraVolumes(volumes map[string]*instance.Volume, zone scw.Zone return volumesFlat } -func flattenServerPublicIPs(zone scw.Zone, ips []*instance.ServerIP) []interface{} { - flattenedIPs := make([]interface{}, len(ips)) +func flattenServerPublicIPs(zone scw.Zone, ips []*instance.ServerIP) []any { + flattenedIPs := make([]any, len(ips)) for i, ip := range ips { - flattenedIPs[i] = map[string]interface{}{ + flattenedIPs[i] = map[string]any{ "id": zonal.NewIDString(zone, ip.ID), "address": ip.Address.String(), } @@ -101,8 +101,8 @@ func flattenServerPublicIPs(zone scw.Zone, ips []*instance.ServerIP) []interface return flattenedIPs } -func flattenServerIPIDs(ips []*instance.ServerIP) []interface{} { - ipIDs := make([]interface{}, len(ips)) +func flattenServerIPIDs(ips []*instance.ServerIP) []any { + ipIDs := make([]any, len(ips)) for i, ip := range ips { ipIDs[i] = ip.ID diff --git a/internal/services/instance/user_data.go b/internal/services/instance/user_data.go index 4078e3d4d8..116e2bf4a7 100644 --- a/internal/services/instance/user_data.go +++ b/internal/services/instance/user_data.go @@ -56,7 +56,7 @@ func ResourceUserData() *schema.Resource { } } -func ResourceInstanceUserDataCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceUserDataCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -93,7 +93,7 @@ func ResourceInstanceUserDataCreate(ctx context.Context, d *schema.ResourceData, return ResourceInstanceUserDataRead(ctx, d, m) } -func ResourceInstanceUserDataRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceUserDataRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, id, key, err := NewAPIWithZoneAndNestedID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -139,7 +139,7 @@ func ResourceInstanceUserDataRead(ctx context.Context, d *schema.ResourceData, m return nil } -func ResourceInstanceUserDataUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceUserDataUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, id, key, err := NewAPIWithZoneAndNestedID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -178,7 +178,7 @@ func ResourceInstanceUserDataUpdate(ctx context.Context, d *schema.ResourceData, return ResourceInstanceUserDataRead(ctx, d, m) } -func ResourceInstanceUserDataDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceUserDataDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, id, key, err := NewAPIWithZoneAndNestedID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/volume.go b/internal/services/instance/volume.go index 82abfff563..af3a15827c 100644 --- a/internal/services/instance/volume.go +++ b/internal/services/instance/volume.go @@ -91,7 +91,7 @@ func ResourceVolume() *schema.Resource { } } -func ResourceInstanceVolumeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceVolumeCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -138,7 +138,7 @@ func ResourceInstanceVolumeCreate(ctx context.Context, d *schema.ResourceData, m return ResourceInstanceVolumeRead(ctx, d, m) } -func ResourceInstanceVolumeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceVolumeRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -194,7 +194,7 @@ func ResourceInstanceVolumeRead(ctx context.Context, d *schema.ResourceData, m i return nil } -func ResourceInstanceVolumeUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceVolumeUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -255,7 +255,7 @@ func ResourceInstanceVolumeUpdate(ctx context.Context, d *schema.ResourceData, m return ResourceInstanceVolumeRead(ctx, d, m) } -func ResourceInstanceVolumeDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceVolumeDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/instance/volume_data_source.go b/internal/services/instance/volume_data_source.go index bb8834fb43..9cd773d3cf 100644 --- a/internal/services/instance/volume_data_source.go +++ b/internal/services/instance/volume_data_source.go @@ -34,7 +34,7 @@ func DataSourceVolume() *schema.Resource { } } -func DataSourceInstanceVolumeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceInstanceVolumeRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { instanceAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/iot/data_source_iot_device.go b/internal/services/iot/data_source_iot_device.go index d8dd88f1be..47c1d69d1d 100644 --- a/internal/services/iot/data_source_iot_device.go +++ b/internal/services/iot/data_source_iot_device.go @@ -33,7 +33,7 @@ func DataSourceDevice() *schema.Resource { } } -func DataSourceIotDeviceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceIotDeviceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := iotAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/iot/data_source_iot_hub.go b/internal/services/iot/data_source_iot_hub.go index 6bac6dbc08..a794fd1762 100644 --- a/internal/services/iot/data_source_iot_hub.go +++ b/internal/services/iot/data_source_iot_hub.go @@ -32,7 +32,7 @@ func DataSourceHub() *schema.Resource { } } -func DataSourceIotHubRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceIotHubRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := iotAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/iot/device.go b/internal/services/iot/device.go index 8a241d4704..3ff2152a0b 100644 --- a/internal/services/iot/device.go +++ b/internal/services/iot/device.go @@ -181,7 +181,7 @@ func ResourceDevice() *schema.Resource { } } -func ResourceIotDeviceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotDeviceCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, err := iotAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -263,17 +263,17 @@ func ResourceIotDeviceCreate(ctx context.Context, d *schema.ResourceData, m inte } } else { // Update certificate and key as they cannot be retrieved later. - cert := map[string]interface{}{ + cert := map[string]any{ "crt": res.Certificate.Crt, "key": res.Certificate.Key, } - _ = d.Set("certificate", []map[string]interface{}{cert}) + _ = d.Set("certificate", []map[string]any{cert}) } return ResourceIotDeviceRead(ctx, d, m) } -func ResourceIotDeviceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotDeviceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, deviceID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -304,7 +304,7 @@ func ResourceIotDeviceRead(ctx context.Context, d *schema.ResourceData, m interf _ = d.Set("is_connected", device.IsConnected) _ = d.Set("description", device.Description) - mf := map[string]interface{}{} + mf := map[string]any{} mfHasNonDefaultChange := false // We need to set the message filters only in case when we already set a value or we got non default value @@ -325,19 +325,19 @@ func ResourceIotDeviceRead(ctx context.Context, d *schema.ResourceData, m interf } if mfHasNonDefaultChange { - mf["publish"] = []map[string]interface{}{{ + mf["publish"] = []map[string]any{{ "policy": device.MessageFilters.Publish.Policy, "topics": *device.MessageFilters.Publish.Topics, }} - mf["subscribe"] = []map[string]interface{}{{ + mf["subscribe"] = []map[string]any{{ "policy": device.MessageFilters.Subscribe.Policy, "topics": *device.MessageFilters.Subscribe.Topics, }} } if mfHasNonDefaultChange { - _ = d.Set("message_filters", []map[string]interface{}{mf}) + _ = d.Set("message_filters", []map[string]any{mf}) } // Read Device certificate @@ -351,17 +351,17 @@ func ResourceIotDeviceRead(ctx context.Context, d *schema.ResourceData, m interf return diag.FromErr(err) } // Set device certificate. - cert := map[string]interface{}{ + cert := map[string]any{ "crt": devCrt.CertificatePem, "key": devCrtKey.(string), } - _ = d.Set("certificate", []map[string]interface{}{cert}) + _ = d.Set("certificate", []map[string]any{cert}) } return nil } -func ResourceIotDeviceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotDeviceUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, deviceID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -438,7 +438,7 @@ func ResourceIotDeviceUpdate(ctx context.Context, d *schema.ResourceData, m inte return ResourceIotDeviceRead(ctx, d, m) } -func ResourceIotDeviceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotDeviceDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, deviceID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/iot/helpers_iot.go b/internal/services/iot/helpers_iot.go index cc437e0393..ccc407c2e8 100644 --- a/internal/services/iot/helpers_iot.go +++ b/internal/services/iot/helpers_iot.go @@ -21,7 +21,7 @@ const ( mqttCaFileName = "iot-hub-ca.pem" ) -func iotAPIWithRegion(d *schema.ResourceData, m interface{}) (*iot.API, scw.Region, error) { +func iotAPIWithRegion(d *schema.ResourceData, m any) (*iot.API, scw.Region, error) { iotAPI := iot.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -29,7 +29,7 @@ func iotAPIWithRegion(d *schema.ResourceData, m interface{}) (*iot.API, scw.Regi return iotAPI, region, err } -func NewAPIWithRegionAndID(m interface{}, id string) (*iot.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*iot.API, scw.Region, string, error) { iotAPI := iot.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(id) @@ -56,7 +56,7 @@ func waitIotHub(ctx context.Context, api *iot.API, region scw.Region, id string, func extractRestHeaders(d *schema.ResourceData, key string) map[string]string { stringMap := map[string]string{} - data := d.Get(key).(map[string]interface{}) + data := d.Get(key).(map[string]any) for k, v := range data { stringMap[k] = v.(string) @@ -73,7 +73,7 @@ func computeIotHubCaURL(productPlan iot.HubProductPlan, region scw.Region) strin return mqttCaURLDownload + string(region) + "/" + mqttCaFileName } -func computeIotHubMQTTCa(ctx context.Context, mqttCaURL string, m interface{}) (string, error) { +func computeIotHubMQTTCa(ctx context.Context, mqttCaURL string, m any) (string, error) { if mqttCaURL == "" { return "", nil } diff --git a/internal/services/iot/hub.go b/internal/services/iot/hub.go index 4711dfb32f..b988187d0a 100644 --- a/internal/services/iot/hub.go +++ b/internal/services/iot/hub.go @@ -125,7 +125,7 @@ func ResourceHub() *schema.Resource { } } -func ResourceIotHubCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotHubCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, err := iotAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -209,7 +209,7 @@ func ResourceIotHubCreate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceIotHubRead(ctx, d, m) } -func ResourceIotHubRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotHubRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, hubID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -262,7 +262,7 @@ func ResourceIotHubRead(ctx context.Context, d *schema.ResourceData, m interface return nil } -func ResourceIotHubUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotHubUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, hubID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -351,7 +351,7 @@ func ResourceIotHubUpdate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceIotHubRead(ctx, d, m) } -func ResourceIotHubDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotHubDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/iot/network.go b/internal/services/iot/network.go index eb171e4205..9c639c7c77 100644 --- a/internal/services/iot/network.go +++ b/internal/services/iot/network.go @@ -79,7 +79,7 @@ func ResourceNetwork() *schema.Resource { } } -func ResourceIotNetworkCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotNetworkCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, err := iotAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -109,7 +109,7 @@ func ResourceIotNetworkCreate(ctx context.Context, d *schema.ResourceData, m int return ResourceIotNetworkRead(ctx, d, m) } -func ResourceIotNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotNetworkRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, networkID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -140,7 +140,7 @@ func ResourceIotNetworkRead(ctx context.Context, d *schema.ResourceData, m inter return nil } -func ResourceIotNetworkDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotNetworkDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, networkID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/iot/routes.go b/internal/services/iot/routes.go index 6c761bd83e..467108accb 100644 --- a/internal/services/iot/routes.go +++ b/internal/services/iot/routes.go @@ -188,7 +188,7 @@ func ResourceRoute() *schema.Resource { } } -func ResourceIotRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotRouteCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, err := iotAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -252,7 +252,7 @@ func ResourceIotRouteCreate(ctx context.Context, d *schema.ResourceData, m inter return ResourceIotRouteRead(ctx, d, m) } -func ResourceIotRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotRouteRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, routeID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -280,7 +280,7 @@ func ResourceIotRouteRead(ctx context.Context, d *schema.ResourceData, m interfa switch response.Type { case iot.RouteRouteTypeDatabase: - conf := []map[string]interface{}{{ + conf := []map[string]any{{ "query": response.DbConfig.Query, "host": response.DbConfig.Host, "port": int(response.DbConfig.Port), @@ -291,14 +291,14 @@ func ResourceIotRouteRead(ctx context.Context, d *schema.ResourceData, m interfa }} _ = d.Set("database", conf) case iot.RouteRouteTypeRest: - conf := []map[string]interface{}{{ + conf := []map[string]any{{ "verb": response.RestConfig.Verb, "uri": response.RestConfig.URI, "headers": response.RestConfig.Headers, }} _ = d.Set("rest", conf) case iot.RouteRouteTypeS3: - conf := []map[string]interface{}{{ + conf := []map[string]any{{ "bucket_region": response.S3Config.BucketRegion, "bucket_name": response.S3Config.BucketName, "object_prefix": response.S3Config.ObjectPrefix, @@ -310,7 +310,7 @@ func ResourceIotRouteRead(ctx context.Context, d *schema.ResourceData, m interfa return nil } -func ResourceIotRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIotRouteDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { iotAPI, region, routeID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/ipam/helpers.go b/internal/services/ipam/helpers.go index 963ce9085c..8708acbb8b 100644 --- a/internal/services/ipam/helpers.go +++ b/internal/services/ipam/helpers.go @@ -20,7 +20,7 @@ const ( ) // newAPIWithRegion returns a new ipam API and the region -func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*ipam.API, scw.Region, error) { +func newAPIWithRegion(d *schema.ResourceData, m any) (*ipam.API, scw.Region, error) { ipamAPI := ipam.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -32,7 +32,7 @@ func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*ipam.API, scw.Reg } // NewAPIWithRegionAndID returns a new ipam API with locality and ID extracted from the state -func NewAPIWithRegionAndID(m interface{}, id string) (*ipam.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*ipam.API, scw.Region, string, error) { ipamAPI := ipam.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(id) @@ -78,7 +78,7 @@ type GetResourcePrivateIPsOptions struct { } // GetResourcePrivateIPs fetches the private IP addresses of a resource in a private network. -func GetResourcePrivateIPs(ctx context.Context, m interface{}, region scw.Region, opts *GetResourcePrivateIPsOptions) ([]map[string]interface{}, error) { +func GetResourcePrivateIPs(ctx context.Context, m any, region scw.Region, opts *GetResourcePrivateIPsOptions) ([]map[string]any, error) { ipamAPI := ipam.NewAPI(meta.ExtractScwClient(m)) req := &ipam.ListIPsRequest{ @@ -121,7 +121,7 @@ func GetResourcePrivateIPs(ctx context.Context, m interface{}, region scw.Region return nil, nil } - ipList := make([]map[string]interface{}, 0, len(resp.IPs)) + ipList := make([]map[string]any, 0, len(resp.IPs)) for _, ip := range resp.IPs { ipNet := ip.Address @@ -129,7 +129,7 @@ func GetResourcePrivateIPs(ctx context.Context, m interface{}, region scw.Region continue } - ipMap := map[string]interface{}{ + ipMap := map[string]any{ "id": regional.NewIDString(region, ip.ID), "address": ipNet.IP.String(), } diff --git a/internal/services/ipam/ip.go b/internal/services/ipam/ip.go index ba638699cc..af19925ada 100644 --- a/internal/services/ipam/ip.go +++ b/internal/services/ipam/ip.go @@ -169,7 +169,7 @@ func ResourceIP() *schema.Resource { } } -func ResourceIPAMIPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIPAMIPCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { ipamAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -215,7 +215,7 @@ func ResourceIPAMIPCreate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceIPAMIPRead(ctx, d, m) } -func ResourceIPAMIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIPAMIPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { ipamAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -296,7 +296,7 @@ func ResourceIPAMIPRead(ctx context.Context, d *schema.ResourceData, m interface return nil } -func ResourceIPAMIPUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIPAMIPUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { ipamAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -332,7 +332,7 @@ func ResourceIPAMIPUpdate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceIPAMIPRead(ctx, d, m) } -func ResourceIPAMIPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIPAMIPDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { ipamAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/ipam/ip_data_source.go b/internal/services/ipam/ip_data_source.go index 73fc734576..a16bfe8bd3 100644 --- a/internal/services/ipam/ip_data_source.go +++ b/internal/services/ipam/ip_data_source.go @@ -72,7 +72,7 @@ func DataSourceIP() *schema.Resource { Optional: true, Description: "IP Type (ipv4, ipv6)", ConflictsWith: []string{"ipam_ip_id"}, - ValidateDiagFunc: func(i interface{}, _ cty.Path) diag.Diagnostics { + ValidateDiagFunc: func(i any, _ cty.Path) diag.Diagnostics { switch i.(string) { case "ipv4": return nil @@ -122,7 +122,7 @@ func DataSourceIP() *schema.Resource { } } -func DataSourceIPAMIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceIPAMIPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -136,9 +136,9 @@ func DataSourceIPAMIPRead(ctx context.Context, d *schema.ResourceData, m interfa if !ok { resources, resourcesOk := d.GetOk("resource") if resourcesOk { - resourceList := resources.([]interface{}) + resourceList := resources.([]any) if len(resourceList) > 0 { - resourceMap := resourceList[0].(map[string]interface{}) + resourceMap := resourceList[0].(map[string]any) id, idExists := resourceMap["id"].(string) name, nameExists := resourceMap["name"].(string) diff --git a/internal/services/ipam/ip_reverse_dns.go b/internal/services/ipam/ip_reverse_dns.go index 27412aa17e..532eb35dd8 100644 --- a/internal/services/ipam/ip_reverse_dns.go +++ b/internal/services/ipam/ip_reverse_dns.go @@ -52,7 +52,7 @@ func ResourceIPReverseDNS() *schema.Resource { } } -func ResourceIPAMIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIPAMIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { ipamAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -89,7 +89,7 @@ func ResourceIPAMIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, return ResourceIPAMIPReverseDNSRead(ctx, d, m) } -func ResourceIPAMIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIPAMIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { ipamAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -126,7 +126,7 @@ func ResourceIPAMIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, m return nil } -func ResourceIPAMIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIPAMIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { ipamAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -153,7 +153,7 @@ func ResourceIPAMIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, return ResourceIPAMIPReverseDNSRead(ctx, d, m) } -func ResourceIPAMIPReverseDNSDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIPAMIPReverseDNSDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { ipamAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/ipam/ips_data_source.go b/internal/services/ipam/ips_data_source.go index e62a5d5eaa..30104c81c3 100644 --- a/internal/services/ipam/ips_data_source.go +++ b/internal/services/ipam/ips_data_source.go @@ -138,7 +138,7 @@ func DataSourceIPs() *schema.Resource { } } -func DataSourceIPAMIPsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceIPAMIPsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -184,7 +184,7 @@ func DataSourceIPAMIPsRead(ctx context.Context, d *schema.ResourceData, m interf return diag.FromErr(err) } - ips := []interface{}(nil) + ips := []any(nil) for _, ip := range resp.IPs { address, err := types.FlattenIPNet(ip.Address) @@ -192,7 +192,7 @@ func DataSourceIPAMIPsRead(ctx context.Context, d *schema.ResourceData, m interf return diag.FromErr(err) } - rawIP := make(map[string]interface{}) + rawIP := make(map[string]any) rawIP["id"] = regional.NewIDString(region, ip.ID) rawIP["address"] = address rawIP["resource"] = flattenIPResource(ip.Resource) diff --git a/internal/services/ipam/types.go b/internal/services/ipam/types.go index 603a0384c7..d23ec54ef1 100644 --- a/internal/services/ipam/types.go +++ b/internal/services/ipam/types.go @@ -16,7 +16,7 @@ import ( // region/id1/invalid -> id1 // id1 -> id1 // invalid -> invalid -func expandLastID(i interface{}) string { +func expandLastID(i any) string { composedID := i.(string) elems := strings.Split(composedID, "/") @@ -29,12 +29,12 @@ func expandLastID(i interface{}) string { return composedID } -func expandIPSource(raw interface{}) *ipam.Source { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandIPSource(raw any) *ipam.Source { + if raw == nil || len(raw.([]any)) != 1 { return nil } - rawMap := raw.([]interface{})[0].(map[string]interface{}) + rawMap := raw.([]any)[0].(map[string]any) return &ipam.Source{ Zonal: types.ExpandStringPtr(rawMap["zonal"].(string)), @@ -43,12 +43,12 @@ func expandIPSource(raw interface{}) *ipam.Source { } } -func expandCustomResource(raw interface{}) *ipam.CustomResource { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandCustomResource(raw any) *ipam.CustomResource { + if raw == nil || len(raw.([]any)) != 1 { return nil } - rawMap := raw.([]interface{})[0].(map[string]interface{}) + rawMap := raw.([]any)[0].(map[string]any) return &ipam.CustomResource{ MacAddress: rawMap["mac_address"].(string), @@ -56,12 +56,12 @@ func expandCustomResource(raw interface{}) *ipam.CustomResource { } } -func flattenIPSource(source *ipam.Source, privateNetworkID string) interface{} { +func flattenIPSource(source *ipam.Source, privateNetworkID string) any { if source == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "zonal": types.FlattenStringPtr(source.Zonal), "private_network_id": privateNetworkID, @@ -70,12 +70,12 @@ func flattenIPSource(source *ipam.Source, privateNetworkID string) interface{} { } } -func flattenIPResource(resource *ipam.Resource) interface{} { +func flattenIPResource(resource *ipam.Resource) any { if resource == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "type": resource.Type.String(), "id": resource.ID, @@ -85,19 +85,19 @@ func flattenIPResource(resource *ipam.Resource) interface{} { } } -func flattenIPReverse(reverse *ipam.Reverse) interface{} { +func flattenIPReverse(reverse *ipam.Reverse) any { if reverse == nil { return nil } - return map[string]interface{}{ + return map[string]any{ "hostname": reverse.Hostname, "address": types.FlattenIPPtr(reverse.Address), } } -func flattenIPReverses(reverses []*ipam.Reverse) interface{} { - rawReverses := make([]interface{}, 0, len(reverses)) +func flattenIPReverses(reverses []*ipam.Reverse) any { + rawReverses := make([]any, 0, len(reverses)) for _, reverse := range reverses { rawReverses = append(rawReverses, flattenIPReverse(reverse)) } @@ -105,8 +105,8 @@ func flattenIPReverses(reverses []*ipam.Reverse) interface{} { return rawReverses } -func checkSubnetIDInFlattenedSubnets(subnetID string, flattenedSubnets interface{}) bool { - for _, subnet := range flattenedSubnets.([]map[string]interface{}) { +func checkSubnetIDInFlattenedSubnets(subnetID string, flattenedSubnets any) bool { + for _, subnet := range flattenedSubnets.([]map[string]any) { if subnet["id"].(string) == subnetID { return true } diff --git a/internal/services/jobs/helpers.go b/internal/services/jobs/helpers.go index dba72d08bc..d5b857f3ce 100644 --- a/internal/services/jobs/helpers.go +++ b/internal/services/jobs/helpers.go @@ -13,7 +13,7 @@ import ( ) // newAPIWithRegion returns a new jobs API and the region for a Create request -func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*jobs.API, scw.Region, error) { +func newAPIWithRegion(d *schema.ResourceData, m any) (*jobs.API, scw.Region, error) { jobsAPI := jobs.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -25,7 +25,7 @@ func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*jobs.API, scw.Reg } // NewAPIWithRegionAndID returns a new jobs API with region and ID extracted from the state -func NewAPIWithRegionAndID(m interface{}, regionalID string) (*jobs.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, regionalID string) (*jobs.API, scw.Region, string, error) { jobsAPI := jobs.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionalID) @@ -109,7 +109,7 @@ func expandJobDefinitionSecret(i any) []JobDefinitionSecret { } for _, rawSecret := range i.(*schema.Set).List() { - secretMap := rawSecret.(map[string]interface{}) + secretMap := rawSecret.(map[string]any) env, file := "", "" if userEnv, ok := secretMap["environment"].(string); ok { @@ -137,10 +137,10 @@ func expandJobDefinitionSecret(i any) []JobDefinitionSecret { } func flattenJobDefinitionSecret(jobSecrets []*jobs.Secret) []any { - secretRefs := make([]interface{}, len(jobSecrets)) + secretRefs := make([]any, len(jobSecrets)) for i, secret := range jobSecrets { - secretRef := make(map[string]interface{}) + secretRef := make(map[string]any) secretRef["secret_id"] = secret.SecretManagerID secretRef["secret_reference_id"] = secret.SecretID secretRef["secret_version"] = secret.SecretManagerVersion diff --git a/internal/services/jobs/jobs.go b/internal/services/jobs/jobs.go index 07fa4dba13..41a3db3d5c 100644 --- a/internal/services/jobs/jobs.go +++ b/internal/services/jobs/jobs.go @@ -96,8 +96,8 @@ func ResourceDefinition() *schema.Resource { Type: schema.TypeSet, Optional: true, Description: "A reference to a Secret Manager secret.", - Set: func(v interface{}) int { - secret := v.(map[string]interface{}) + Set: func(v any) int { + secret := v.(map[string]any) if secret["environment"] != "" { return schema.HashString(locality.ExpandID(secret["secret_id"].(string)) + secret["secret_version"].(string) + secret["environment"].(string)) } @@ -143,7 +143,7 @@ func ResourceDefinition() *schema.Resource { } } -func ResourceJobDefinitionCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceJobDefinitionCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -192,7 +192,7 @@ func ResourceJobDefinitionCreate(ctx context.Context, d *schema.ResourceData, m return ResourceJobDefinitionRead(ctx, d, m) } -func ResourceJobDefinitionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceJobDefinitionRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -236,7 +236,7 @@ func ResourceJobDefinitionRead(ctx context.Context, d *schema.ResourceData, m in return nil } -func ResourceJobDefinitionUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceJobDefinitionUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -331,7 +331,7 @@ func ResourceJobDefinitionUpdate(ctx context.Context, d *schema.ResourceData, m return ResourceJobDefinitionRead(ctx, d, m) } -func ResourceJobDefinitionDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceJobDefinitionDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/k8s/acl.go b/internal/services/k8s/acl.go index dfafd168da..642fdd5b9f 100644 --- a/internal/services/k8s/acl.go +++ b/internal/services/k8s/acl.go @@ -88,7 +88,7 @@ func ResourceACL() *schema.Resource { } } -func ResourceACLCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceACLCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, _, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -104,7 +104,7 @@ func ResourceACLCreate(ctx context.Context, d *schema.ResourceData, m interface{ return diag.FromErr(err) } - acls, err := expandACL(d.Get("acl_rules").([]interface{})) + acls, err := expandACL(d.Get("acl_rules").([]any)) if err != nil { return diag.FromErr(err) } @@ -126,7 +126,7 @@ func ResourceACLCreate(ctx context.Context, d *schema.ResourceData, m interface{ return ResourceACLRead(ctx, d, m) } -func ResourceACLRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceACLRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, clusterID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -158,7 +158,7 @@ func ResourceACLRead(ctx context.Context, d *schema.ResourceData, m interface{}) return nil } -func ResourceACLUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceACLUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, clusterID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -170,7 +170,7 @@ func ResourceACLUpdate(ctx context.Context, d *schema.ResourceData, m interface{ } if d.HasChanges("acl_rules", "no_ip_allowed") { - acls, err := expandACL(d.Get("acl_rules").([]interface{})) + acls, err := expandACL(d.Get("acl_rules").([]any)) if err != nil { return diag.FromErr(err) } @@ -190,7 +190,7 @@ func ResourceACLUpdate(ctx context.Context, d *schema.ResourceData, m interface{ return ResourceACLRead(ctx, d, m) } -func ResourceACLDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceACLDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, clusterID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -230,11 +230,11 @@ func ResourceACLDelete(ctx context.Context, d *schema.ResourceData, m interface{ return nil } -func expandACL(data []interface{}) ([]*k8s.ACLRuleRequest, error) { +func expandACL(data []any) ([]*k8s.ACLRuleRequest, error) { expandedACLs := []*k8s.ACLRuleRequest(nil) for _, rule := range data { - r := rule.(map[string]interface{}) + r := rule.(map[string]any) expandedRule := &k8s.ACLRuleRequest{} if ipRaw, ok := r["ip"]; ok && ipRaw != "" { @@ -260,15 +260,15 @@ func expandACL(data []interface{}) ([]*k8s.ACLRuleRequest, error) { return expandedACLs, nil } -func flattenACL(rules []*k8s.ACLRule) interface{} { +func flattenACL(rules []*k8s.ACLRule) any { if rules == nil { return nil } - flattenedACLs := []map[string]interface{}(nil) + flattenedACLs := []map[string]any(nil) for _, rule := range rules { - flattenedRule := map[string]interface{}{ + flattenedRule := map[string]any{ "id": rule.ID, "scaleway_ranges": rule.ScalewayRanges, "description": rule.Description, diff --git a/internal/services/k8s/cluster.go b/internal/services/k8s/cluster.go index b9f88cb74f..6c46536189 100644 --- a/internal/services/k8s/cluster.go +++ b/internal/services/k8s/cluster.go @@ -224,7 +224,7 @@ func ResourceCluster() *schema.Resource { }, }, CustomizeDiff: customdiff.All( - func(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { + func(_ context.Context, diff *schema.ResourceDiff, _ any) error { autoUpgradeEnable, okAutoUpgradeEnable := diff.GetOkExists("auto_upgrade.0.enable") version := diff.Get("version").(string) @@ -239,7 +239,7 @@ func ResourceCluster() *schema.Resource { return nil }, - func(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { + func(_ context.Context, diff *schema.ResourceDiff, _ any) error { if diff.HasChange("private_network_id") { actual, planned := diff.GetChange("private_network_id") clusterType := diff.Get("type").(string) @@ -277,7 +277,7 @@ func ResourceCluster() *schema.Resource { return nil }, - func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error { + func(ctx context.Context, diff *schema.ResourceDiff, i any) error { if diff.HasChange("type") && diff.Id() != "" { k8sAPI, region, clusterID, err := NewAPIWithRegionAndID(i, diff.Id()) if err != nil { @@ -310,7 +310,7 @@ func ResourceCluster() *schema.Resource { } //gocyclo:ignore -func ResourceK8SClusterCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceK8SClusterCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { k8sAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -516,7 +516,7 @@ func ResourceK8SClusterCreate(ctx context.Context, d *schema.ResourceData, m int return append(ResourceK8SClusterRead(ctx, d, m), diags...) } -func ResourceK8SClusterRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceK8SClusterRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { k8sAPI, region, clusterID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -590,13 +590,13 @@ func ResourceK8SClusterRead(ctx context.Context, d *schema.ResourceData, m inter return diag.FromErr(err) } - _ = d.Set("kubeconfig", []map[string]interface{}{kubeconfig}) + _ = d.Set("kubeconfig", []map[string]any{kubeconfig}) return nil } //gocyclo:ignore -func ResourceK8SClusterUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceK8SClusterUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { k8sAPI, region, clusterID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -865,7 +865,7 @@ func ResourceK8SClusterUpdate(ctx context.Context, d *schema.ResourceData, m int return append(ResourceK8SClusterRead(ctx, d, m), diags...) } -func ResourceK8SClusterDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceK8SClusterDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { k8sAPI, region, clusterID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/k8s/cluster_data_source.go b/internal/services/k8s/cluster_data_source.go index 70c5f571f2..0f88c36de2 100644 --- a/internal/services/k8s/cluster_data_source.go +++ b/internal/services/k8s/cluster_data_source.go @@ -36,7 +36,7 @@ func DataSourceCluster() *schema.Resource { } } -func DataSourceK8SClusterRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceK8SClusterRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { k8sAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/k8s/helpers_k8s.go b/internal/services/k8s/helpers_k8s.go index a0a54bd0b3..073577518d 100644 --- a/internal/services/k8s/helpers_k8s.go +++ b/internal/services/k8s/helpers_k8s.go @@ -21,7 +21,7 @@ const ( defaultK8SRetryInterval = 5 * time.Second ) -func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*k8s.API, scw.Region, error) { +func newAPIWithRegion(d *schema.ResourceData, m any) (*k8s.API, scw.Region, error) { k8sAPI := k8s.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -32,7 +32,7 @@ func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*k8s.API, scw.Regi return k8sAPI, region, nil } -func NewAPIWithRegionAndID(m interface{}, id string) (*k8s.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*k8s.API, scw.Region, string, error) { k8sAPI := k8s.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(id) @@ -81,11 +81,11 @@ func k8sGetLatestVersionFromMinor(ctx context.Context, k8sAPI *k8s.API, region s } // convert a list of nodes to a list of map -func convertNodes(res *k8s.ListNodesResponse) []map[string]interface{} { - result := make([]map[string]interface{}, 0, len(res.Nodes)) +func convertNodes(res *k8s.ListNodesResponse) []map[string]any { + result := make([]map[string]any, 0, len(res.Nodes)) for _, node := range res.Nodes { - n := make(map[string]interface{}) + n := make(map[string]any) n["id"] = node.ID n["name"] = node.Name n["status"] = node.Status.String() @@ -104,7 +104,7 @@ func convertNodes(res *k8s.ListNodesResponse) []map[string]interface{} { return result } -func getNodes(ctx context.Context, k8sAPI *k8s.API, pool *k8s.Pool) ([]map[string]interface{}, error) { +func getNodes(ctx context.Context, k8sAPI *k8s.API, pool *k8s.Pool) ([]map[string]any, error) { req := &k8s.ListNodesRequest{ Region: pool.Region, ClusterID: pool.ClusterID, diff --git a/internal/services/k8s/k8s_version_data_source.go b/internal/services/k8s/k8s_version_data_source.go index 802f33b022..30824c1177 100644 --- a/internal/services/k8s/k8s_version_data_source.go +++ b/internal/services/k8s/k8s_version_data_source.go @@ -50,7 +50,7 @@ func DataSourceVersion() *schema.Resource { } } -func DataSourceK8SVersionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceK8SVersionRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { k8sAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/k8s/pool.go b/internal/services/k8s/pool.go index a8e6c846b9..87a16fd621 100644 --- a/internal/services/k8s/pool.go +++ b/internal/services/k8s/pool.go @@ -254,7 +254,7 @@ func ResourcePool() *schema.Resource { } //gocyclo:ignore -func ResourceK8SPoolCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceK8SPoolCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { k8sAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -362,7 +362,7 @@ func ResourceK8SPoolCreate(ctx context.Context, d *schema.ResourceData, m interf return ResourceK8SPoolRead(ctx, d, m) } -func ResourceK8SPoolRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceK8SPoolRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { k8sAPI, region, poolID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -487,7 +487,7 @@ func ResourceK8SPoolRead(ctx context.Context, d *schema.ResourceData, m interfac return diags } -func ResourceK8SPoolUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceK8SPoolUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { k8sAPI, region, poolID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -557,7 +557,7 @@ func ResourceK8SPoolUpdate(ctx context.Context, d *schema.ResourceData, m interf return ResourceK8SPoolRead(ctx, d, m) } -func ResourceK8SPoolDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceK8SPoolDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { k8sAPI, region, poolID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -591,7 +591,7 @@ func ResourceK8SPoolDelete(ctx context.Context, d *schema.ResourceData, m interf return nil } -func ResourceK8SPoolCustomDiff(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { +func ResourceK8SPoolCustomDiff(_ context.Context, diff *schema.ResourceDiff, _ any) error { if diff.HasChange("size") { err := diff.SetNewComputed("nodes") if err != nil { diff --git a/internal/services/k8s/pool_data_source.go b/internal/services/k8s/pool_data_source.go index bcf05bc6e5..5070dafe88 100644 --- a/internal/services/k8s/pool_data_source.go +++ b/internal/services/k8s/pool_data_source.go @@ -38,7 +38,7 @@ func DataSourcePool() *schema.Resource { } } -func DataSourceK8SPoolRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceK8SPoolRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { k8sAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/k8s/types.go b/internal/services/k8s/types.go index c268ca370a..7cf116cb00 100644 --- a/internal/services/k8s/types.go +++ b/internal/services/k8s/types.go @@ -9,8 +9,8 @@ import ( "github.com/scaleway/scaleway-sdk-go/scw" ) -func clusterAutoscalerConfigFlatten(cluster *k8s.Cluster) []map[string]interface{} { - autoscalerConfig := map[string]interface{}{} +func clusterAutoscalerConfigFlatten(cluster *k8s.Cluster) []map[string]any { + autoscalerConfig := map[string]any{} autoscalerConfig["disable_scale_down"] = cluster.AutoscalerConfig.ScaleDownDisabled autoscalerConfig["scale_down_delay_after_add"] = cluster.AutoscalerConfig.ScaleDownDelayAfterAdd autoscalerConfig["scale_down_unneeded_time"] = cluster.AutoscalerConfig.ScaleDownUnneededTime @@ -30,11 +30,11 @@ func clusterAutoscalerConfigFlatten(cluster *k8s.Cluster) []map[string]interface autoscalerConfig["scale_down_utilization_threshold"] = thresholdF64 autoscalerConfig["max_graceful_termination_sec"] = cluster.AutoscalerConfig.MaxGracefulTerminationSec - return []map[string]interface{}{autoscalerConfig} + return []map[string]any{autoscalerConfig} } -func clusterOpenIDConnectConfigFlatten(cluster *k8s.Cluster) []map[string]interface{} { - openIDConnectConfig := map[string]interface{}{} +func clusterOpenIDConnectConfigFlatten(cluster *k8s.Cluster) []map[string]any { + openIDConnectConfig := map[string]any{} openIDConnectConfig["issuer_url"] = cluster.OpenIDConnectConfig.IssuerURL openIDConnectConfig["client_id"] = cluster.OpenIDConnectConfig.ClientID openIDConnectConfig["username_claim"] = cluster.OpenIDConnectConfig.UsernameClaim @@ -43,40 +43,40 @@ func clusterOpenIDConnectConfigFlatten(cluster *k8s.Cluster) []map[string]interf openIDConnectConfig["groups_prefix"] = cluster.OpenIDConnectConfig.GroupsPrefix openIDConnectConfig["required_claim"] = cluster.OpenIDConnectConfig.RequiredClaim - return []map[string]interface{}{openIDConnectConfig} + return []map[string]any{openIDConnectConfig} } -func clusterAutoUpgradeFlatten(cluster *k8s.Cluster) []map[string]interface{} { - autoUpgrade := map[string]interface{}{} +func clusterAutoUpgradeFlatten(cluster *k8s.Cluster) []map[string]any { + autoUpgrade := map[string]any{} autoUpgrade["enable"] = cluster.AutoUpgrade.Enabled autoUpgrade["maintenance_window_start_hour"] = cluster.AutoUpgrade.MaintenanceWindow.StartHour autoUpgrade["maintenance_window_day"] = cluster.AutoUpgrade.MaintenanceWindow.Day - return []map[string]interface{}{autoUpgrade} + return []map[string]any{autoUpgrade} } -func poolUpgradePolicyFlatten(pool *k8s.Pool) []map[string]interface{} { - upgradePolicy := map[string]interface{}{} +func poolUpgradePolicyFlatten(pool *k8s.Pool) []map[string]any { + upgradePolicy := map[string]any{} if pool.UpgradePolicy != nil { upgradePolicy["max_surge"] = pool.UpgradePolicy.MaxSurge upgradePolicy["max_unavailable"] = pool.UpgradePolicy.MaxUnavailable } - return []map[string]interface{}{upgradePolicy} + return []map[string]any{upgradePolicy} } -func expandKubeletArgs(args interface{}) map[string]string { +func expandKubeletArgs(args any) map[string]string { kubeletArgs := map[string]string{} - for key, value := range args.(map[string]interface{}) { + for key, value := range args.(map[string]any) { kubeletArgs[key] = value.(string) } return kubeletArgs } -func flattenKubeletArgs(args map[string]string) map[string]interface{} { - kubeletArgs := map[string]interface{}{} +func flattenKubeletArgs(args map[string]string) map[string]any { + kubeletArgs := map[string]any{} for key, value := range args { kubeletArgs[key] = value @@ -85,7 +85,7 @@ func flattenKubeletArgs(args map[string]string) map[string]interface{} { return kubeletArgs } -func flattenKubeconfig(ctx context.Context, k8sAPI *k8s.API, region scw.Region, clusterID string) (map[string]interface{}, error) { +func flattenKubeconfig(ctx context.Context, k8sAPI *k8s.API, region scw.Region, clusterID string) (map[string]any, error) { kubeconfig, err := k8sAPI.GetClusterKubeConfig(&k8s.GetClusterKubeConfigRequest{ Region: region, ClusterID: clusterID, @@ -109,7 +109,7 @@ func flattenKubeconfig(ctx context.Context, k8sAPI *k8s.API, region scw.Region, return nil, err } - kubeconf := map[string]interface{}{} + kubeconf := map[string]any{} kubeconf["config_file"] = string(kubeconfig.GetRaw()) kubeconf["host"] = kubeconfigServer kubeconf["cluster_ca_certificate"] = kubeconfigCa diff --git a/internal/services/lb/acl.go b/internal/services/lb/acl.go index 0203afcd13..014436e0ff 100644 --- a/internal/services/lb/acl.go +++ b/internal/services/lb/acl.go @@ -153,7 +153,7 @@ func ResourceACL() *schema.Resource { } } -func resourceLbACLCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbACLCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, _, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -184,7 +184,7 @@ func resourceLbACLCreate(ctx context.Context, d *schema.ResourceData, m interfac return resourceLbACLRead(ctx, d, m) } -func resourceLbACLRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbACLRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -219,7 +219,7 @@ func resourceLbACLRead(ctx context.Context, d *schema.ResourceData, m interface{ return nil } -func resourceLbACLUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbACLUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -243,7 +243,7 @@ func resourceLbACLUpdate(ctx context.Context, d *schema.ResourceData, m interfac return resourceLbACLRead(ctx, d, m) } -func resourceLbACLDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbACLDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/acls_data_source.go b/internal/services/lb/acls_data_source.go index bbb8a2d640..6c1e333741 100644 --- a/internal/services/lb/acls_data_source.go +++ b/internal/services/lb/acls_data_source.go @@ -135,7 +135,7 @@ func DataSourceACLs() *schema.Resource { } } -func DataSourceLbACLsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceLbACLsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -155,10 +155,10 @@ func DataSourceLbACLsRead(ctx context.Context, d *schema.ResourceData, m interfa return diag.FromErr(err) } - acls := []interface{}(nil) + acls := []any(nil) for _, acl := range res.ACLs { - rawACL := make(map[string]interface{}) + rawACL := make(map[string]any) rawACL["id"] = zonal.NewIDString(zone, acl.ID) rawACL["name"] = acl.Name rawACL["frontend_id"] = zonal.NewIDString(zone, acl.Frontend.ID) diff --git a/internal/services/lb/backend.go b/internal/services/lb/backend.go index 2c5dc3eebc..3d75669274 100644 --- a/internal/services/lb/backend.go +++ b/internal/services/lb/backend.go @@ -320,7 +320,7 @@ E.g. 'failover-website.s3-website.fr-par.scw.cloud' if your bucket website URL i } } -func resourceLbBackendCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbBackendCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, _, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -456,7 +456,7 @@ func resourceLbBackendCreate(ctx context.Context, d *schema.ResourceData, m inte return resourceLbBackendRead(ctx, d, m) } -func resourceLbBackendRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbBackendRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -524,7 +524,7 @@ func resourceLbBackendRead(ctx context.Context, d *schema.ResourceData, m interf } //gocyclo:ignore -func resourceLbBackendUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbBackendUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -670,7 +670,7 @@ func resourceLbBackendUpdate(ctx context.Context, d *schema.ResourceData, m inte return resourceLbBackendRead(ctx, d, m) } -func resourceLbBackendDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbBackendDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/backend_data_source.go b/internal/services/lb/backend_data_source.go index 58b8100660..9b5f459137 100644 --- a/internal/services/lb/backend_data_source.go +++ b/internal/services/lb/backend_data_source.go @@ -35,7 +35,7 @@ func DataSourceBackend() *schema.Resource { } } -func DataSourceLbBackendRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceLbBackendRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/backends_data_source.go b/internal/services/lb/backends_data_source.go index 7cc30ce104..150a720367 100644 --- a/internal/services/lb/backends_data_source.go +++ b/internal/services/lb/backends_data_source.go @@ -195,7 +195,7 @@ func DataSourceBackends() *schema.Resource { } } -func DataSourceLbBackendsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceLbBackendsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -215,10 +215,10 @@ func DataSourceLbBackendsRead(ctx context.Context, d *schema.ResourceData, m int return diag.FromErr(err) } - backends := []interface{}(nil) + backends := []any(nil) for _, backend := range res.Backends { - rawBackend := make(map[string]interface{}) + rawBackend := make(map[string]any) rawBackend["id"] = zonal.NewID(zone, backend.ID).String() rawBackend["name"] = backend.Name rawBackend["lb_id"] = zonal.NewIDString(zone, backend.LB.ID) diff --git a/internal/services/lb/certificate.go b/internal/services/lb/certificate.go index 3203940c97..635ac7e6bf 100644 --- a/internal/services/lb/certificate.go +++ b/internal/services/lb/certificate.go @@ -130,7 +130,7 @@ func ResourceCertificate() *schema.Resource { } } -func resourceLbCertificateCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbCertificateCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { zone, lbID, err := zonal.ParseID(d.Get("lb_id").(string)) if err != nil { return diag.FromErr(err) @@ -184,7 +184,7 @@ func resourceLbCertificateCreate(ctx context.Context, d *schema.ResourceData, m return resourceLbCertificateRead(ctx, d, m) } -func resourceLbCertificateRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbCertificateRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -231,7 +231,7 @@ func resourceLbCertificateRead(ctx context.Context, d *schema.ResourceData, m in return diags } -func resourceLbCertificateUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbCertificateUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -268,7 +268,7 @@ func resourceLbCertificateUpdate(ctx context.Context, d *schema.ResourceData, m return resourceLbCertificateRead(ctx, d, m) } -func resourceLbCertificateDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbCertificateDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, id, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/certificate_data_source.go b/internal/services/lb/certificate_data_source.go index 63c7e60132..2633352271 100644 --- a/internal/services/lb/certificate_data_source.go +++ b/internal/services/lb/certificate_data_source.go @@ -35,7 +35,7 @@ func DataSourceCertificate() *schema.Resource { } } -func DataSourceLbCertificateRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceLbCertificateRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/data_source_lb_frontends.go b/internal/services/lb/data_source_lb_frontends.go index 3b08f7f289..f3b84367cc 100644 --- a/internal/services/lb/data_source_lb_frontends.go +++ b/internal/services/lb/data_source_lb_frontends.go @@ -84,7 +84,7 @@ func DataSourceFrontends() *schema.Resource { } } -func DataSourceLbFrontendsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceLbFrontendsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -104,10 +104,10 @@ func DataSourceLbFrontendsRead(ctx context.Context, d *schema.ResourceData, m in return diag.FromErr(err) } - frontends := []interface{}(nil) + frontends := []any(nil) for _, frontend := range res.Frontends { - rawFrontend := make(map[string]interface{}) + rawFrontend := make(map[string]any) rawFrontend["id"] = zonal.NewIDString(zone, frontend.ID) rawFrontend["name"] = frontend.Name rawFrontend["lb_id"] = zonal.NewIDString(zone, frontend.LB.ID) diff --git a/internal/services/lb/data_source_lb_ip.go b/internal/services/lb/data_source_lb_ip.go index 71c3657047..c39a4f0e96 100644 --- a/internal/services/lb/data_source_lb_ip.go +++ b/internal/services/lb/data_source_lb_ip.go @@ -43,7 +43,7 @@ func DataSourceIP() *schema.Resource { } } -func DataSourceLbIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceLbIPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/frontend.go b/internal/services/lb/frontend.go index d55c03e022..d25e9e9668 100644 --- a/internal/services/lb/frontend.go +++ b/internal/services/lb/frontend.go @@ -227,7 +227,7 @@ func ResourceFrontend() *schema.Resource { } } -func resourceLbFrontendCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbFrontendCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, _, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -299,7 +299,7 @@ func resourceLbFrontendCreate(ctx context.Context, d *schema.ResourceData, m int return resourceLbFrontendUpdate(ctx, d, m) } -func resourceLbFrontendRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbFrontendRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -353,12 +353,12 @@ func resourceLbFrontendRead(ctx context.Context, d *schema.ResourceData, m inter return nil } -func flattenLBACLs(acls []*lbSDK.ACL) interface{} { +func flattenLBACLs(acls []*lbSDK.ACL) any { sort.Slice(acls, func(i, j int) bool { return acls[i].Index < acls[j].Index }) - rawACLs := make([]interface{}, 0, len(acls)) + rawACLs := make([]any, 0, len(acls)) for _, apiACL := range acls { rawACLs = append(rawACLs, flattenLbACL(apiACL)) } @@ -441,8 +441,8 @@ func resourceLbFrontendUpdateACL(ctx context.Context, d *schema.ResourceData, lb return nil } -func expandsLBACLs(raw interface{}) []*lbSDK.ACL { - d := raw.([]interface{}) +func expandsLBACLs(raw any) []*lbSDK.ACL { + d := raw.([]any) newACL := make([]*lbSDK.ACL, 0) for _, rawACL := range d { @@ -452,7 +452,7 @@ func expandsLBACLs(raw interface{}) []*lbSDK.ACL { return newACL } -func resourceLbFrontendUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbFrontendUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -505,7 +505,7 @@ func resourceLbFrontendUpdate(ctx context.Context, d *schema.ResourceData, m int return resourceLbFrontendRead(ctx, d, m) } -func resourceLbFrontendDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbFrontendDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/frontend_data_source.go b/internal/services/lb/frontend_data_source.go index 645141bed3..ab809edfe8 100644 --- a/internal/services/lb/frontend_data_source.go +++ b/internal/services/lb/frontend_data_source.go @@ -35,7 +35,7 @@ func DataSourceFrontend() *schema.Resource { } } -func DataSourceLbFrontendRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceLbFrontendRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/helpers_lb.go b/internal/services/lb/helpers_lb.go index e3ad22aed0..5381ec471a 100644 --- a/internal/services/lb/helpers_lb.go +++ b/internal/services/lb/helpers_lb.go @@ -28,7 +28,7 @@ const ( ) // lbAPIWithZone returns an lb API WITH zone for a Create request -func lbAPIWithZone(d *schema.ResourceData, m interface{}) (*lbSDK.ZonedAPI, scw.Zone, error) { +func lbAPIWithZone(d *schema.ResourceData, m any) (*lbSDK.ZonedAPI, scw.Zone, error) { lbAPI := lbSDK.NewZonedAPI(meta.ExtractScwClient(m)) zone, err := meta.ExtractZone(d, m) @@ -40,7 +40,7 @@ func lbAPIWithZone(d *schema.ResourceData, m interface{}) (*lbSDK.ZonedAPI, scw. } // NewAPIWithZoneAndID returns an lb API with zone and ID extracted from the state -func NewAPIWithZoneAndID(m interface{}, id string) (*lbSDK.ZonedAPI, scw.Zone, string, error) { +func NewAPIWithZoneAndID(m any, id string) (*lbSDK.ZonedAPI, scw.Zone, string, error) { lbAPI := lbSDK.NewZonedAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) @@ -110,7 +110,7 @@ func lbUpgradeV1SchemaType() cty.Type { } // lbUpgradeV1UpgradeFunc allow upgrade the from regional to a zoned resource. -func UpgradeStateV1Func(_ context.Context, rawState map[string]interface{}, _ interface{}) (map[string]interface{}, error) { +func UpgradeStateV1Func(_ context.Context, rawState map[string]any, _ any) (map[string]any, error) { var err error // element id: upgrade ID, exist := rawState["id"] @@ -151,16 +151,16 @@ func ipv4Match(cidr, ipStr string) bool { return cidrNet.Contains(ip) } -func lbPrivateNetworkSetHash(v interface{}) int { +func lbPrivateNetworkSetHash(v any) int { var buf bytes.Buffer - m := v.(map[string]interface{}) + m := v.(map[string]any) if pnID, ok := m["private_network_id"]; ok { buf.WriteString(locality.ExpandID(pnID)) } - if staticConfig, ok := m["static_config"]; ok && len(staticConfig.([]interface{})) > 0 { - for _, item := range staticConfig.([]interface{}) { + if staticConfig, ok := m["static_config"]; ok && len(staticConfig.([]any)) > 0 { + for _, item := range staticConfig.([]any) { buf.WriteString(item.(string)) } } @@ -195,16 +195,16 @@ func normalizeIPSubnet(ip string) string { return ip } -func customizeDiffLBIPIDs(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { +func customizeDiffLBIPIDs(_ context.Context, diff *schema.ResourceDiff, _ any) error { oldIPIDs, newIPIDs := diff.GetChange("ip_ids") oldIPIDsSet := make(map[string]struct{}) newIPIDsSet := make(map[string]struct{}) - for _, id := range oldIPIDs.([]interface{}) { + for _, id := range oldIPIDs.([]any) { oldIPIDsSet[id.(string)] = struct{}{} } - for _, id := range newIPIDs.([]interface{}) { + for _, id := range newIPIDs.([]any) { newIPIDsSet[id.(string)] = struct{}{} } @@ -218,7 +218,7 @@ func customizeDiffLBIPIDs(_ context.Context, diff *schema.ResourceDiff, _ interf return nil } -func customizeDiffAssignFlexibleIPv6(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { +func customizeDiffAssignFlexibleIPv6(_ context.Context, diff *schema.ResourceDiff, _ any) error { oldValue, newValue := diff.GetChange("assign_flexible_ipv6") if oldValue.(bool) && !newValue.(bool) { return diff.ForceNew("assign_flexible_ipv6") diff --git a/internal/services/lb/ip.go b/internal/services/lb/ip.go index 7d8bd57c72..809a4b9bc5 100644 --- a/internal/services/lb/ip.go +++ b/internal/services/lb/ip.go @@ -76,7 +76,7 @@ func ResourceIP() *schema.Resource { } } -func resourceLbIPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbIPCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -105,7 +105,7 @@ func resourceLbIPCreate(ctx context.Context, d *schema.ResourceData, m interface return resourceLbIPRead(ctx, d, m) } -func resourceLbIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbIPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -168,7 +168,7 @@ func resourceLbIPRead(ctx context.Context, d *schema.ResourceData, m interface{} return nil } -func resourceLbIPUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbIPUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -257,7 +257,7 @@ func resourceLbIPUpdate(ctx context.Context, d *schema.ResourceData, m interface } //gocyclo:ignore -func resourceLbIPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbIPDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/ips_data_source.go b/internal/services/lb/ips_data_source.go index 4d900a5f7c..8051b1383b 100644 --- a/internal/services/lb/ips_data_source.go +++ b/internal/services/lb/ips_data_source.go @@ -83,7 +83,7 @@ func DataSourceIPs() *schema.Resource { } } -func DataSourceLbIPsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceLbIPsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -111,10 +111,10 @@ func DataSourceLbIPsRead(ctx context.Context, d *schema.ResourceData, m interfac filteredList = res.IPs } - ips := []interface{}(nil) + ips := []any(nil) for _, ip := range filteredList { - rawIP := make(map[string]interface{}) + rawIP := make(map[string]any) rawIP["id"] = zonal.NewID(ip.Zone, ip.ID).String() rawIP["ip_address"] = ip.IPAddress rawIP["lb_id"] = types.FlattenStringPtr(ip.LBID) diff --git a/internal/services/lb/lb.go b/internal/services/lb/lb.go index ccbe5b94e8..bdc6b28086 100644 --- a/internal/services/lb/lb.go +++ b/internal/services/lb/lb.go @@ -228,7 +228,7 @@ func ResourceLb() *schema.Resource { } } -func resourceLbCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -248,7 +248,7 @@ func resourceLbCreate(ctx context.Context, d *schema.ResourceData, m interface{} } if tags, ok := d.GetOk("tags"); ok { - for _, tag := range tags.([]interface{}) { + for _, tag := range tags.([]any) { createReq.Tags = append(createReq.Tags, tag.(string)) } } @@ -288,7 +288,7 @@ func resourceLbCreate(ctx context.Context, d *schema.ResourceData, m interface{} return resourceLbRead(ctx, d, m) } -func resourceLbRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -360,7 +360,7 @@ func resourceLbRead(ctx context.Context, d *schema.ResourceData, m interface{}) privateNetworkIDs = append(privateNetworkIDs, pn.PrivateNetworkID) } - allPrivateIPs := []map[string]interface{}(nil) + allPrivateIPs := []map[string]any(nil) resourceType := ipamAPI.ResourceTypeLBServer for _, privateNetworkID := range privateNetworkIDs { @@ -385,7 +385,7 @@ func resourceLbRead(ctx context.Context, d *schema.ResourceData, m interface{}) } //gocyclo:ignore -func resourceLbUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -439,11 +439,11 @@ func resourceLbUpdate(ctx context.Context, d *schema.ResourceData, m interface{} oldIPIDsSet := make(map[string]struct{}) newIPIDsSet := make(map[string]struct{}) - for _, id := range oldIPIDs.([]interface{}) { + for _, id := range oldIPIDs.([]any) { oldIPIDsSet[id.(string)] = struct{}{} } - for _, id := range newIPIDs.([]interface{}) { + for _, id := range newIPIDs.([]any) { newIPIDsSet[id.(string)] = struct{}{} } @@ -602,7 +602,7 @@ func resourceLbUpdate(ctx context.Context, d *schema.ResourceData, m interface{} return resourceLbRead(ctx, d, m) } -func resourceLbDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/lb_data_source.go b/internal/services/lb/lb_data_source.go index bdecd56aa3..08d75abf4b 100644 --- a/internal/services/lb/lb_data_source.go +++ b/internal/services/lb/lb_data_source.go @@ -40,7 +40,7 @@ func DataSourceLb() *schema.Resource { } } -func DataSourceLbRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceLbRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/lb_test.go b/internal/services/lb/lb_test.go index b2851ed504..e4195dd0b3 100644 --- a/internal/services/lb/lb_test.go +++ b/internal/services/lb/lb_test.go @@ -583,10 +583,10 @@ func isLbDestroyed(tt *acctest.TestTools) resource.TestCheckFunc { } func TestLbUpgradeV1SchemaUpgradeFunc(t *testing.T) { - v0Schema := map[string]interface{}{ + v0Schema := map[string]any{ "id": "fr-par/22c61530-834c-4ab4-aa71-aaaa2ac9d45a", } - v1Schema := map[string]interface{}{ + v1Schema := map[string]any{ "id": "fr-par-1/22c61530-834c-4ab4-aa71-aaaa2ac9d45a", } diff --git a/internal/services/lb/lbs_data_source.go b/internal/services/lb/lbs_data_source.go index ccce7fe064..740687860b 100644 --- a/internal/services/lb/lbs_data_source.go +++ b/internal/services/lb/lbs_data_source.go @@ -162,7 +162,7 @@ func DataSourceLbs() *schema.Resource { } } -func DataSourceLbsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceLbsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -178,10 +178,10 @@ func DataSourceLbsRead(ctx context.Context, d *schema.ResourceData, m interface{ return diag.FromErr(err) } - lbs := []interface{}(nil) + lbs := []any(nil) for _, loadbalancer := range res.LBs { - rawLb := make(map[string]interface{}) + rawLb := make(map[string]any) rawLb["id"] = zonal.NewID(loadbalancer.Zone, loadbalancer.ID).String() rawLb["description"] = loadbalancer.Description rawLb["zone"] = string(zone) diff --git a/internal/services/lb/route.go b/internal/services/lb/route.go index 3025ee0dfe..d6e3679c33 100644 --- a/internal/services/lb/route.go +++ b/internal/services/lb/route.go @@ -81,7 +81,7 @@ func ResourceRoute() *schema.Resource { } } -func resourceLbRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbRouteCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, _, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -123,7 +123,7 @@ func resourceLbRouteCreate(ctx context.Context, d *schema.ResourceData, m interf return resourceLbRouteRead(ctx, d, m) } -func resourceLbRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbRouteRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -155,7 +155,7 @@ func resourceLbRouteRead(ctx context.Context, d *schema.ResourceData, m interfac return nil } -func resourceLbRouteUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbRouteUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -190,7 +190,7 @@ func resourceLbRouteUpdate(ctx context.Context, d *schema.ResourceData, m interf return resourceLbRouteRead(ctx, d, m) } -func resourceLbRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceLbRouteDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/route_data_source.go b/internal/services/lb/route_data_source.go index a253ebcc6d..da34eae17e 100644 --- a/internal/services/lb/route_data_source.go +++ b/internal/services/lb/route_data_source.go @@ -26,7 +26,7 @@ func DataSourceRoute() *schema.Resource { } } -func DataSourceLbRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceLbRouteRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { _, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/lb/routes_data_source.go b/internal/services/lb/routes_data_source.go index e7e03a02db..7b684d4b7e 100644 --- a/internal/services/lb/routes_data_source.go +++ b/internal/services/lb/routes_data_source.go @@ -68,7 +68,7 @@ func DataSourceRoutes() *schema.Resource { } } -func DataSourceLbRoutesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceLbRoutesRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -87,10 +87,10 @@ func DataSourceLbRoutesRead(ctx context.Context, d *schema.ResourceData, m inter return diag.FromErr(err) } - routes := []interface{}(nil) + routes := []any(nil) for _, route := range res.Routes { - rawRoute := make(map[string]interface{}) + rawRoute := make(map[string]any) rawRoute["id"] = zonal.NewID(zone, route.ID).String() rawRoute["frontend_id"] = route.FrontendID rawRoute["backend_id"] = route.BackendID diff --git a/internal/services/lb/types.go b/internal/services/lb/types.go index 7ed645be31..36f3d36b79 100644 --- a/internal/services/lb/types.go +++ b/internal/services/lb/types.go @@ -18,12 +18,12 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func flattenPrivateNetworkConfigs(privateNetworks []*lb.PrivateNetwork) interface{} { +func flattenPrivateNetworkConfigs(privateNetworks []*lb.PrivateNetwork) any { if len(privateNetworks) == 0 || privateNetworks == nil { return nil } - pnI := []map[string]interface{}(nil) + pnI := []map[string]any(nil) var dhcpConfigExist bool @@ -38,7 +38,7 @@ func flattenPrivateNetworkConfigs(privateNetworks []*lb.PrivateNetwork) interfac } pnRegionalID := regional.NewIDString(pnRegion, pn.PrivateNetworkID) - pnI = append(pnI, map[string]interface{}{ + pnI = append(pnI, map[string]any{ "private_network_id": pnRegionalID, "dhcp_config": dhcpConfigExist, "status": pn.Status.String(), @@ -51,12 +51,12 @@ func flattenPrivateNetworkConfigs(privateNetworks []*lb.PrivateNetwork) interfac return pnI } -func flattenLbACLMatch(match *lb.ACLMatch) interface{} { +func flattenLbACLMatch(match *lb.ACLMatch) any { if match == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "ip_subnet": types.FlattenSliceStringPtr(match.IPSubnet), "http_filter": match.HTTPFilter.String(), @@ -67,15 +67,15 @@ func flattenLbACLMatch(match *lb.ACLMatch) interface{} { } } -func expandLbACLMatch(raw interface{}) *lb.ACLMatch { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandLbACLMatch(raw any) *lb.ACLMatch { + if raw == nil || len(raw.([]any)) != 1 { return nil } - rawMap := raw.([]interface{})[0].(map[string]interface{}) + rawMap := raw.([]any)[0].(map[string]any) // scaleway api require ip subnet, so if we did not specify one, just put 0.0.0.0/0 instead - ipSubnet := types.ExpandSliceStringPtr(rawMap["ip_subnet"].([]interface{})) + ipSubnet := types.ExpandSliceStringPtr(rawMap["ip_subnet"].([]any)) if len(ipSubnet) == 0 { ipSubnet = []*string{types.ExpandStringPtr("0.0.0.0/0")} } @@ -83,13 +83,13 @@ func expandLbACLMatch(raw interface{}) *lb.ACLMatch { return &lb.ACLMatch{ IPSubnet: ipSubnet, HTTPFilter: lb.ACLHTTPFilter(rawMap["http_filter"].(string)), - HTTPFilterValue: types.ExpandSliceStringPtr(rawMap["http_filter_value"].([]interface{})), + HTTPFilterValue: types.ExpandSliceStringPtr(rawMap["http_filter_value"].([]any)), HTTPFilterOption: types.ExpandStringPtr(rawMap["http_filter_option"].(string)), Invert: rawMap["invert"].(bool), } } -func expandLbBackendMarkdownAction(raw interface{}) lb.OnMarkedDownAction { +func expandLbBackendMarkdownAction(raw any) lb.OnMarkedDownAction { if raw == "none" { return lb.OnMarkedDownActionOnMarkedDownActionNone } @@ -97,54 +97,54 @@ func expandLbBackendMarkdownAction(raw interface{}) lb.OnMarkedDownAction { return lb.OnMarkedDownAction(raw.(string)) } -func flattenLbProtocol(protocol lb.Protocol) interface{} { +func flattenLbProtocol(protocol lb.Protocol) any { return protocol.String() } -func expandLbProtocol(raw interface{}) lb.Protocol { +func expandLbProtocol(raw any) lb.Protocol { return lb.Protocol(raw.(string)) } -func flattenLbForwardPortAlgorithm(algo lb.ForwardPortAlgorithm) interface{} { +func flattenLbForwardPortAlgorithm(algo lb.ForwardPortAlgorithm) any { return algo.String() } -func expandLbForwardPortAlgorithm(raw interface{}) lb.ForwardPortAlgorithm { +func expandLbForwardPortAlgorithm(raw any) lb.ForwardPortAlgorithm { return lb.ForwardPortAlgorithm(raw.(string)) } -func flattenLbStickySessionsType(t lb.StickySessionsType) interface{} { +func flattenLbStickySessionsType(t lb.StickySessionsType) any { return t.String() } -func expandLbStickySessionsType(raw interface{}) lb.StickySessionsType { +func expandLbStickySessionsType(raw any) lb.StickySessionsType { return lb.StickySessionsType(raw.(string)) } -func flattenLbHCTCP(config *lb.HealthCheckTCPConfig) interface{} { +func flattenLbHCTCP(config *lb.HealthCheckTCPConfig) any { if config == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ {}, } } -func expandLbHCTCP(raw interface{}) *lb.HealthCheckTCPConfig { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandLbHCTCP(raw any) *lb.HealthCheckTCPConfig { + if raw == nil || len(raw.([]any)) != 1 { return nil } return &lb.HealthCheckTCPConfig{} } -func flattenLbHCHTTP(config *lb.HealthCheckHTTPConfig) interface{} { +func flattenLbHCHTTP(config *lb.HealthCheckHTTPConfig) any { if config == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "uri": config.URI, "method": config.Method, @@ -154,12 +154,12 @@ func flattenLbHCHTTP(config *lb.HealthCheckHTTPConfig) interface{} { } } -func expandLbHCHTTP(raw interface{}) *lb.HealthCheckHTTPConfig { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandLbHCHTTP(raw any) *lb.HealthCheckHTTPConfig { + if raw == nil || len(raw.([]any)) != 1 { return nil } - rawMap := raw.([]interface{})[0].(map[string]interface{}) + rawMap := raw.([]any)[0].(map[string]any) return &lb.HealthCheckHTTPConfig{ URI: rawMap["uri"].(string), @@ -169,12 +169,12 @@ func expandLbHCHTTP(raw interface{}) *lb.HealthCheckHTTPConfig { } } -func flattenLbHCHTTPS(config *lb.HealthCheckHTTPSConfig) interface{} { +func flattenLbHCHTTPS(config *lb.HealthCheckHTTPSConfig) any { if config == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "uri": config.URI, "method": config.Method, @@ -185,12 +185,12 @@ func flattenLbHCHTTPS(config *lb.HealthCheckHTTPSConfig) interface{} { } } -func expandLbHCHTTPS(raw interface{}) *lb.HealthCheckHTTPSConfig { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandLbHCHTTPS(raw any) *lb.HealthCheckHTTPSConfig { + if raw == nil || len(raw.([]any)) != 1 { return nil } - rawMap := raw.([]interface{})[0].(map[string]interface{}) + rawMap := raw.([]any)[0].(map[string]any) return &lb.HealthCheckHTTPSConfig{ URI: rawMap["uri"].(string), @@ -201,13 +201,13 @@ func expandLbHCHTTPS(raw interface{}) *lb.HealthCheckHTTPSConfig { } } -func expandLbLetsEncrypt(raw interface{}) *lb.CreateCertificateRequestLetsencryptConfig { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandLbLetsEncrypt(raw any) *lb.CreateCertificateRequestLetsencryptConfig { + if raw == nil || len(raw.([]any)) != 1 { return nil } - rawMap := raw.([]interface{})[0].(map[string]interface{}) - alternativeNames := rawMap["subject_alternative_name"].([]interface{}) + rawMap := raw.([]any)[0].(map[string]any) + alternativeNames := rawMap["subject_alternative_name"].([]any) config := &lb.CreateCertificateRequestLetsencryptConfig{ CommonName: rawMap["common_name"].(string), } @@ -219,12 +219,12 @@ func expandLbLetsEncrypt(raw interface{}) *lb.CreateCertificateRequestLetsencryp return config } -func expandLbCustomCertificate(raw interface{}) *lb.CreateCertificateRequestCustomCertificate { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandLbCustomCertificate(raw any) *lb.CreateCertificateRequestCustomCertificate { + if raw == nil || len(raw.([]any)) != 1 { return nil } - rawMap := raw.([]interface{})[0].(map[string]interface{}) + rawMap := raw.([]any)[0].(map[string]any) config := &lb.CreateCertificateRequestCustomCertificate{ CertificateChain: rawMap["certificate_chain"].(string), } @@ -232,15 +232,15 @@ func expandLbCustomCertificate(raw interface{}) *lb.CreateCertificateRequestCust return config } -func expandLbProxyProtocol(raw interface{}) lb.ProxyProtocol { +func expandLbProxyProtocol(raw any) lb.ProxyProtocol { return lb.ProxyProtocol("proxy_protocol_" + raw.(string)) } -func flattenLbProxyProtocol(pp lb.ProxyProtocol) interface{} { +func flattenLbProxyProtocol(pp lb.ProxyProtocol) any { return strings.TrimPrefix(pp.String(), "proxy_protocol_") } -func flattenLbBackendMarkdownAction(action lb.OnMarkedDownAction) interface{} { +func flattenLbBackendMarkdownAction(action lb.OnMarkedDownAction) any { if action == lb.OnMarkedDownActionOnMarkedDownActionNone { return "none" } @@ -248,8 +248,8 @@ func flattenLbBackendMarkdownAction(action lb.OnMarkedDownAction) interface{} { return action.String() } -func flattenLbACL(acl *lb.ACL) interface{} { - res := map[string]interface{}{ +func flattenLbACL(acl *lb.ACL) any { + res := map[string]any{ "name": acl.Name, "match": flattenLbACLMatch(acl.Match), "action": flattenLbACLAction(acl.Action), @@ -259,8 +259,8 @@ func flattenLbACL(acl *lb.ACL) interface{} { } // expandLbACL transforms a state acl to an api one. -func expandLbACL(i interface{}) *lb.ACL { - rawRule := i.(map[string]interface{}) +func expandLbACL(i any) *lb.ACL { + rawRule := i.(map[string]any) acl := &lb.ACL{ Name: rawRule["name"].(string), Description: rawRule["description"].(string), @@ -282,8 +282,8 @@ func expandLbACL(i interface{}) *lb.ACL { return acl } -func flattenLbACLAction(action *lb.ACLAction) interface{} { - return []map[string]interface{}{ +func flattenLbACLAction(action *lb.ACLAction) any { + return []map[string]any{ { "type": action.Type, "redirect": flattenLbACLActionRedirect(action.Redirect), @@ -291,12 +291,12 @@ func flattenLbACLAction(action *lb.ACLAction) interface{} { } } -func expandLbACLAction(raw interface{}) *lb.ACLAction { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandLbACLAction(raw any) *lb.ACLAction { + if raw == nil || len(raw.([]any)) != 1 { return nil } - rawMap := raw.([]interface{})[0].(map[string]interface{}) + rawMap := raw.([]any)[0].(map[string]any) return &lb.ACLAction{ Type: lb.ACLActionType(rawMap["type"].(string)), @@ -304,12 +304,12 @@ func expandLbACLAction(raw interface{}) *lb.ACLAction { } } -func flattenLbACLActionRedirect(redirect *lb.ACLActionRedirect) interface{} { +func flattenLbACLActionRedirect(redirect *lb.ACLActionRedirect) any { if redirect == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "type": redirect.Type, "target": redirect.Target, @@ -318,12 +318,12 @@ func flattenLbACLActionRedirect(redirect *lb.ACLActionRedirect) interface{} { } } -func expandLbACLActionRedirect(raw interface{}) *lb.ACLActionRedirect { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandLbACLActionRedirect(raw any) *lb.ACLActionRedirect { + if raw == nil || len(raw.([]any)) != 1 { return nil } - rawMap := raw.([]interface{})[0].(map[string]interface{}) + rawMap := raw.([]any)[0].(map[string]any) return &lb.ACLActionRedirect{ Type: lb.ACLActionRedirectRedirectType(rawMap["type"].(string)), @@ -332,7 +332,7 @@ func expandLbACLActionRedirect(raw interface{}) *lb.ACLActionRedirect { } } -func expandPrivateNetworks(data interface{}) ([]*lb.PrivateNetwork, error) { +func expandPrivateNetworks(data any) ([]*lb.PrivateNetwork, error) { if data == nil { return nil, nil } @@ -340,11 +340,11 @@ func expandPrivateNetworks(data interface{}) ([]*lb.PrivateNetwork, error) { pns := []*lb.PrivateNetwork(nil) for _, pn := range data.(*schema.Set).List() { - rawPn := pn.(map[string]interface{}) + rawPn := pn.(map[string]any) privateNetwork := &lb.PrivateNetwork{} privateNetwork.PrivateNetworkID = locality.ExpandID(rawPn["private_network_id"].(string)) - if staticConfig, hasStaticConfig := rawPn["static_config"]; hasStaticConfig && len(staticConfig.([]interface{})) > 0 { + if staticConfig, hasStaticConfig := rawPn["static_config"]; hasStaticConfig && len(staticConfig.([]any)) > 0 { privateNetwork.StaticConfig = expandLbPrivateNetworkStaticConfig(staticConfig) //nolint:staticcheck } else { privateNetwork.DHCPConfig = expandLbPrivateNetworkDHCPConfig(rawPn["dhcp_config"]) //nolint:staticcheck @@ -358,8 +358,8 @@ func expandPrivateNetworks(data interface{}) ([]*lb.PrivateNetwork, error) { return pns, nil } -func expandLbPrivateNetworkStaticConfig(raw interface{}) *lb.PrivateNetworkStaticConfig { - if raw == nil || len(raw.([]interface{})) < 1 { +func expandLbPrivateNetworkStaticConfig(raw any) *lb.PrivateNetworkStaticConfig { + if raw == nil || len(raw.([]any)) < 1 { return nil } @@ -376,7 +376,7 @@ func flattenLbPrivateNetworkStaticConfig(cfg *lb.PrivateNetworkStaticConfig) []s return *cfg.IPAddress //nolint:staticcheck } -func expandLbPrivateNetworkDHCPConfig(raw interface{}) *lb.PrivateNetworkDHCPConfig { +func expandLbPrivateNetworkDHCPConfig(raw any) *lb.PrivateNetworkDHCPConfig { if raw == nil || !raw.(bool) { return nil } @@ -427,14 +427,14 @@ func attachLBPrivateNetworks(ctx context.Context, lbAPI *lb.ZonedAPI, zone scw.Z return privateNetworks, nil } -func flattenLbInstances(instances []*lb.Instance) interface{} { +func flattenLbInstances(instances []*lb.Instance) any { if instances == nil { return nil } - flattenedInstances := []map[string]interface{}(nil) + flattenedInstances := []map[string]any(nil) for _, instance := range instances { - flattenedInstances = append(flattenedInstances, map[string]interface{}{ + flattenedInstances = append(flattenedInstances, map[string]any{ "id": instance.ID, "status": instance.Status.String(), "ip_address": instance.IPAddress, @@ -447,14 +447,14 @@ func flattenLbInstances(instances []*lb.Instance) interface{} { return flattenedInstances } -func flattenLbIPs(ips []*lb.IP) interface{} { +func flattenLbIPs(ips []*lb.IP) any { if ips == nil { return nil } - flattenedIPs := []map[string]interface{}(nil) + flattenedIPs := []map[string]any(nil) for _, ip := range ips { - flattenedIPs = append(flattenedIPs, map[string]interface{}{ + flattenedIPs = append(flattenedIPs, map[string]any{ "id": ip.ID, "ip_address": ip.IPAddress, "reverse": ip.Reverse, diff --git a/internal/services/marketplace/helpers.go b/internal/services/marketplace/helpers.go index 14244db7bd..879e5dc6ed 100644 --- a/internal/services/marketplace/helpers.go +++ b/internal/services/marketplace/helpers.go @@ -8,7 +8,7 @@ import ( ) // marketplaceAPIWithZone returns a new marketplace API and the zone for a Create request -func marketplaceAPIWithZone(d *schema.ResourceData, m interface{}) (*marketplace.API, scw.Zone, error) { +func marketplaceAPIWithZone(d *schema.ResourceData, m any) (*marketplace.API, scw.Zone, error) { marketplaceAPI := marketplace.NewAPI(meta.ExtractScwClient(m)) zone, err := meta.ExtractZone(d, m) diff --git a/internal/services/marketplace/image_data_source.go b/internal/services/marketplace/image_data_source.go index 2f6236739f..b1822af09a 100644 --- a/internal/services/marketplace/image_data_source.go +++ b/internal/services/marketplace/image_data_source.go @@ -39,7 +39,7 @@ func DataSourceImage() *schema.Resource { } } -func DataSourceMarketplaceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceMarketplaceImageRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { marketplaceAPI, zone, err := marketplaceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mnq/helpers_mnq.go b/internal/services/mnq/helpers_mnq.go index 91065c41a0..49c6766067 100644 --- a/internal/services/mnq/helpers_mnq.go +++ b/internal/services/mnq/helpers_mnq.go @@ -19,7 +19,7 @@ const ( AWSErrNonExistentQueue = "AWS.SimpleQueueService.NonExistentQueue" ) -func newMNQNatsAPI(d *schema.ResourceData, m interface{}) (*mnq.NatsAPI, scw.Region, error) { +func newMNQNatsAPI(d *schema.ResourceData, m any) (*mnq.NatsAPI, scw.Region, error) { api := mnq.NewNatsAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -30,7 +30,7 @@ func newMNQNatsAPI(d *schema.ResourceData, m interface{}) (*mnq.NatsAPI, scw.Reg return api, region, nil } -func NewNatsAPIWithRegionAndID(m interface{}, regionalID string) (*mnq.NatsAPI, scw.Region, string, error) { +func NewNatsAPIWithRegionAndID(m any, regionalID string) (*mnq.NatsAPI, scw.Region, string, error) { api := mnq.NewNatsAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionalID) @@ -52,7 +52,7 @@ func newSQSAPI(d *schema.ResourceData, m any) (*mnq.SqsAPI, scw.Region, error) { return api, region, nil } -func NewSQSAPIWithRegionAndID(m interface{}, regionalID string) (*mnq.SqsAPI, scw.Region, string, error) { +func NewSQSAPIWithRegionAndID(m any, regionalID string) (*mnq.SqsAPI, scw.Region, string, error) { api := mnq.NewSqsAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionalID) @@ -74,7 +74,7 @@ func newMNQSNSAPI(d *schema.ResourceData, m any) (*mnq.SnsAPI, scw.Region, error return api, region, nil } -func NewSNSAPIWithRegionAndID(m interface{}, regionalID string) (*mnq.SnsAPI, scw.Region, string, error) { +func NewSNSAPIWithRegionAndID(m any, regionalID string) (*mnq.SnsAPI, scw.Region, string, error) { api := mnq.NewSnsAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionalID) @@ -173,15 +173,15 @@ func ComposeSNSARN(region scw.Region, projectID string, resourceName string) str } // Set the value inside values at the resource path (e.g. a.0.b sets b's value) -func setResourceValue(values map[string]interface{}, resourcePath string, value interface{}, resourceSchemas map[string]*schema.Schema) { +func setResourceValue(values map[string]any, resourcePath string, value any, resourceSchemas map[string]*schema.Schema) { parts := strings.Split(resourcePath, ".") if len(parts) > 1 { // Terraform's nested objects are represented as slices of maps if _, ok := values[parts[0]]; !ok { - values[parts[0]] = []interface{}{make(map[string]interface{})} + values[parts[0]] = []any{make(map[string]any)} } - setResourceValue(values[parts[0]].([]interface{})[0].(map[string]interface{}), strings.Join(parts[2:], "."), value, resourceSchemas[parts[0]].Elem.(*schema.Resource).Schema) + setResourceValue(values[parts[0]].([]any)[0].(map[string]any), strings.Join(parts[2:], "."), value, resourceSchemas[parts[0]].Elem.(*schema.Resource).Schema) return } @@ -204,7 +204,7 @@ func resolveSchemaPath(resourcePath string, resourceSchemas map[string]*schema.S } // Sets a specific SNS attribute from the resource data -func awsResourceDataToAttribute(awsAttributes map[string]string, awsAttribute string, resourceValue interface{}, resourcePath string, resourceSchemas map[string]*schema.Schema) error { +func awsResourceDataToAttribute(awsAttributes map[string]string, awsAttribute string, resourceValue any, resourcePath string, resourceSchemas map[string]*schema.Schema) error { resourceSchema := resolveSchemaPath(resourcePath, resourceSchemas) if resourceSchema == nil { return fmt.Errorf("unable to resolve schema for %s", resourcePath) @@ -250,7 +250,7 @@ func awsResourceDataToAttributes(d *schema.ResourceData, resourceSchemas map[str } // awsAttributeToResourceData sets a specific resource data from the given attribute -func awsAttributeToResourceData(values map[string]interface{}, value string, resourcePath string, resourceSchemas map[string]*schema.Schema) error { +func awsAttributeToResourceData(values map[string]any, value string, resourcePath string, resourceSchemas map[string]*schema.Schema) error { resourceSchema := resolveSchemaPath(resourcePath, resourceSchemas) if resourceSchema == nil { return fmt.Errorf("unable to resolve schema for %s", resourcePath) @@ -273,8 +273,8 @@ func awsAttributeToResourceData(values map[string]interface{}, value string, res } // awsAttributesToResourceData returns a map of valid values for a terraform schema from an attributes map and a conversion map -func awsAttributesToResourceData(attributes map[string]string, resourceSchemas map[string]*schema.Schema, attributesToResourceMap map[string]string) (map[string]interface{}, error) { - values := make(map[string]interface{}) +func awsAttributesToResourceData(attributes map[string]string, resourceSchemas map[string]*schema.Schema, attributesToResourceMap map[string]string) (map[string]any, error) { + values := make(map[string]any) for attribute, resourcePath := range attributesToResourceMap { if value, ok := attributes[attribute]; ok { diff --git a/internal/services/mnq/helpers_mnq_queue.go b/internal/services/mnq/helpers_mnq_queue.go index c97ae5ac8a..ba5fc9088f 100644 --- a/internal/services/mnq/helpers_mnq_queue.go +++ b/internal/services/mnq/helpers_mnq_queue.go @@ -37,13 +37,13 @@ const ( type httpDebugLogger struct{} -func (h *httpDebugLogger) Logf(classification smithylogging.Classification, format string, v ...interface{}) { +func (h *httpDebugLogger) Logf(classification smithylogging.Classification, format string, v ...any) { if classification == smithylogging.Debug { log.Printf("[HTTP DEBUG] %s", fmt.Sprintf(format, v...)) } } -func SQSClientWithRegion(ctx context.Context, d *schema.ResourceData, m interface{}) (*sqs.Client, scw.Region, error) { +func SQSClientWithRegion(ctx context.Context, d *schema.ResourceData, m any) (*sqs.Client, scw.Region, error) { region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err @@ -86,7 +86,7 @@ func NewSQSClient(ctx context.Context, httpClient *http.Client, region string, e func NATSClientWithRegion( //nolint:ireturn,nolintlint d *schema.ResourceData, - m interface{}, + m any, ) (nats.JetStreamContext, scw.Region, error) { region, err := meta.ExtractRegion(d, m) if err != nil { @@ -168,7 +168,7 @@ func getSQSAttributeNames() []awstype.QueueAttributeName { return attributeNames } -func resourceMNQQueueName(name interface{}, prefix interface{}, isSQS bool, isSQSFifo bool) string { +func resourceMNQQueueName(name any, prefix any, isSQS bool, isSQSFifo bool) string { if value, ok := name.(string); ok && value != "" { return value } @@ -187,7 +187,7 @@ func resourceMNQQueueName(name interface{}, prefix interface{}, isSQS bool, isSQ return output } -func resourceMNQQueueCustomizeDiff(_ context.Context, d *schema.ResourceDiff, _ interface{}) error { +func resourceMNQQueueCustomizeDiff(_ context.Context, d *schema.ResourceDiff, _ any) error { isSQSFifo := d.Get("fifo_queue").(bool) var name string diff --git a/internal/services/mnq/helpers_mnq_sns.go b/internal/services/mnq/helpers_mnq_sns.go index 7270830140..fd57d634be 100644 --- a/internal/services/mnq/helpers_mnq_sns.go +++ b/internal/services/mnq/helpers_mnq_sns.go @@ -19,7 +19,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func SNSClientWithRegion(ctx context.Context, m interface{}, d *schema.ResourceData) (*sns.Client, scw.Region, error) { +func SNSClientWithRegion(ctx context.Context, m any, d *schema.ResourceData) (*sns.Client, scw.Region, error) { region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err @@ -37,7 +37,7 @@ func SNSClientWithRegion(ctx context.Context, m interface{}, d *schema.ResourceD return snsClient, region, err } -func SNSClientWithRegionFromID(ctx context.Context, d *schema.ResourceData, m interface{}, regionalID string) (*sns.Client, scw.Region, error) { +func SNSClientWithRegionFromID(ctx context.Context, d *schema.ResourceData, m any, regionalID string) (*sns.Client, scw.Region, error) { tab := strings.SplitN(regionalID, "/", 2) if len(tab) != 2 { return nil, "", errors.New("invalid ID format, expected parts separated by slashes") @@ -120,7 +120,7 @@ var ( } ) -func resourceMNQSNSTopicName(name interface{}, prefix interface{}, isSQS bool, isSQSFifo bool) string { +func resourceMNQSNSTopicName(name any, prefix any, isSQS bool, isSQSFifo bool) string { if value, ok := name.(string); ok && value != "" { return value } @@ -139,7 +139,7 @@ func resourceMNQSNSTopicName(name interface{}, prefix interface{}, isSQS bool, i return output } -func resourceMNQSSNSTopicCustomizeDiff(_ context.Context, d *schema.ResourceDiff, _ interface{}) error { +func resourceMNQSSNSTopicCustomizeDiff(_ context.Context, d *schema.ResourceDiff, _ any) error { isFifoTopic := d.Get("fifo_topic").(bool) var name string diff --git a/internal/services/mnq/nats_account.go b/internal/services/mnq/nats_account.go index d6111ff83c..7f4464fcf7 100644 --- a/internal/services/mnq/nats_account.go +++ b/internal/services/mnq/nats_account.go @@ -41,7 +41,7 @@ func ResourceNatsAccount() *schema.Resource { } } -func ResourceMNQNatsAccountCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQNatsAccountCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newMNQNatsAPI(d, m) if err != nil { return diag.FromErr(err) @@ -61,7 +61,7 @@ func ResourceMNQNatsAccountCreate(ctx context.Context, d *schema.ResourceData, m return ResourceMNQNatsAccountRead(ctx, d, m) } -func ResourceMNQNatsAccountRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQNatsAccountRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewNatsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -89,7 +89,7 @@ func ResourceMNQNatsAccountRead(ctx context.Context, d *schema.ResourceData, m i return nil } -func ResourceMNQNatsAccountUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQNatsAccountUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewNatsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -111,7 +111,7 @@ func ResourceMNQNatsAccountUpdate(ctx context.Context, d *schema.ResourceData, m return ResourceMNQNatsAccountRead(ctx, d, m) } -func ResourceMNQNatsAccountDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQNatsAccountDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewNatsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mnq/nats_credentials.go b/internal/services/mnq/nats_credentials.go index 51be2ed5b1..37906fa501 100644 --- a/internal/services/mnq/nats_credentials.go +++ b/internal/services/mnq/nats_credentials.go @@ -49,7 +49,7 @@ func ResourceNatsCredentials() *schema.Resource { } } -func ResourceMNQNatsCredentialsCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQNatsCredentialsCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newMNQNatsAPI(d, m) if err != nil { return diag.FromErr(err) @@ -71,7 +71,7 @@ func ResourceMNQNatsCredentialsCreate(ctx context.Context, d *schema.ResourceDat return ResourceMNQNatsCredentialsRead(ctx, d, m) } -func ResourceMNQNatsCredentialsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQNatsCredentialsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewNatsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -98,7 +98,7 @@ func ResourceMNQNatsCredentialsRead(ctx context.Context, d *schema.ResourceData, return nil } -func ResourceMNQNatsCredentialsDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQNatsCredentialsDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewNatsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mnq/sns.go b/internal/services/mnq/sns.go index ecb6cde9f3..a58f5a755b 100644 --- a/internal/services/mnq/sns.go +++ b/internal/services/mnq/sns.go @@ -32,7 +32,7 @@ func ResourceSNS() *schema.Resource { } } -func ResourceMNQSNSCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newMNQSNSAPI(d, m) if err != nil { return diag.FromErr(err) @@ -51,7 +51,7 @@ func ResourceMNQSNSCreate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceMNQSNSRead(ctx, d, m) } -func ResourceMNQSNSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewSNSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -72,7 +72,7 @@ func ResourceMNQSNSRead(ctx context.Context, d *schema.ResourceData, m interface return nil } -func ResourceMNQSNSDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewSNSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mnq/sns_credentials.go b/internal/services/mnq/sns_credentials.go index bd1286f6ad..fa7939a400 100644 --- a/internal/services/mnq/sns_credentials.go +++ b/internal/services/mnq/sns_credentials.go @@ -78,7 +78,7 @@ func ResourceSNSCredentials() *schema.Resource { } } -func ResourceMNQSNSCredentialsCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSCredentialsCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newMNQSNSAPI(d, m) if err != nil { return diag.FromErr(err) @@ -106,7 +106,7 @@ func ResourceMNQSNSCredentialsCreate(ctx context.Context, d *schema.ResourceData return ResourceMNQSNSCredentialsRead(ctx, d, m) } -func ResourceMNQSNSCredentialsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSCredentialsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewSNSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -141,7 +141,7 @@ func ResourceMNQSNSCredentialsRead(ctx context.Context, d *schema.ResourceData, return nil } -func ResourceMNQSNSCredentialsUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSCredentialsUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewSNSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -179,7 +179,7 @@ func ResourceMNQSNSCredentialsUpdate(ctx context.Context, d *schema.ResourceData return ResourceMNQSNSCredentialsRead(ctx, d, m) } -func ResourceMNQSNSCredentialsDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSCredentialsDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewSNSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mnq/sns_data_source.go b/internal/services/mnq/sns_data_source.go index 9acb124562..08fc636add 100644 --- a/internal/services/mnq/sns_data_source.go +++ b/internal/services/mnq/sns_data_source.go @@ -22,7 +22,7 @@ func DataSourceSNS() *schema.Resource { } } -func DataSourceMNQSNSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceMNQSNSRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newMNQSNSAPI(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mnq/sns_topic.go b/internal/services/mnq/sns_topic.go index dc58ec9ed5..2a427ef8b8 100644 --- a/internal/services/mnq/sns_topic.go +++ b/internal/services/mnq/sns_topic.go @@ -88,7 +88,7 @@ func ResourceSNSTopic() *schema.Resource { } } -func ResourceMNQSNSTopicCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSTopicCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newMNQSNSAPI(d, m) if err != nil { return diag.FromErr(err) @@ -139,7 +139,7 @@ func ResourceMNQSNSTopicCreate(ctx context.Context, d *schema.ResourceData, m in return ResourceMNQSNSTopicRead(ctx, d, m) } -func ResourceMNQSNSTopicRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSTopicRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { snsClient, _, err := SNSClientWithRegion(ctx, m, d) if err != nil { return diag.FromErr(err) @@ -172,7 +172,7 @@ func ResourceMNQSNSTopicRead(ctx context.Context, d *schema.ResourceData, m inte return nil } -func ResourceMNQSNSTopicUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSTopicUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { snsClient, _, err := SNSClientWithRegion(ctx, m, d) if err != nil { return diag.FromErr(err) @@ -220,7 +220,7 @@ func ResourceMNQSNSTopicUpdate(ctx context.Context, d *schema.ResourceData, m in return ResourceMNQSNSTopicRead(ctx, d, m) } -func ResourceMNQSNSTopicDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSTopicDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { snsClient, _, err := SNSClientWithRegion(ctx, m, d) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mnq/sns_topic_subscription.go b/internal/services/mnq/sns_topic_subscription.go index ce6e259a5c..91f3e88f27 100644 --- a/internal/services/mnq/sns_topic_subscription.go +++ b/internal/services/mnq/sns_topic_subscription.go @@ -89,7 +89,7 @@ func ResourceSNSTopicSubscription() *schema.Resource { } } -func ResourceMNQSNSTopicSubscriptionCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSTopicSubscriptionCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newMNQSNSAPI(d, m) if err != nil { return diag.FromErr(err) @@ -163,7 +163,7 @@ func ResourceMNQSNSTopicSubscriptionCreate(ctx context.Context, d *schema.Resour return ResourceMNQSNSTopicSubscriptionRead(ctx, d, m) } -func ResourceMNQSNSTopicSubscriptionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSTopicSubscriptionRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { snsClient, region, err := SNSClientWithRegionFromID(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -196,7 +196,7 @@ func ResourceMNQSNSTopicSubscriptionRead(ctx context.Context, d *schema.Resource return nil } -func ResourceMNQSNSTopicSubscriptionDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSNSTopicSubscriptionDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { snsClient, _, err := SNSClientWithRegionFromID(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mnq/sqs.go b/internal/services/mnq/sqs.go index b0eeaf0ca4..7d311ccd42 100644 --- a/internal/services/mnq/sqs.go +++ b/internal/services/mnq/sqs.go @@ -32,7 +32,7 @@ func ResourceSQS() *schema.Resource { } } -func ResourceMNQSQSCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSQSCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newSQSAPI(d, m) if err != nil { return diag.FromErr(err) @@ -51,7 +51,7 @@ func ResourceMNQSQSCreate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceMNQSQSRead(ctx, d, m) } -func ResourceMNQSQSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSQSRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewSQSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -72,7 +72,7 @@ func ResourceMNQSQSRead(ctx context.Context, d *schema.ResourceData, m interface return nil } -func ResourceMNQSQSDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSQSDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewSQSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mnq/sqs_credentials.go b/internal/services/mnq/sqs_credentials.go index 7fb871b693..bb688259ae 100644 --- a/internal/services/mnq/sqs_credentials.go +++ b/internal/services/mnq/sqs_credentials.go @@ -78,7 +78,7 @@ func ResourceSQSCredentials() *schema.Resource { } } -func ResourceMNQSQSCredentialsCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSQSCredentialsCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newSQSAPI(d, m) if err != nil { return diag.FromErr(err) @@ -106,7 +106,7 @@ func ResourceMNQSQSCredentialsCreate(ctx context.Context, d *schema.ResourceData return ResourceMNQSQSCredentialsRead(ctx, d, m) } -func ResourceMNQSQSCredentialsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSQSCredentialsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewSQSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -141,7 +141,7 @@ func ResourceMNQSQSCredentialsRead(ctx context.Context, d *schema.ResourceData, return nil } -func ResourceMNQSQSCredentialsUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSQSCredentialsUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewSQSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -179,7 +179,7 @@ func ResourceMNQSQSCredentialsUpdate(ctx context.Context, d *schema.ResourceData return ResourceMNQSQSCredentialsRead(ctx, d, m) } -func ResourceMNQSQSCredentialsDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSQSCredentialsDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewSQSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mnq/sqs_data_source.go b/internal/services/mnq/sqs_data_source.go index 7593954cc9..20efa20987 100644 --- a/internal/services/mnq/sqs_data_source.go +++ b/internal/services/mnq/sqs_data_source.go @@ -22,7 +22,7 @@ func DataSourceSQS() *schema.Resource { } } -func DataSourceMNQSQSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceMNQSQSRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newSQSAPI(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mnq/sqs_queue.go b/internal/services/mnq/sqs_queue.go index 0ee1048a2a..6f19d32ea5 100644 --- a/internal/services/mnq/sqs_queue.go +++ b/internal/services/mnq/sqs_queue.go @@ -128,7 +128,7 @@ func ResourceSQSQueue() *schema.Resource { } } -func ResourceMNQSQSQueueCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSQSQueueCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newSQSAPI(d, m) if err != nil { return diag.FromErr(err) @@ -185,7 +185,7 @@ func ResourceMNQSQSQueueCreate(ctx context.Context, d *schema.ResourceData, m in return ResourceMNQSQSQueueRead(ctx, d, m) } -func ResourceMNQSQSQueueRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSQSQueueRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { sqsClient, _, err := SQSClientWithRegion(ctx, d, m) if err != nil { return diag.FromErr(err) @@ -234,7 +234,7 @@ func ResourceMNQSQSQueueRead(ctx context.Context, d *schema.ResourceData, m inte return nil } -func ResourceMNQSQSQueueUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSQSQueueUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { sqsClient, _, err := SQSClientWithRegion(ctx, d, m) if err != nil { return diag.FromErr(err) @@ -274,7 +274,7 @@ func ResourceMNQSQSQueueUpdate(ctx context.Context, d *schema.ResourceData, m in return ResourceMNQSQSQueueRead(ctx, d, m) } -func ResourceMNQSQSQueueDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceMNQSQSQueueDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { sqsClient, _, err := SQSClientWithRegion(ctx, d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mongodb/data_source_instance.go b/internal/services/mongodb/data_source_instance.go index dd7e122acf..42c756812c 100644 --- a/internal/services/mongodb/data_source_instance.go +++ b/internal/services/mongodb/data_source_instance.go @@ -34,7 +34,7 @@ func DataSourceInstance() *schema.Resource { } } -func DataSourceInstanceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceInstanceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { mongodbAPI, zone, region, err := newAPIWithZoneAndRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mongodb/helpers.go b/internal/services/mongodb/helpers.go index c072ba70ae..0e18f37fa7 100644 --- a/internal/services/mongodb/helpers.go +++ b/internal/services/mongodb/helpers.go @@ -22,12 +22,12 @@ const ( defaultVolumeSize = 5 ) -func newAPI(m interface{}) *mongodb.API { +func newAPI(m any) *mongodb.API { return mongodb.NewAPI(meta.ExtractScwClient(m)) } // newAPIWithZone returns a new mongoDB API and the zone for a Create request -func newAPIWithZone(d *schema.ResourceData, m interface{}) (*mongodb.API, scw.Zone, error) { +func newAPIWithZone(d *schema.ResourceData, m any) (*mongodb.API, scw.Zone, error) { zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err @@ -36,7 +36,7 @@ func newAPIWithZone(d *schema.ResourceData, m interface{}) (*mongodb.API, scw.Zo return newAPI(m), zone, nil } -func newAPIWithZoneAndRegion(d *schema.ResourceData, m interface{}) (*mongodb.API, scw.Zone, scw.Region, error) { +func newAPIWithZoneAndRegion(d *schema.ResourceData, m any) (*mongodb.API, scw.Zone, scw.Region, error) { zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", "", err @@ -50,7 +50,7 @@ func newAPIWithZoneAndRegion(d *schema.ResourceData, m interface{}) (*mongodb.AP return newAPI(m), zone, region, nil } -func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*mongodb.API, scw.Region, error) { +func newAPIWithRegion(d *schema.ResourceData, m any) (*mongodb.API, scw.Region, error) { region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err @@ -60,7 +60,7 @@ func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*mongodb.API, scw. } // NewAPIWithZoneAndID returns a mongoDB API with zone and ID extracted from the state -func NewAPIWithZoneAndID(m interface{}, id string) (*mongodb.API, scw.Zone, string, error) { +func NewAPIWithZoneAndID(m any, id string) (*mongodb.API, scw.Zone, string, error) { zone, ID, err := zonal.ParseID(id) if err != nil { return nil, "", "", err @@ -69,7 +69,7 @@ func NewAPIWithZoneAndID(m interface{}, id string) (*mongodb.API, scw.Zone, stri return newAPI(m), zone, ID, nil } -func NewAPIWithRegionAndID(m interface{}, id string) (*mongodb.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*mongodb.API, scw.Region, string, error) { zone, ID, err := zonal.ParseID(id) if err != nil { return nil, "", "", err diff --git a/internal/services/mongodb/instance.go b/internal/services/mongodb/instance.go index 50189ffd6d..6d73b3bfdb 100644 --- a/internal/services/mongodb/instance.go +++ b/internal/services/mongodb/instance.go @@ -235,7 +235,7 @@ func ResourceInstance() *schema.Resource { } } -func ResourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { mongodbAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -296,10 +296,10 @@ func ResourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m inter var eps []*mongodb.EndpointSpec if privateNetworkList, ok := d.GetOk("private_network"); ok { - privateNetworks := privateNetworkList.([]interface{}) + privateNetworks := privateNetworkList.([]any) if len(privateNetworks) > 0 { - pn := privateNetworks[0].(map[string]interface{}) + pn := privateNetworks[0].(map[string]any) privateNetworkID := locality.ExpandID(pn["pn_id"].(string)) if privateNetworkID != "" { @@ -313,7 +313,7 @@ func ResourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m inter } if pubList, ok := d.GetOk("public_network"); ok { - items := pubList.([]interface{}) + items := pubList.([]any) if len(items) > 0 { eps = append(eps, &mongodb.EndpointSpec{ Public: &mongodb.EndpointSpecPublicDetails{}, @@ -345,7 +345,7 @@ func ResourceInstanceCreate(ctx context.Context, d *schema.ResourceData, m inter return ResourceInstanceRead(ctx, d, m) } -func ResourceInstanceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { mongodbAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -387,7 +387,7 @@ func ResourceInstanceRead(ctx context.Context, d *schema.ResourceData, m interfa } diags := diag.Diagnostics{} - privateIPs := []map[string]interface{}(nil) + privateIPs := []map[string]any(nil) authorized := true privateNetworkEndpoint, privateNetworkExists := flattenPrivateNetwork(instance.Endpoints) @@ -453,7 +453,7 @@ func ResourceInstanceRead(ctx context.Context, d *schema.ResourceData, m interfa return diags } -func ResourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { mongodbAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -591,9 +591,9 @@ func ResourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter var eps []*mongodb.EndpointSpec if privateNetworkList, ok := d.GetOk("private_network"); ok { - privateNetworks := privateNetworkList.([]interface{}) + privateNetworks := privateNetworkList.([]any) if len(privateNetworks) > 0 { - pn := privateNetworks[0].(map[string]interface{}) + pn := privateNetworks[0].(map[string]any) privateNetworkID := locality.ExpandID(pn["pn_id"].(string)) if privateNetworkID != "" { @@ -626,7 +626,7 @@ func ResourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter return append(diags, ResourceInstanceRead(ctx, d, m)...) } -func ResourceInstanceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceInstanceDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { mongodbAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mongodb/snapshot.go b/internal/services/mongodb/snapshot.go index ef29e21169..2dde5db0cf 100644 --- a/internal/services/mongodb/snapshot.go +++ b/internal/services/mongodb/snapshot.go @@ -85,7 +85,7 @@ func ResourceSnapshot() *schema.Resource { } } -func ResourceSnapshotCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceSnapshotCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { mongodbAPI, zone, region, err := newAPIWithZoneAndRegion(d, m) if err != nil { return diag.FromErr(err) @@ -116,7 +116,7 @@ func ResourceSnapshotCreate(ctx context.Context, d *schema.ResourceData, m inter return ResourceSnapshotRead(ctx, d, m) } -func ResourceSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceSnapshotRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { mongodbAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -148,7 +148,7 @@ func ResourceSnapshotRead(ctx context.Context, d *schema.ResourceData, m interfa return nil } -func ResourceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { mongodbAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -194,7 +194,7 @@ func ResourceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m inter return ResourceSnapshotRead(ctx, d, m) } -func ResourceSnapshotDelete(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceSnapshotDelete(_ context.Context, d *schema.ResourceData, m any) diag.Diagnostics { mongodbAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/mongodb/types.go b/internal/services/mongodb/types.go index f45b6cc58e..2d8b04b47e 100644 --- a/internal/services/mongodb/types.go +++ b/internal/services/mongodb/types.go @@ -4,15 +4,15 @@ import ( mongodb "github.com/scaleway/scaleway-sdk-go/api/mongodb/v1alpha1" ) -func flattenPublicNetwork(endpoints []*mongodb.Endpoint) (interface{}, bool) { - publicFlat := []map[string]interface{}(nil) +func flattenPublicNetwork(endpoints []*mongodb.Endpoint) (any, bool) { + publicFlat := []map[string]any(nil) for _, endpoint := range endpoints { if endpoint.Public == nil { continue } - publicFlat = append(publicFlat, map[string]interface{}{ + publicFlat = append(publicFlat, map[string]any{ "id": endpoint.ID, "port": endpoint.Port, "dns_record": endpoint.DNSRecords[0], @@ -24,15 +24,15 @@ func flattenPublicNetwork(endpoints []*mongodb.Endpoint) (interface{}, bool) { return publicFlat, len(publicFlat) != 0 } -func flattenPrivateNetwork(endpoints []*mongodb.Endpoint) (interface{}, bool) { - privateFlat := []map[string]interface{}(nil) +func flattenPrivateNetwork(endpoints []*mongodb.Endpoint) (any, bool) { + privateFlat := []map[string]any(nil) for _, endpoint := range endpoints { if endpoint.PrivateNetwork == nil { continue } - privateFlat = append(privateFlat, map[string]interface{}{ + privateFlat = append(privateFlat, map[string]any{ "pn_id": endpoint.PrivateNetwork.PrivateNetworkID, "id": endpoint.ID, "port": endpoint.Port, diff --git a/internal/services/object/bucket.go b/internal/services/object/bucket.go index eaf90a01f9..6c949a5d52 100644 --- a/internal/services/object/bucket.go +++ b/internal/services/object/bucket.go @@ -212,7 +212,7 @@ func ResourceBucket() *schema.Resource { }, }, }, - CustomizeDiff: func(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { + CustomizeDiff: func(_ context.Context, diff *schema.ResourceDiff, _ any) error { if diff.Get("object_lock_enabled").(bool) { if diff.HasChange("versioning") && !diff.Get("versioning.0.enabled").(bool) { return errors.New("versioning must be enabled when object lock is enabled") @@ -224,7 +224,7 @@ func ResourceBucket() *schema.Resource { } } -func resourceObjectBucketCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectBucketCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { bucketName := d.Get("name").(string) s3Client, region, err := s3ClientWithRegion(ctx, d, m) @@ -273,7 +273,7 @@ func resourceObjectBucketCreate(ctx context.Context, d *schema.ResourceData, m i return resourceObjectBucketUpdate(ctx, d, m) } -func resourceObjectBucketUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectBucketUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { s3Client, _, bucketName, err := s3ClientWithRegionAndName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -341,7 +341,7 @@ func resourceObjectBucketUpdate(ctx context.Context, d *schema.ResourceData, m i func resourceBucketLifecycleUpdate(ctx context.Context, conn *s3.Client, d *schema.ResourceData) error { bucket := d.Get("name").(string) - lifecycleRules := d.Get("lifecycle_rule").([]interface{}) + lifecycleRules := d.Get("lifecycle_rule").([]any) if len(lifecycleRules) == 0 || lifecycleRules[0] == nil { i := &s3.DeleteBucketLifecycleInput{ @@ -359,7 +359,7 @@ func resourceBucketLifecycleUpdate(ctx context.Context, conn *s3.Client, d *sche rules := make([]s3Types.LifecycleRule, 0, len(lifecycleRules)) for i, lifecycleRule := range lifecycleRules { - r := lifecycleRule.(map[string]interface{}) + r := lifecycleRule.(map[string]any) rule := s3Types.LifecycleRule{} @@ -414,9 +414,9 @@ func resourceBucketLifecycleUpdate(ctx context.Context, conn *s3.Client, d *sche } // Expiration - expiration := d.Get(fmt.Sprintf("lifecycle_rule.%d.expiration", i)).([]interface{}) + expiration := d.Get(fmt.Sprintf("lifecycle_rule.%d.expiration", i)).([]any) if len(expiration) > 0 && expiration[0] != nil { - e := expiration[0].(map[string]interface{}) + e := expiration[0].(map[string]any) i := &s3Types.LifecycleExpiration{} if val, ok := e["days"].(int); ok && val > 0 { @@ -433,7 +433,7 @@ func resourceBucketLifecycleUpdate(ctx context.Context, conn *s3.Client, d *sche rule.Transitions = []s3Types.Transition{} for _, transition := range transitions { - transition := transition.(map[string]interface{}) + transition := transition.(map[string]any) i := s3Types.Transition{} if val, ok := transition["days"].(int); ok && val >= 0 { @@ -467,7 +467,7 @@ func resourceBucketLifecycleUpdate(ctx context.Context, conn *s3.Client, d *sche } //gocyclo:ignore -func resourceObjectBucketRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectBucketRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { s3Client, region, bucketName, err := s3ClientWithRegionAndName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -585,14 +585,14 @@ func resourceObjectBucketRead(ctx context.Context, d *schema.ResourceData, m int } } - lifecycleRules := make([]map[string]interface{}, 0) + lifecycleRules := make([]map[string]any, 0) if lifecycle != nil && len(lifecycle.Rules) > 0 { - lifecycleRules = make([]map[string]interface{}, 0, len(lifecycle.Rules)) + lifecycleRules = make([]map[string]any, 0, len(lifecycle.Rules)) for _, lifecycleRule := range lifecycle.Rules { log.Printf("[DEBUG] SCW bucket: %s, read lifecycle rule: %v", d.Id(), lifecycleRule) - rule := make(map[string]interface{}) + rule := make(map[string]any) // ID if lifecycleRule.ID != nil && aws.ToString(lifecycleRule.ID) != "" { @@ -642,19 +642,19 @@ func resourceObjectBucketRead(ctx context.Context, d *schema.ResourceData, m int // expiration if lifecycleRule.Expiration != nil { - e := make(map[string]interface{}) + e := make(map[string]any) if lifecycleRule.Expiration.Days != nil { e["days"] = int(aws.ToInt32(lifecycleRule.Expiration.Days)) } - rule["expiration"] = []interface{}{e} + rule["expiration"] = []any{e} } //// transition if len(lifecycleRule.Transitions) > 0 { - transitions := make([]interface{}, 0, len(lifecycleRule.Transitions)) + transitions := make([]any, 0, len(lifecycleRule.Transitions)) for _, v := range lifecycleRule.Transitions { - t := make(map[string]interface{}) + t := make(map[string]any) if v.Days != nil { t["days"] = int(aws.ToInt32(v.Days)) } @@ -683,7 +683,7 @@ func resourceObjectBucketRead(ctx context.Context, d *schema.ResourceData, m int return diags } -func resourceObjectBucketDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectBucketDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { s3Client, _, bucketName, err := s3ClientWithRegionAndName(ctx, d, m, d.Id()) var nObjectDeleted int64 @@ -723,7 +723,7 @@ func resourceObjectBucketDelete(ctx context.Context, d *schema.ResourceData, m i } func resourceObjectBucketVersioningUpdate(ctx context.Context, s3conn *s3.Client, d *schema.ResourceData) error { - v := d.Get("versioning").([]interface{}) + v := d.Get("versioning").([]any) bucketName := d.Get("name").(string) vc := expandObjectBucketVersioning(v) @@ -743,7 +743,7 @@ func resourceObjectBucketVersioningUpdate(ctx context.Context, s3conn *s3.Client func resourceS3BucketCorsUpdate(ctx context.Context, s3conn *s3.Client, d *schema.ResourceData) error { bucketName := d.Get("name").(string) - rawCors := d.Get("cors_rule").([]interface{}) + rawCors := d.Get("cors_rule").([]any) if len(rawCors) == 0 { // Delete CORS diff --git a/internal/services/object/bucket_acl.go b/internal/services/object/bucket_acl.go index 22ae460198..f854221357 100644 --- a/internal/services/object/bucket_acl.go +++ b/internal/services/object/bucket_acl.go @@ -148,7 +148,7 @@ func ResourceBucketACL() *schema.Resource { } } -func resourceBucketACLCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceBucketACLCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { conn, region, err := s3ClientWithRegion(ctx, d, m) if err != nil { return diag.FromErr(err) @@ -182,8 +182,8 @@ func resourceBucketACLCreate(ctx context.Context, d *schema.ResourceData, m inte input.ExpectedBucketOwner = aws.String(expectedBucketOwner) } - if v, ok := d.GetOk("access_control_policy"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil { - input.AccessControlPolicy = expandBucketACLAccessControlPolicy(v.([]interface{})) + if v, ok := d.GetOk("access_control_policy"); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil { + input.AccessControlPolicy = expandBucketACLAccessControlPolicy(v.([]any)) } out, err := conn.PutBucketAcl(ctx, input) @@ -198,12 +198,12 @@ func resourceBucketACLCreate(ctx context.Context, d *schema.ResourceData, m inte return resourceBucketACLRead(ctx, d, m) } -func expandBucketACLAccessControlPolicy(l []interface{}) *s3Types.AccessControlPolicy { +func expandBucketACLAccessControlPolicy(l []any) *s3Types.AccessControlPolicy { if len(l) == 0 || l[0] == nil { return nil } - tfMap, ok := l[0].(map[string]interface{}) + tfMap, ok := l[0].(map[string]any) if !ok { return nil } @@ -214,25 +214,25 @@ func expandBucketACLAccessControlPolicy(l []interface{}) *s3Types.AccessControlP result.Grants = expandBucketACLAccessControlPolicyGrants(v.List()) } - if v, ok := tfMap["owner"].([]interface{}); ok && len(v) > 0 && v[0] != nil { + if v, ok := tfMap["owner"].([]any); ok && len(v) > 0 && v[0] != nil { result.Owner = expandBucketACLAccessControlPolicyOwner(v) } return result } -func expandBucketACLAccessControlPolicyGrants(l []interface{}) []s3Types.Grant { +func expandBucketACLAccessControlPolicyGrants(l []any) []s3Types.Grant { grants := make([]s3Types.Grant, 0, len(l)) for _, tfMapRaw := range l { - tfMap, ok := tfMapRaw.(map[string]interface{}) + tfMap, ok := tfMapRaw.(map[string]any) if !ok { continue } grant := s3Types.Grant{} - if v, ok := tfMap["grantee"].([]interface{}); ok && len(v) > 0 && v[0] != nil { + if v, ok := tfMap["grantee"].([]any); ok && len(v) > 0 && v[0] != nil { grant.Grantee = expandBucketACLAccessControlPolicyGrantsGrantee(v) } @@ -246,12 +246,12 @@ func expandBucketACLAccessControlPolicyGrants(l []interface{}) []s3Types.Grant { return grants } -func expandBucketACLAccessControlPolicyGrantsGrantee(l []interface{}) *s3Types.Grantee { +func expandBucketACLAccessControlPolicyGrantsGrantee(l []any) *s3Types.Grantee { if len(l) == 0 || l[0] == nil { return nil } - tfMap, ok := l[0].(map[string]interface{}) + tfMap, ok := l[0].(map[string]any) if !ok { return nil } @@ -269,12 +269,12 @@ func expandBucketACLAccessControlPolicyGrantsGrantee(l []interface{}) *s3Types.G return result } -func expandBucketACLAccessControlPolicyOwner(l []interface{}) *s3Types.Owner { +func expandBucketACLAccessControlPolicyOwner(l []any) *s3Types.Owner { if len(l) == 0 || l[0] == nil { return nil } - tfMap, ok := l[0].(map[string]interface{}) + tfMap, ok := l[0].(map[string]any) if !ok { return nil } @@ -292,12 +292,12 @@ func expandBucketACLAccessControlPolicyOwner(l []interface{}) *s3Types.Owner { return owner } -func flattenBucketACLAccessControlPolicy(output *s3.GetBucketAclOutput) []interface{} { +func flattenBucketACLAccessControlPolicy(output *s3.GetBucketAclOutput) []any { if output == nil { - return []interface{}{} + return []any{} } - m := make(map[string]interface{}) + m := make(map[string]any) if len(output.Grants) > 0 { m["grant"] = flattenBucketACLAccessControlPolicyGrants(output.Grants) @@ -307,18 +307,18 @@ func flattenBucketACLAccessControlPolicy(output *s3.GetBucketAclOutput) []interf m["owner"] = flattenBucketACLAccessControlPolicyOwner(output.Owner) } - return []interface{}{m} + return []any{m} } -func flattenBucketACLAccessControlPolicyGrants(grants []s3Types.Grant) []interface{} { - results := make([]interface{}, 0, len(grants)) +func flattenBucketACLAccessControlPolicyGrants(grants []s3Types.Grant) []any { + results := make([]any, 0, len(grants)) for _, grant := range grants { if grant.Grantee == nil && grant.Permission == "" { continue } - m := make(map[string]interface{}) + m := make(map[string]any) if grant.Grantee != nil { m["grantee"] = flattenBucketACLAccessControlPolicyGrantsGrantee(grant.Grantee) @@ -334,12 +334,12 @@ func flattenBucketACLAccessControlPolicyGrants(grants []s3Types.Grant) []interfa return results } -func flattenBucketACLAccessControlPolicyGrantsGrantee(grantee *s3Types.Grantee) []interface{} { +func flattenBucketACLAccessControlPolicyGrantsGrantee(grantee *s3Types.Grantee) []any { if grantee == nil { - return []interface{}{} + return []any{} } - m := make(map[string]interface{}) + m := make(map[string]any) if grantee.DisplayName != nil { m["display_name"] = NormalizeOwnerID(grantee.DisplayName) @@ -353,15 +353,15 @@ func flattenBucketACLAccessControlPolicyGrantsGrantee(grantee *s3Types.Grantee) m["type"] = grantee.Type } - return []interface{}{m} + return []any{m} } -func flattenBucketACLAccessControlPolicyOwner(owner *s3Types.Owner) []interface{} { +func flattenBucketACLAccessControlPolicyOwner(owner *s3Types.Owner) []any { if owner == nil { - return []interface{}{} + return []any{} } - m := make(map[string]interface{}) + m := make(map[string]any) if owner.DisplayName != nil { m["display_name"] = NormalizeOwnerID(owner.DisplayName) @@ -371,10 +371,10 @@ func flattenBucketACLAccessControlPolicyOwner(owner *s3Types.Owner) []interface{ m["id"] = NormalizeOwnerID(owner.ID) } - return []interface{}{m} + return []any{m} } -func resourceBucketACLRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceBucketACLRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { expectedBucketOwner := d.Get("expected_bucket_owner") conn, region, bucket, acl, err := s3ClientWithRegionWithNameACL(ctx, d, m, d.Id()) @@ -431,7 +431,7 @@ func BucketACLCreateResourceID(region scw.Region, bucket, acl string) string { return regional.NewIDString(region, strings.Join([]string{bucket, acl}, BucketACLSeparator)) } -func resourceBucketACLUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceBucketACLUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { conn, region, bucket, acl, err := s3ClientWithRegionWithNameACL(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -451,7 +451,7 @@ func resourceBucketACLUpdate(ctx context.Context, d *schema.ResourceData, m inte } if d.HasChange("access_control_policy") { - input.AccessControlPolicy = expandBucketACLAccessControlPolicy(d.Get("access_control_policy").([]interface{})) + input.AccessControlPolicy = expandBucketACLAccessControlPolicy(d.Get("access_control_policy").([]any)) } _, err = conn.PutBucketAcl(ctx, input) @@ -467,7 +467,7 @@ func resourceBucketACLUpdate(ctx context.Context, d *schema.ResourceData, m inte return resourceBucketACLRead(ctx, d, m) } -func resourceBucketACLDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceBucketACLDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { conn, _, bucket, _, err := s3ClientWithRegionWithNameACL(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/object/bucket_lock_configuration.go b/internal/services/object/bucket_lock_configuration.go index 0ac755491c..02f190ea92 100644 --- a/internal/services/object/bucket_lock_configuration.go +++ b/internal/services/object/bucket_lock_configuration.go @@ -81,7 +81,7 @@ func ResourceLockConfiguration() *schema.Resource { } } -func resourceObjectLockConfigurationCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectLockConfigurationCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { conn, region, err := s3ClientWithRegion(ctx, d, m) if err != nil { return diag.FromErr(err) @@ -104,7 +104,7 @@ func resourceObjectLockConfigurationCreate(ctx context.Context, d *schema.Resour Bucket: aws.String(bucket), ObjectLockConfiguration: &s3Types.ObjectLockConfiguration{ ObjectLockEnabled: "Enabled", - Rule: expandBucketLockConfigurationRule(d.Get("rule").([]interface{})), + Rule: expandBucketLockConfigurationRule(d.Get("rule").([]any)), }, } @@ -118,7 +118,7 @@ func resourceObjectLockConfigurationCreate(ctx context.Context, d *schema.Resour return resourceObjectLockConfigurationRead(ctx, d, m) } -func resourceObjectLockConfigurationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectLockConfigurationRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { conn, _, bucket, err := s3ClientWithRegionAndName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -166,7 +166,7 @@ func resourceObjectLockConfigurationRead(ctx context.Context, d *schema.Resource return nil } -func resourceObjectLockConfigurationUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectLockConfigurationUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { conn, _, bucket, err := s3ClientWithRegionAndName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -174,7 +174,7 @@ func resourceObjectLockConfigurationUpdate(ctx context.Context, d *schema.Resour lockConfig := &s3Types.ObjectLockConfiguration{ ObjectLockEnabled: s3Types.ObjectLockEnabledEnabled, - Rule: expandBucketLockConfigurationRule(d.Get("rule").([]interface{})), + Rule: expandBucketLockConfigurationRule(d.Get("rule").([]any)), } input := &s3.PutObjectLockConfigurationInput{ @@ -190,7 +190,7 @@ func resourceObjectLockConfigurationUpdate(ctx context.Context, d *schema.Resour return resourceObjectLockConfigurationRead(ctx, d, m) } -func resourceObjectLockConfigurationDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectLockConfigurationDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { conn, _, bucket, err := s3ClientWithRegionAndName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -216,27 +216,27 @@ func resourceObjectLockConfigurationDelete(ctx context.Context, d *schema.Resour return nil } -func expandBucketLockConfigurationRule(l []interface{}) *s3Types.ObjectLockRule { +func expandBucketLockConfigurationRule(l []any) *s3Types.ObjectLockRule { if len(l) == 0 || l[0] == nil { return nil } - tfMap, ok := l[0].(map[string]interface{}) + tfMap, ok := l[0].(map[string]any) if !ok { return nil } return &s3Types.ObjectLockRule{ - DefaultRetention: expandBucketLockConfigurationRuleDefaultRetention(tfMap["default_retention"].([]interface{})), + DefaultRetention: expandBucketLockConfigurationRuleDefaultRetention(tfMap["default_retention"].([]any)), } } -func expandBucketLockConfigurationRuleDefaultRetention(l []interface{}) *s3Types.DefaultRetention { +func expandBucketLockConfigurationRuleDefaultRetention(l []any) *s3Types.DefaultRetention { if len(l) == 0 || l[0] == nil { return nil } - tfMap, ok := l[0].(map[string]interface{}) + tfMap, ok := l[0].(map[string]any) if !ok { return nil } @@ -256,24 +256,24 @@ func expandBucketLockConfigurationRuleDefaultRetention(l []interface{}) *s3Types return result } -func flattenBucketLockConfigurationRule(i *s3Types.ObjectLockRule) []interface{} { +func flattenBucketLockConfigurationRule(i *s3Types.ObjectLockRule) []any { if i == nil { - return []interface{}{} + return []any{} } - m := make(map[string]interface{}) + m := make(map[string]any) m["default_retention"] = flattenBucketLockConfigurationRuleDefaultRetention(i.DefaultRetention) - return []interface{}{m} + return []any{m} } -func flattenBucketLockConfigurationRuleDefaultRetention(i *s3Types.DefaultRetention) []interface{} { +func flattenBucketLockConfigurationRuleDefaultRetention(i *s3Types.DefaultRetention) []any { if i == nil { - return []interface{}{} + return []any{} } - m := make(map[string]interface{}) + m := make(map[string]any) m["mode"] = i.Mode @@ -285,5 +285,5 @@ func flattenBucketLockConfigurationRuleDefaultRetention(i *s3Types.DefaultRetent m["years"] = i.Years } - return []interface{}{m} + return []any{m} } diff --git a/internal/services/object/bucket_policy.go b/internal/services/object/bucket_policy.go index e8c844de3a..1a88558b7f 100644 --- a/internal/services/object/bucket_policy.go +++ b/internal/services/object/bucket_policy.go @@ -50,7 +50,7 @@ func ResourceBucketPolicy() *schema.Resource { } } -func resourceObjectBucketPolicyCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectBucketPolicyCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { s3Client, region, err := s3ClientWithRegion(ctx, d, m) if err != nil { return diag.FromErr(err) @@ -109,7 +109,7 @@ func resourceObjectBucketPolicyCreate(ctx context.Context, d *schema.ResourceDat } //gocyclo:ignore -func resourceObjectBucketPolicyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectBucketPolicyRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { s3Client, region, _, err := s3ClientWithRegionAndName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -171,7 +171,7 @@ func resourceObjectBucketPolicyRead(ctx context.Context, d *schema.ResourceData, return diags } -func resourceObjectBucketPolicyDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectBucketPolicyDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { s3Client, _, bucketName, err := s3ClientWithRegionAndName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/object/bucket_policy_test.go b/internal/services/object/bucket_policy_test.go index 2bc72f9f85..a523cbf40f 100644 --- a/internal/services/object/bucket_policy_test.go +++ b/internal/services/object/bucket_policy_test.go @@ -300,16 +300,16 @@ func testAccCheckBucketHasPolicy(tt *acctest.TestTools, n string, expectedPolicy // // policy["Statement"][i]["Resource"] func removePolicyStatementResources(policy string) (string, error) { - actualPolicyJSON := make(map[string]interface{}) + actualPolicyJSON := make(map[string]any) err := json.Unmarshal([]byte(policy), &actualPolicyJSON) if err != nil { return "", fmt.Errorf("json.Unmarshal error: %w", err) } - if statement, ok := actualPolicyJSON["Statement"].([]interface{}); ok && len(statement) > 0 { + if statement, ok := actualPolicyJSON["Statement"].([]any); ok && len(statement) > 0 { for _, rule := range statement { - if rule, ok := rule.(map[string]interface{}); ok { + if rule, ok := rule.(map[string]any); ok { delete(rule, "Resource") } } diff --git a/internal/services/object/bucket_website_configuration.go b/internal/services/object/bucket_website_configuration.go index af0e64a74e..4d7437b25d 100644 --- a/internal/services/object/bucket_website_configuration.go +++ b/internal/services/object/bucket_website_configuration.go @@ -81,7 +81,7 @@ func ResourceBucketWebsiteConfiguration() *schema.Resource { } } -func resourceBucketWebsiteConfigurationCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceBucketWebsiteConfigurationCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { conn, region, err := s3ClientWithRegion(ctx, d, m) if err != nil { return diag.FromErr(err) @@ -101,11 +101,11 @@ func resourceBucketWebsiteConfigurationCreate(ctx context.Context, d *schema.Res } websiteConfig := &s3Types.WebsiteConfiguration{ - IndexDocument: expandBucketWebsiteConfigurationIndexDocument(d.Get("index_document").([]interface{})), + IndexDocument: expandBucketWebsiteConfigurationIndexDocument(d.Get("index_document").([]any)), } - if v, ok := d.GetOk("error_document"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil { - websiteConfig.ErrorDocument = expandBucketWebsiteConfigurationErrorDocument(v.([]interface{})) + if v, ok := d.GetOk("error_document"); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil { + websiteConfig.ErrorDocument = expandBucketWebsiteConfigurationErrorDocument(v.([]any)) } _, err = conn.ListObjects(ctx, &s3.ListObjectsInput{ @@ -130,7 +130,7 @@ func resourceBucketWebsiteConfigurationCreate(ctx context.Context, d *schema.Res return resourceBucketWebsiteConfigurationRead(ctx, d, m) } -func resourceBucketWebsiteConfigurationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceBucketWebsiteConfigurationRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { conn, region, bucket, err := s3ClientWithRegionAndName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -201,18 +201,18 @@ func resourceBucketWebsiteConfigurationRead(ctx context.Context, d *schema.Resou return nil } -func resourceBucketWebsiteConfigurationUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceBucketWebsiteConfigurationUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { conn, _, bucket, err := s3ClientWithRegionAndName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) } websiteConfig := &s3Types.WebsiteConfiguration{ - IndexDocument: expandBucketWebsiteConfigurationIndexDocument(d.Get("index_document").([]interface{})), + IndexDocument: expandBucketWebsiteConfigurationIndexDocument(d.Get("index_document").([]any)), } - if v, ok := d.GetOk("error_document"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil { - websiteConfig.ErrorDocument = expandBucketWebsiteConfigurationErrorDocument(v.([]interface{})) + if v, ok := d.GetOk("error_document"); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil { + websiteConfig.ErrorDocument = expandBucketWebsiteConfigurationErrorDocument(v.([]any)) } input := &s3.PutBucketWebsiteInput{ @@ -228,7 +228,7 @@ func resourceBucketWebsiteConfigurationUpdate(ctx context.Context, d *schema.Res return resourceBucketWebsiteConfigurationRead(ctx, d, m) } -func resourceBucketWebsiteConfigurationDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceBucketWebsiteConfigurationDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { conn, _, bucket, err := s3ClientWithRegionAndName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -251,12 +251,12 @@ func resourceBucketWebsiteConfigurationDelete(ctx context.Context, d *schema.Res return nil } -func expandBucketWebsiteConfigurationErrorDocument(l []interface{}) *s3Types.ErrorDocument { +func expandBucketWebsiteConfigurationErrorDocument(l []any) *s3Types.ErrorDocument { if len(l) == 0 || l[0] == nil { return nil } - tfMap, ok := l[0].(map[string]interface{}) + tfMap, ok := l[0].(map[string]any) if !ok { return nil } @@ -270,12 +270,12 @@ func expandBucketWebsiteConfigurationErrorDocument(l []interface{}) *s3Types.Err return result } -func expandBucketWebsiteConfigurationIndexDocument(l []interface{}) *s3Types.IndexDocument { +func expandBucketWebsiteConfigurationIndexDocument(l []any) *s3Types.IndexDocument { if len(l) == 0 || l[0] == nil { return nil } - tfMap, ok := l[0].(map[string]interface{}) + tfMap, ok := l[0].(map[string]any) if !ok { return nil } @@ -289,30 +289,30 @@ func expandBucketWebsiteConfigurationIndexDocument(l []interface{}) *s3Types.Ind return result } -func flattenBucketWebsiteConfigurationIndexDocument(i *s3Types.IndexDocument) []interface{} { +func flattenBucketWebsiteConfigurationIndexDocument(i *s3Types.IndexDocument) []any { if i == nil { - return []interface{}{} + return []any{} } - m := make(map[string]interface{}) + m := make(map[string]any) if i.Suffix != nil { m["suffix"] = aws.ToString(i.Suffix) } - return []interface{}{m} + return []any{m} } -func flattenBucketWebsiteConfigurationErrorDocument(e *s3Types.ErrorDocument) []interface{} { +func flattenBucketWebsiteConfigurationErrorDocument(e *s3Types.ErrorDocument) []any { if e == nil { - return []interface{}{} + return []any{} } - m := make(map[string]interface{}) + m := make(map[string]any) if e.Key != nil { m["key"] = aws.ToString(e.Key) } - return []interface{}{m} + return []any{m} } diff --git a/internal/services/object/data_source_object_bucket.go b/internal/services/object/data_source_object_bucket.go index f70fedc1cf..6bae2545e5 100644 --- a/internal/services/object/data_source_object_bucket.go +++ b/internal/services/object/data_source_object_bucket.go @@ -26,7 +26,7 @@ func DataSourceBucket() *schema.Resource { } } -func DataSourceObjectStorageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceObjectStorageRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { s3Client, region, err := s3ClientWithRegion(ctx, d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/object/data_source_object_bucket_policy.go b/internal/services/object/data_source_object_bucket_policy.go index 7a41ee74c4..ac8bb3e951 100644 --- a/internal/services/object/data_source_object_bucket_policy.go +++ b/internal/services/object/data_source_object_bucket_policy.go @@ -28,7 +28,7 @@ func DataSourceBucketPolicy() *schema.Resource { } } -func DataSourceObjectBucketPolicyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceObjectBucketPolicyRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { s3Client, region, err := s3ClientWithRegion(ctx, d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/object/helpers_object.go b/internal/services/object/helpers_object.go index 53f8de0b52..aacc3dcee2 100644 --- a/internal/services/object/helpers_object.go +++ b/internal/services/object/helpers_object.go @@ -84,7 +84,7 @@ func NewS3ClientFromMeta(ctx context.Context, meta *meta.Meta, region string) (* return newS3Client(ctx, region, accessKey, secretKey, meta.HTTPClient()) } -func s3ClientWithRegion(ctx context.Context, d *schema.ResourceData, m interface{}) (*s3.Client, scw.Region, error) { +func s3ClientWithRegion(ctx context.Context, d *schema.ResourceData, m any) (*s3.Client, scw.Region, error) { region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err @@ -105,7 +105,7 @@ func s3ClientWithRegion(ctx context.Context, d *schema.ResourceData, m interface return s3Client, region, err } -func s3ClientWithRegionAndName(ctx context.Context, d *schema.ResourceData, m interface{}, id string) (*s3.Client, scw.Region, string, error) { +func s3ClientWithRegionAndName(ctx context.Context, d *schema.ResourceData, m any, id string) (*s3.Client, scw.Region, string, error) { region, name, err := regional.ParseID(id) if err != nil { return nil, "", "", err @@ -140,7 +140,7 @@ func s3ClientWithRegionAndName(ctx context.Context, d *schema.ResourceData, m in return s3Client, region, name, nil } -func s3ClientWithRegionAndNestedName(ctx context.Context, d *schema.ResourceData, m interface{}, name string) (*s3.Client, scw.Region, string, string, error) { +func s3ClientWithRegionAndNestedName(ctx context.Context, d *schema.ResourceData, m any, name string) (*s3.Client, scw.Region, string, string, error) { region, outerID, innerID, err := regional.ParseNestedID(name) if err != nil { return nil, "", "", "", err @@ -161,7 +161,7 @@ func s3ClientWithRegionAndNestedName(ctx context.Context, d *schema.ResourceData return s3Client, region, outerID, innerID, err } -func s3ClientWithRegionWithNameACL(ctx context.Context, d *schema.ResourceData, m interface{}, name string) (*s3.Client, scw.Region, string, string, error) { +func s3ClientWithRegionWithNameACL(ctx context.Context, d *schema.ResourceData, m any, name string) (*s3.Client, scw.Region, string, string, error) { region, name, outerID, err := locality.ParseLocalizedNestedOwnerID(name) if err != nil { return nil, "", name, "", err @@ -182,7 +182,7 @@ func s3ClientWithRegionWithNameACL(ctx context.Context, d *schema.ResourceData, return s3Client, scw.Region(region), name, outerID, err } -func s3ClientForceRegion(ctx context.Context, d *schema.ResourceData, m interface{}, region string) (*s3.Client, error) { +func s3ClientForceRegion(ctx context.Context, d *schema.ResourceData, m any, region string) (*s3.Client, error) { accessKey, _ := meta.ExtractScwClient(m).GetAccessKey() if projectID, _, err := meta.ExtractProjectID(d, m); err == nil { accessKey = accessKeyWithProjectID(accessKey, projectID) @@ -202,8 +202,8 @@ func accessKeyWithProjectID(accessKey string, projectID string) string { return accessKey + "@" + projectID } -func flattenObjectBucketTags(tagsSet []s3Types.Tag) map[string]interface{} { - tags := map[string]interface{}{} +func flattenObjectBucketTags(tagsSet []s3Types.Tag) map[string]any { + tags := map[string]any{} for _, tagSet := range tagsSet { var key string @@ -224,9 +224,9 @@ func flattenObjectBucketTags(tagsSet []s3Types.Tag) map[string]interface{} { return tags } -func ExpandObjectBucketTags(tags interface{}) []s3Types.Tag { - tagsSet := make([]s3Types.Tag, 0, len(tags.(map[string]interface{}))) - for key, value := range tags.(map[string]interface{}) { +func ExpandObjectBucketTags(tags any) []s3Types.Tag { + tagsSet := make([]s3Types.Tag, 0, len(tags.(map[string]any))) + for key, value := range tags.(map[string]any) { tagsSet = append(tagsSet, s3Types.Tag{ Key: scw.StringPtr(key), Value: types.ExpandStringPtr(value), @@ -257,19 +257,19 @@ func IsS3Err(err error, code string, message string) bool { return false } -func flattenObjectBucketVersioning(versioningResponse *s3.GetBucketVersioningOutput) []map[string]interface{} { - vcl := []map[string]interface{}{{}} +func flattenObjectBucketVersioning(versioningResponse *s3.GetBucketVersioningOutput) []map[string]any { + vcl := []map[string]any{{}} vcl[0]["enabled"] = versioningResponse.Status == s3Types.BucketVersioningStatusEnabled return vcl } -func expandObjectBucketVersioning(v []interface{}) *s3Types.VersioningConfiguration { +func expandObjectBucketVersioning(v []any) *s3Types.VersioningConfiguration { vc := &s3Types.VersioningConfiguration{} vc.Status = s3Types.BucketVersioningStatusSuspended if len(v) > 0 { - if c := v[0].(map[string]interface{}); c["enabled"].(bool) { + if c := v[0].(map[string]any); c["enabled"].(bool) { vc.Status = s3Types.BucketVersioningStatusEnabled } } @@ -277,16 +277,16 @@ func expandObjectBucketVersioning(v []interface{}) *s3Types.VersioningConfigurat return vc } -func flattenBucketCORS(corsResponse interface{}) []interface{} { +func flattenBucketCORS(corsResponse any) []any { if corsResponse == nil { return nil } if cors, ok := corsResponse.(*s3.GetBucketCorsOutput); ok && cors != nil && len(cors.CORSRules) > 0 { - var corsRules []interface{} + var corsRules []any for _, ruleObject := range cors.CORSRules { - rule := map[string]interface{}{} + rule := map[string]any{} if len(ruleObject.AllowedHeaders) > 0 { rule["allowed_headers"] = ruleObject.AllowedHeaders } @@ -316,7 +316,7 @@ func flattenBucketCORS(corsResponse interface{}) []interface{} { return nil } -func expandBucketCORS(ctx context.Context, rawCors []interface{}, bucket string) []s3Types.CORSRule { +func expandBucketCORS(ctx context.Context, rawCors []any, bucket string) []s3Types.CORSRule { if len(rawCors) == 0 { tflog.Warn(ctx, "No CORS configuration provided for bucket: "+bucket) @@ -327,7 +327,7 @@ func expandBucketCORS(ctx context.Context, rawCors []interface{}, bucket string) rules := make([]s3Types.CORSRule, 0, len(rawCors)) for _, raw := range rawCors { - corsMap, ok := raw.(map[string]interface{}) + corsMap, ok := raw.(map[string]any) if !ok { tflog.Warn(ctx, fmt.Sprintf("Invalid CORS entry for bucket %s: %#v", bucket, raw)) @@ -365,11 +365,11 @@ func expandBucketCORS(ctx context.Context, rawCors []interface{}, bucket string) return rules } -func toStringSlice(ctx context.Context, input interface{}) []string { +func toStringSlice(ctx context.Context, input any) []string { var result []string switch v := input.(type) { - case []interface{}: + case []any: for _, item := range v { if str, ok := item.(string); ok { result = append(result, str) @@ -555,10 +555,10 @@ func findDeletionWorkerCapacity() int { return deletionWorkers } -func transitionHash(v interface{}) int { +func transitionHash(v any) int { var buf bytes.Buffer - m, ok := v.(map[string]interface{}) + m, ok := v.(map[string]any) if !ok { return 0 diff --git a/internal/services/object/helpers_object_test.go b/internal/services/object/helpers_object_test.go index e22bccccd0..bd1db2d711 100644 --- a/internal/services/object/helpers_object_test.go +++ b/internal/services/object/helpers_object_test.go @@ -18,17 +18,17 @@ const ( func TestExpandObjectBucketTags(t *testing.T) { tests := []struct { name string - tags interface{} + tags any want []s3Types.Tag }{ { name: "no tags", - tags: map[string]interface{}{}, + tags: map[string]any{}, want: []s3Types.Tag(nil), }, { name: "single tag", - tags: map[string]interface{}{ + tags: map[string]any{ "key1": "val1", }, want: []s3Types.Tag{ @@ -37,7 +37,7 @@ func TestExpandObjectBucketTags(t *testing.T) { }, { name: "many tags", - tags: map[string]interface{}{ + tags: map[string]any{ "key1": "val1", "key2": "val2", "key3": "val3", diff --git a/internal/services/object/object.go b/internal/services/object/object.go index 75328171c0..ba14fe5478 100644 --- a/internal/services/object/object.go +++ b/internal/services/object/object.go @@ -126,7 +126,7 @@ func ResourceObject() *schema.Resource { } } -func resourceObjectCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { s3Client, region, err := s3ClientWithRegion(ctx, d, m) if err != nil { return diag.FromErr(err) @@ -242,7 +242,7 @@ func EncryptCustomerKey(encryptionKeyStr string) (string, *string, error) { return digestMD5, encryption, nil } -func resourceObjectUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { s3Client, region, key, bucket, err := s3ClientWithRegionAndNestedName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -350,7 +350,7 @@ func resourceObjectUpdate(ctx context.Context, d *schema.ResourceData, m interfa return resourceObjectCreate(ctx, d, m) } -func resourceObjectRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { s3Client, region, key, bucket, err := s3ClientWithRegionAndNestedName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -415,7 +415,7 @@ func resourceObjectRead(ctx context.Context, d *schema.ResourceData, m interface return nil } -func resourceObjectDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceObjectDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { s3Client, _, key, bucket, err := s3ClientWithRegionAndNestedName(ctx, d, m, d.Id()) if err != nil { return diag.FromErr(err) @@ -454,7 +454,7 @@ func objectIsPublic(acl *s3.GetObjectAclOutput) bool { } func validateMapKeyLowerCase() schema.SchemaValidateDiagFunc { - return func(i interface{}, _ cty.Path) diag.Diagnostics { + return func(i any, _ cty.Path) diag.Diagnostics { m := types.ExpandMapStringStringPtr(i) for k := range m { if strings.ToLower(k) != k { diff --git a/internal/services/rdb/acl.go b/internal/services/rdb/acl.go index 9de1cf84e7..a29564780f 100644 --- a/internal/services/rdb/acl.go +++ b/internal/services/rdb/acl.go @@ -74,7 +74,7 @@ func ResourceACL() *schema.Resource { } } -func ResourceACLCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceACLCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -87,7 +87,7 @@ func ResourceACLCreate(ctx context.Context, d *schema.ResourceData, m interface{ return diag.FromErr(err) } - aclRules, err := rdbACLExpand(d.Get("acl_rules").([]interface{})) + aclRules, err := rdbACLExpand(d.Get("acl_rules").([]any)) if err != nil { return diag.FromErr(err) } @@ -108,7 +108,7 @@ func ResourceACLCreate(ctx context.Context, d *schema.ResourceData, m interface{ return ResourceRdbACLRead(ctx, d, m) } -func ResourceRdbACLRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbACLRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, instanceID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -140,7 +140,7 @@ func ResourceRdbACLRead(ctx context.Context, d *schema.ResourceData, m interface diags := diag.Diagnostics{} if aclRulesRaw, ok := d.GetOk("acl_rules"); ok { - aclRules, mergeErrors := rdbACLRulesFlattenFromSchema(res.Rules, aclRulesRaw.([]interface{})) + aclRules, mergeErrors := rdbACLRulesFlattenFromSchema(res.Rules, aclRulesRaw.([]any)) if len(mergeErrors) > 0 { for _, w := range mergeErrors { diags = append(diags, diag.Diagnostic{ @@ -162,7 +162,7 @@ func ResourceRdbACLRead(ctx context.Context, d *schema.ResourceData, m interface return diags } -func ResourceACLUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceACLUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, instanceID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -179,7 +179,7 @@ func ResourceACLUpdate(ctx context.Context, d *schema.ResourceData, m interface{ return diag.FromErr(err) } - aclRules, err := rdbACLExpand(d.Get("acl_rules").([]interface{})) + aclRules, err := rdbACLExpand(d.Get("acl_rules").([]any)) if err != nil { return diag.FromErr(err) } @@ -199,7 +199,7 @@ func ResourceACLUpdate(ctx context.Context, d *schema.ResourceData, m interface{ return ResourceRdbACLRead(ctx, d, m) } -func ResourceACLDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceACLDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, instanceID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -207,7 +207,7 @@ func ResourceACLDelete(ctx context.Context, d *schema.ResourceData, m interface{ aclRuleIPs := make([]string, 0) - aclRules, err := rdbACLExpand(d.Get("acl_rules").([]interface{})) + aclRules, err := rdbACLExpand(d.Get("acl_rules").([]any)) if err != nil { return diag.FromErr(err) } @@ -238,11 +238,11 @@ func ResourceACLDelete(ctx context.Context, d *schema.ResourceData, m interface{ return nil } -func rdbACLExpand(data []interface{}) ([]*rdb.ACLRuleRequest, error) { +func rdbACLExpand(data []any) ([]*rdb.ACLRuleRequest, error) { var res []*rdb.ACLRuleRequest for _, rule := range data { - r := rule.(map[string]interface{}) + r := rule.(map[string]any) ipRaw, ok := r["ip"] if ok { @@ -269,8 +269,8 @@ func rdbACLExpand(data []interface{}) ([]*rdb.ACLRuleRequest, error) { return res, nil } -func rdbACLRulesFlattenFromSchema(rules []*rdb.ACLRule, dataFromSchema []interface{}) ([]map[string]interface{}, []error) { - res := make([]map[string]interface{}, 0, len(dataFromSchema)) +func rdbACLRulesFlattenFromSchema(rules []*rdb.ACLRule, dataFromSchema []any) ([]map[string]any, []error) { + res := make([]map[string]any, 0, len(dataFromSchema)) var errors []error @@ -282,7 +282,7 @@ func rdbACLRulesFlattenFromSchema(rules []*rdb.ACLRule, dataFromSchema []interfa ruleMapFromSchema := map[string]struct{}{} for _, ruleFromSchema := range dataFromSchema { - currentRule := ruleFromSchema.(map[string]interface{}) + currentRule := ruleFromSchema.(map[string]any) ip, err := types.ExpandIPNet(currentRule["ip"].(string)) if err != nil { @@ -299,7 +299,7 @@ func rdbACLRulesFlattenFromSchema(rules []*rdb.ACLRule, dataFromSchema []interfa } ruleMapFromSchema[ip.String()] = struct{}{} - r := map[string]interface{}{ + r := map[string]any{ "ip": aclRule.IP.String(), "description": aclRule.Description, } @@ -309,14 +309,14 @@ func rdbACLRulesFlattenFromSchema(rules []*rdb.ACLRule, dataFromSchema []interfa return append(res, mergeDiffToSchema(ruleMapFromSchema, ruleMap)...), errors } -func mergeDiffToSchema(rulesFromSchema map[string]struct{}, ruleMap map[string]*rdb.ACLRule) []map[string]interface{} { - var res []map[string]interface{} +func mergeDiffToSchema(rulesFromSchema map[string]struct{}, ruleMap map[string]*rdb.ACLRule) []map[string]any { + var res []map[string]any for ruleIP, info := range ruleMap { _, ok := rulesFromSchema[ruleIP] // check if new rule has been added on config if !ok { - r := map[string]interface{}{ + r := map[string]any{ "ip": info.IP.String(), "description": info.Description, } @@ -327,11 +327,11 @@ func mergeDiffToSchema(rulesFromSchema map[string]struct{}, ruleMap map[string]* return res } -func rdbACLRulesFlatten(rules []*rdb.ACLRule) []map[string]interface{} { - res := make([]map[string]interface{}, 0, len(rules)) +func rdbACLRulesFlatten(rules []*rdb.ACLRule) []map[string]any { + res := make([]map[string]any, 0, len(rules)) for _, rule := range rules { - r := map[string]interface{}{ + r := map[string]any{ "ip": rule.IP.String(), "description": rule.Description, } diff --git a/internal/services/rdb/acl_data_source.go b/internal/services/rdb/acl_data_source.go index 33e41453da..ccd7100bce 100644 --- a/internal/services/rdb/acl_data_source.go +++ b/internal/services/rdb/acl_data_source.go @@ -25,7 +25,7 @@ func DataSourceACL() *schema.Resource { } } -func DataSourceRDBACLRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceRDBACLRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { _, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/rdb/data_source_rdb_database_backup.go b/internal/services/rdb/data_source_rdb_database_backup.go index 1d112d0cb4..5a97034639 100644 --- a/internal/services/rdb/data_source_rdb_database_backup.go +++ b/internal/services/rdb/data_source_rdb_database_backup.go @@ -39,7 +39,7 @@ func DataSourceDatabaseBackup() *schema.Resource { } } -func DataSourceRDBDatabaseBackupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceRDBDatabaseBackupRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/rdb/data_source_rdb_instance.go b/internal/services/rdb/data_source_rdb_instance.go index d508827494..6757cbdb9f 100644 --- a/internal/services/rdb/data_source_rdb_instance.go +++ b/internal/services/rdb/data_source_rdb_instance.go @@ -33,7 +33,7 @@ func DataSourceInstance() *schema.Resource { } } -func DataSourceRDBInstanceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceRDBInstanceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/rdb/database.go b/internal/services/rdb/database.go index a2652832f8..be71437058 100644 --- a/internal/services/rdb/database.go +++ b/internal/services/rdb/database.go @@ -82,7 +82,7 @@ func ResourceDatabase() *schema.Resource { } } -func ResourceRdbDatabaseCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbDatabaseCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI := newAPI(m) region, instanceID, err := regional.ParseID(d.Get("instance_id").(string)) @@ -150,7 +150,7 @@ func getDatabase(ctx context.Context, api *rdb.API, r scw.Region, instanceID, db return res.Databases[0], nil } -func ResourceRdbDatabaseRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbDatabaseRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI := newAPI(m) region, instanceID, databaseName, err := ResourceRdbDatabaseParseID(d.Id()) @@ -180,7 +180,7 @@ func ResourceRdbDatabaseRead(ctx context.Context, d *schema.ResourceData, m inte return nil } -func ResourceRdbDatabaseDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbDatabaseDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI := newAPI(m) region, instanceID, databaseName, err := ResourceRdbDatabaseParseID(d.Id()) diff --git a/internal/services/rdb/database_backup.go b/internal/services/rdb/database_backup.go index 216fe27a79..15e7bdb946 100644 --- a/internal/services/rdb/database_backup.go +++ b/internal/services/rdb/database_backup.go @@ -86,7 +86,7 @@ func ResourceDatabaseBackup() *schema.Resource { } } -func ResourceRdbDatabaseBackupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbDatabaseBackupCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -117,7 +117,7 @@ func ResourceRdbDatabaseBackupCreate(ctx context.Context, d *schema.ResourceData return ResourceRdbDatabaseBackupRead(ctx, d, m) } -func ResourceRdbDatabaseBackupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbDatabaseBackupRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -149,7 +149,7 @@ func ResourceRdbDatabaseBackupRead(ctx context.Context, d *schema.ResourceData, return nil } -func ResourceRdbDatabaseBackupUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbDatabaseBackupUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -186,7 +186,7 @@ func ResourceRdbDatabaseBackupUpdate(ctx context.Context, d *schema.ResourceData return ResourceRdbDatabaseBackupRead(ctx, d, m) } -func ResourceRdbDatabaseBackupDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbDatabaseBackupDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/rdb/database_data_source.go b/internal/services/rdb/database_data_source.go index 125be2b5d5..864f5e6f23 100644 --- a/internal/services/rdb/database_data_source.go +++ b/internal/services/rdb/database_data_source.go @@ -25,7 +25,7 @@ func DataSourceDatabase() *schema.Resource { } } -func DataSourceDatabaseRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceDatabaseRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { _, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/rdb/helpers.go b/internal/services/rdb/helpers.go index a34ff05ce3..76489ea6b7 100644 --- a/internal/services/rdb/helpers.go +++ b/internal/services/rdb/helpers.go @@ -21,12 +21,12 @@ const ( ) // newAPI returns a new RDB API -func newAPI(m interface{}) *rdb.API { +func newAPI(m any) *rdb.API { return rdb.NewAPI(meta.ExtractScwClient(m)) } // newAPIWithRegion returns a new lb API and the region for a Create request -func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*rdb.API, scw.Region, error) { +func newAPIWithRegion(d *schema.ResourceData, m any) (*rdb.API, scw.Region, error) { region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err @@ -36,7 +36,7 @@ func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*rdb.API, scw.Regi } // NewAPIWithRegionAndID returns an lb API with region and ID extracted from the state -func NewAPIWithRegionAndID(m interface{}, id string) (*rdb.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*rdb.API, scw.Region, string, error) { region, ID, err := regional.ParseID(id) if err != nil { return nil, "", "", err @@ -46,7 +46,7 @@ func NewAPIWithRegionAndID(m interface{}, id string) (*rdb.API, scw.Region, stri } // PrivilegeV1SchemaUpgradeFunc allow upgrade the privilege ID on schema V1 -func PrivilegeV1SchemaUpgradeFunc(_ context.Context, rawState map[string]interface{}, m interface{}) (map[string]interface{}, error) { +func PrivilegeV1SchemaUpgradeFunc(_ context.Context, rawState map[string]any, m any) (map[string]any, error) { idRaw, exist := rawState["id"] if !exist { return nil, errors.New("upgrade: id not exist") diff --git a/internal/services/rdb/helpers_test.go b/internal/services/rdb/helpers_test.go index 25ac72e062..df18f7a257 100644 --- a/internal/services/rdb/helpers_test.go +++ b/internal/services/rdb/helpers_test.go @@ -8,13 +8,13 @@ import ( ) func TestPrivilegeV1SchemaUpgradeFunc(t *testing.T) { - v0Schema := map[string]interface{}{ + v0Schema := map[string]any{ "id": "fr-par/11111111-1111-1111-1111-111111111111", "region": "fr-par", "database_name": "database", "user_name": "username", } - v1Schema := map[string]interface{}{ + v1Schema := map[string]any{ "id": "fr-par/11111111-1111-1111-1111-111111111111/database/username", "region": "fr-par", "database_name": "database", diff --git a/internal/services/rdb/instance.go b/internal/services/rdb/instance.go index 0d1f9793f4..5cffb9d492 100644 --- a/internal/services/rdb/instance.go +++ b/internal/services/rdb/instance.go @@ -355,7 +355,7 @@ func ResourceInstance() *schema.Resource { } //gocyclo:ignore -func ResourceRdbInstanceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbInstanceCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -548,7 +548,7 @@ func ResourceRdbInstanceCreate(ctx context.Context, d *schema.ResourceData, m in return ResourceRdbInstanceRead(ctx, d, m) } -func ResourceRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -664,7 +664,7 @@ func ResourceRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m inte // set endpoints diags := diag.Diagnostics{} - privateIPs := []map[string]interface{}(nil) + privateIPs := []map[string]any(nil) authorized := true if pnI, pnExist := flattenPrivateNetwork(res.Endpoints); pnExist { @@ -725,7 +725,7 @@ func ResourceRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m inte } //gocyclo:ignore -func ResourceRdbInstanceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbInstanceUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -1056,7 +1056,7 @@ func ResourceRdbInstanceUpdate(ctx context.Context, d *schema.ResourceData, m in return ResourceRdbInstanceRead(ctx, d, m) } -func ResourceRdbInstanceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbInstanceDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/rdb/privilege.go b/internal/services/rdb/privilege.go index e7f35adb22..5ca6a7b1fc 100644 --- a/internal/services/rdb/privilege.go +++ b/internal/services/rdb/privilege.go @@ -68,7 +68,7 @@ func ResourcePrivilege() *schema.Resource { } } -func ResourceRdbPrivilegeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbPrivilegeCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -123,7 +123,7 @@ func ResourceRdbPrivilegeCreate(ctx context.Context, d *schema.ResourceData, m i return ResourceRdbPrivilegeRead(ctx, d, m) } -func ResourceRdbPrivilegeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbPrivilegeRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api := newAPI(m) region, instanceID, databaseName, userName, err := ResourceRdbUserPrivilegeParseID(d.Id()) @@ -193,7 +193,7 @@ func ResourceRdbPrivilegeRead(ctx context.Context, d *schema.ResourceData, m int return nil } -func ResourceRdbPrivilegeUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbPrivilegeUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI := newAPI(m) region, instanceID, databaseName, userName, err := ResourceRdbUserPrivilegeParseID(d.Id()) @@ -266,7 +266,7 @@ func ResourceRdbPrivilegeUpdate(ctx context.Context, d *schema.ResourceData, m i } //gocyclo:ignore -func ResourceRdbPrivilegeDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbPrivilegeDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI := newAPI(m) region, instanceID, databaseName, userName, err := ResourceRdbUserPrivilegeParseID(d.Id()) diff --git a/internal/services/rdb/privilege_data_source.go b/internal/services/rdb/privilege_data_source.go index cf80b2c15c..f5b9428f4d 100644 --- a/internal/services/rdb/privilege_data_source.go +++ b/internal/services/rdb/privilege_data_source.go @@ -25,7 +25,7 @@ func DataSourcePrivilege() *schema.Resource { } // DataSourceRDBPrivilegeRead -func DataSourceRDBPrivilegeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceRDBPrivilegeRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { _, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/rdb/read_replica.go b/internal/services/rdb/read_replica.go index 9bbb62f6a9..c9500cccb5 100644 --- a/internal/services/rdb/read_replica.go +++ b/internal/services/rdb/read_replica.go @@ -155,7 +155,7 @@ func ResourceReadReplica() *schema.Resource { } } -func ResourceRdbReadReplicaCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbReadReplicaCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -199,7 +199,7 @@ func ResourceRdbReadReplicaCreate(ctx context.Context, d *schema.ResourceData, m return ResourceRdbReadReplicaRead(ctx, d, m) } -func ResourceRdbReadReplicaRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbReadReplicaRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -229,7 +229,7 @@ func ResourceRdbReadReplicaRead(ctx context.Context, d *schema.ResourceData, m i } //gocyclo:ignore -func ResourceRdbReadReplicaUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbReadReplicaUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -332,7 +332,7 @@ func ResourceRdbReadReplicaUpdate(ctx context.Context, d *schema.ResourceData, m return ResourceRdbReadReplicaRead(ctx, d, m) } -func ResourceRdbReadReplicaDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRdbReadReplicaDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/rdb/snapshots.go b/internal/services/rdb/snapshots.go index 26b03b026c..e44eb8e368 100644 --- a/internal/services/rdb/snapshots.go +++ b/internal/services/rdb/snapshots.go @@ -84,7 +84,7 @@ func ResourceSnapshot() *schema.Resource { } } -func ResourceRdbSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceRdbSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { rdbAPI, region, err := newAPIWithRegion(d, meta) if err != nil { return diag.FromErr(err) @@ -122,7 +122,7 @@ func ResourceRdbSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta return ResourceRdbSnapshotRead(ctx, d, meta) } -func ResourceRdbSnapshotRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceRdbSnapshotRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { rdbAPI, region, ID, err := NewAPIWithRegionAndID(meta, d.Id()) if err != nil { return diag.FromErr(err) @@ -165,7 +165,7 @@ func ResourceRdbSnapshotRead(ctx context.Context, d *schema.ResourceData, meta i return nil } -func ResourceRdbSnapshotUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceRdbSnapshotUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { rdbAPI, region, snapshotID, err := NewAPIWithRegionAndID(meta, d.Id()) if err != nil { return diag.FromErr(err) @@ -216,7 +216,7 @@ func ResourceRdbSnapshotUpdate(ctx context.Context, d *schema.ResourceData, meta return ResourceRdbSnapshotRead(ctx, d, meta) } -func ResourceRdbSnapshotDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceRdbSnapshotDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { rdbAPI, region, snapshotID, err := NewAPIWithRegionAndID(meta, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/rdb/types.go b/internal/services/rdb/types.go index 32efbcc98c..ca6dc25437 100644 --- a/internal/services/rdb/types.go +++ b/internal/services/rdb/types.go @@ -11,7 +11,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func flattenInstanceSettings(settings []*rdb.InstanceSetting) interface{} { +func flattenInstanceSettings(settings []*rdb.InstanceSetting) any { res := make(map[string]string) for _, value := range settings { res[value.Name] = value.Value @@ -20,8 +20,8 @@ func flattenInstanceSettings(settings []*rdb.InstanceSetting) interface{} { return res } -func expandInstanceSettings(i interface{}) []*rdb.InstanceSetting { - rawRule := i.(map[string]interface{}) +func expandInstanceSettings(i any) []*rdb.InstanceSetting { + rawRule := i.(map[string]any) res := make([]*rdb.InstanceSetting, 0, len(rawRule)) for key, value := range rawRule { @@ -34,17 +34,17 @@ func expandInstanceSettings(i interface{}) []*rdb.InstanceSetting { return res } -func expandPrivateNetwork(data interface{}, exist bool, ipamConfig *bool, staticConfig *string) ([]*rdb.EndpointSpec, diag.Diagnostics) { +func expandPrivateNetwork(data any, exist bool, ipamConfig *bool, staticConfig *string) ([]*rdb.EndpointSpec, diag.Diagnostics) { if data == nil || !exist { return nil, nil } var diags diag.Diagnostics - res := make([]*rdb.EndpointSpec, 0, len(data.([]interface{}))) + res := make([]*rdb.EndpointSpec, 0, len(data.([]any))) - for _, pn := range data.([]interface{}) { - r := pn.(map[string]interface{}) + for _, pn := range data.([]any) { + r := pn.(map[string]any) spec := &rdb.EndpointSpec{ PrivateNetwork: &rdb.EndpointSpecPrivateNetwork{ PrivateNetworkID: locality.ExpandID(r["pn_id"].(string)), @@ -83,8 +83,8 @@ func expandLoadBalancer() *rdb.EndpointSpec { } } -func flattenPrivateNetwork(endpoints []*rdb.Endpoint) (interface{}, bool) { - pnI := []map[string]interface{}(nil) +func flattenPrivateNetwork(endpoints []*rdb.Endpoint) (any, bool) { + pnI := []map[string]any(nil) for _, endpoint := range endpoints { if endpoint.PrivateNetwork != nil { @@ -107,7 +107,7 @@ func flattenPrivateNetwork(endpoints []*rdb.Endpoint) (interface{}, bool) { enableIpam = true } - pnI = append(pnI, map[string]interface{}{ + pnI = append(pnI, map[string]any{ "endpoint_id": endpoint.ID, "ip": types.FlattenIPPtr(endpoint.IP), "port": int(endpoint.Port), @@ -125,12 +125,12 @@ func flattenPrivateNetwork(endpoints []*rdb.Endpoint) (interface{}, bool) { return pnI, false } -func flattenLoadBalancer(endpoints []*rdb.Endpoint) (interface{}, bool) { - flat := []map[string]interface{}(nil) +func flattenLoadBalancer(endpoints []*rdb.Endpoint) (any, bool) { + flat := []map[string]any(nil) for _, endpoint := range endpoints { if endpoint.LoadBalancer != nil { - flat = append(flat, map[string]interface{}{ + flat = append(flat, map[string]any{ "endpoint_id": endpoint.ID, "ip": types.FlattenIPPtr(endpoint.IP), "port": int(endpoint.Port), @@ -145,8 +145,8 @@ func flattenLoadBalancer(endpoints []*rdb.Endpoint) (interface{}, bool) { return flat, false } -func expandReadReplicaEndpointsSpecDirectAccess(data interface{}) *rdb.ReadReplicaEndpointSpec { - if data == nil || len(data.([]interface{})) == 0 { +func expandReadReplicaEndpointsSpecDirectAccess(data any) *rdb.ReadReplicaEndpointSpec { + if data == nil || len(data.([]any)) == 0 { return nil } @@ -156,14 +156,14 @@ func expandReadReplicaEndpointsSpecDirectAccess(data interface{}) *rdb.ReadRepli } // expandReadReplicaEndpointsSpecPrivateNetwork expand read-replica private network endpoints from schema to specs -func expandReadReplicaEndpointsSpecPrivateNetwork(data interface{}, ipamConfig *bool, staticConfig *string) (*rdb.ReadReplicaEndpointSpec, diag.Diagnostics) { - if data == nil || len(data.([]interface{})) == 0 { +func expandReadReplicaEndpointsSpecPrivateNetwork(data any, ipamConfig *bool, staticConfig *string) (*rdb.ReadReplicaEndpointSpec, diag.Diagnostics) { + if data == nil || len(data.([]any)) == 0 { return nil, nil } // private_network is a list of size 1 - data = data.([]interface{})[0] + data = data.([]any)[0] - rawEndpoint := data.(map[string]interface{}) + rawEndpoint := data.(map[string]any) var diags diag.Diagnostics @@ -197,9 +197,9 @@ func expandReadReplicaEndpointsSpecPrivateNetwork(data interface{}, ipamConfig * } // flattenReadReplicaEndpoints flatten read-replica endpoints to directAccess and privateNetwork -func flattenReadReplicaEndpoints(endpoints []*rdb.Endpoint) (directAccess, privateNetwork interface{}) { +func flattenReadReplicaEndpoints(endpoints []*rdb.Endpoint) (directAccess, privateNetwork any) { for _, endpoint := range endpoints { - rawEndpoint := map[string]interface{}{ + rawEndpoint := map[string]any{ "endpoint_id": endpoint.ID, "ip": types.FlattenIPPtr(endpoint.IP), "port": int(endpoint.Port), @@ -234,20 +234,20 @@ func flattenReadReplicaEndpoints(endpoints []*rdb.Endpoint) (directAccess, priva // direct_access and private_network are lists if directAccess != nil { - directAccess = []interface{}{directAccess} + directAccess = []any{directAccess} } if privateNetwork != nil { - privateNetwork = []interface{}{privateNetwork} + privateNetwork = []any{privateNetwork} } return directAccess, privateNetwork } -func expandInstanceLogsPolicy(i interface{}) *rdb.LogsPolicy { - policyConfigRaw := i.([]interface{}) +func expandInstanceLogsPolicy(i any) *rdb.LogsPolicy { + policyConfigRaw := i.([]any) for _, policyRaw := range policyConfigRaw { - policy := policyRaw.(map[string]interface{}) + policy := policyRaw.(map[string]any) return &rdb.LogsPolicy{ MaxAgeRetention: types.ExpandUint32Ptr(policy["max_age_retention"]), @@ -258,10 +258,10 @@ func expandInstanceLogsPolicy(i interface{}) *rdb.LogsPolicy { return nil } -func flattenInstanceLogsPolicy(policy *rdb.LogsPolicy) interface{} { - p := []map[string]interface{}{} +func flattenInstanceLogsPolicy(policy *rdb.LogsPolicy) any { + p := []map[string]any{} if policy != nil { - p = append(p, map[string]interface{}{ + p = append(p, map[string]any{ "max_age_retention": types.FlattenUint32Ptr(policy.MaxAgeRetention), "total_disk_retention": types.FlattenSize(policy.TotalDiskRetention), }) diff --git a/internal/services/rdb/user.go b/internal/services/rdb/user.go index 5588df48bf..4a763b8577 100644 --- a/internal/services/rdb/user.go +++ b/internal/services/rdb/user.go @@ -68,7 +68,7 @@ func ResourceUser() *schema.Resource { } } -func ResourceUserCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceUserCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI := newAPI(m) // resource depends on the instance locality regionalID := d.Get("instance_id").(string) @@ -121,7 +121,7 @@ func ResourceUserCreate(ctx context.Context, d *schema.ResourceData, m interface return ResourceUserRead(ctx, d, m) } -func ResourceUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceUserRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI := newAPI(m) region, instanceID, userName, err := ResourceUserParseID(d.Id()) @@ -173,7 +173,7 @@ func ResourceUserRead(ctx context.Context, d *schema.ResourceData, m interface{} return nil } -func ResourceUserUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceUserUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI := newAPI(m) // resource depends on the instance locality region, instanceID, userName, err := ResourceUserParseID(d.Id()) @@ -208,7 +208,7 @@ func ResourceUserUpdate(ctx context.Context, d *schema.ResourceData, m interface return ResourceUserRead(ctx, d, m) } -func ResourceUserDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceUserDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { rdbAPI := newAPI(m) // resource depends on the instance locality region, instanceID, userName, err := ResourceUserParseID(d.Id()) diff --git a/internal/services/redis/cluster.go b/internal/services/redis/cluster.go index 1a373876a1..e216cf0b74 100644 --- a/internal/services/redis/cluster.go +++ b/internal/services/redis/cluster.go @@ -243,7 +243,7 @@ func ResourceCluster() *schema.Resource { } func customizeDiffMigrateClusterSize() schema.CustomizeDiffFunc { - return func(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { + return func(_ context.Context, diff *schema.ResourceDiff, _ any) error { oldSizeRaw, newSizeRaw := diff.GetChange("cluster_size") oldSize, _ := oldSizeRaw.(int) newSize, _ := newSizeRaw.(int) @@ -256,7 +256,7 @@ func customizeDiffMigrateClusterSize() schema.CustomizeDiffFunc { } } -func ResourceClusterCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceClusterCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { redisAPI, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -327,7 +327,7 @@ func ResourceClusterCreate(ctx context.Context, d *schema.ResourceData, m interf return ResourceClusterRead(ctx, d, m) } -func ResourceClusterRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceClusterRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { redisAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -367,7 +367,7 @@ func ResourceClusterRead(ctx context.Context, d *schema.ResourceData, m interfac } // set endpoints - allPrivateIPs := []map[string]interface{}(nil) + allPrivateIPs := []map[string]any(nil) diags := diag.Diagnostics{} authorized := true @@ -459,7 +459,7 @@ func ResourceClusterRead(ctx context.Context, d *schema.ResourceData, m interfac return diags } -func ResourceClusterUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceClusterUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { redisAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -638,7 +638,7 @@ func ResourceClusterUpdateEndpoints(ctx context.Context, d *schema.ResourceData, return nil } -func ResourceClusterDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceClusterDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { redisAPI, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/redis/cluster_data_source.go b/internal/services/redis/cluster_data_source.go index 2380df0bcd..5cf6f89359 100644 --- a/internal/services/redis/cluster_data_source.go +++ b/internal/services/redis/cluster_data_source.go @@ -35,7 +35,7 @@ func DataSourceCluster() *schema.Resource { } } -func DataSourceClusterRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceClusterRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/redis/helpers.go b/internal/services/redis/helpers.go index 632b5c0f3a..81261055e5 100644 --- a/internal/services/redis/helpers.go +++ b/internal/services/redis/helpers.go @@ -23,12 +23,12 @@ const ( ) // newRedisApi returns a new Redis API -func newAPI(m interface{}) *redis.API { +func newAPI(m any) *redis.API { return redis.NewAPI(meta.ExtractScwClient(m)) } // newAPIWithZone returns a new Redis API and the zone for a Create request -func newAPIWithZone(d *schema.ResourceData, m interface{}) (*redis.API, scw.Zone, error) { +func newAPIWithZone(d *schema.ResourceData, m any) (*redis.API, scw.Zone, error) { zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err @@ -38,7 +38,7 @@ func newAPIWithZone(d *schema.ResourceData, m interface{}) (*redis.API, scw.Zone } // NewAPIWithZoneAndID returns a Redis API with zone and ID extracted from the state -func NewAPIWithZoneAndID(m interface{}, id string) (*redis.API, scw.Zone, string, error) { +func NewAPIWithZoneAndID(m any, id string) (*redis.API, scw.Zone, string, error) { zone, ID, err := zonal.ParseID(id) if err != nil { return nil, "", "", err @@ -61,17 +61,17 @@ func waitForCluster(ctx context.Context, api *redis.API, zone scw.Zone, id strin }, scw.WithContext(ctx)) } -func privateNetworkSetHash(v interface{}) int { +func privateNetworkSetHash(v any) int { var buf bytes.Buffer - m := v.(map[string]interface{}) + m := v.(map[string]any) if pnID, ok := m["id"]; ok { buf.WriteString(locality.ExpandID(pnID)) } if serviceIPs, ok := m["service_ips"]; ok { // Sort the service IPs before generating the hash. - ips := serviceIPs.([]interface{}) + ips := serviceIPs.([]any) sort.Slice(ips, func(i, j int) bool { return ips[i].(string) < ips[j].(string) }) diff --git a/internal/services/redis/types.go b/internal/services/redis/types.go index 8a2e1ba586..f4a95d8833 100644 --- a/internal/services/redis/types.go +++ b/internal/services/redis/types.go @@ -12,7 +12,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func expandPrivateNetwork(data []interface{}) ([]*redis.EndpointSpec, error) { +func expandPrivateNetwork(data []any) ([]*redis.EndpointSpec, error) { if data == nil { return nil, nil } @@ -20,9 +20,9 @@ func expandPrivateNetwork(data []interface{}) ([]*redis.EndpointSpec, error) { epSpecs := make([]*redis.EndpointSpec, 0, len(data)) for _, rawPN := range data { - pn := rawPN.(map[string]interface{}) + pn := rawPN.(map[string]any) pnID := locality.ExpandID(pn["id"].(string)) - rawIPs := pn["service_ips"].([]interface{}) + rawIPs := pn["service_ips"].([]any) ips := []scw.IPNet(nil) spec := &redis.EndpointSpecPrivateNetworkSpec{ ID: pnID, @@ -49,11 +49,11 @@ func expandPrivateNetwork(data []interface{}) ([]*redis.EndpointSpec, error) { return epSpecs, nil } -func expandACLSpecs(i interface{}) ([]*redis.ACLRuleSpec, error) { +func expandACLSpecs(i any) ([]*redis.ACLRuleSpec, error) { rules := []*redis.ACLRuleSpec(nil) for _, aclRule := range i.(*schema.Set).List() { - rawRule := aclRule.(map[string]interface{}) + rawRule := aclRule.(map[string]any) rule := &redis.ACLRuleSpec{} if ruleDescription, hasDescription := rawRule["description"]; hasDescription { @@ -72,10 +72,10 @@ func expandACLSpecs(i interface{}) ([]*redis.ACLRuleSpec, error) { return rules, nil } -func flattenACLs(aclRules []*redis.ACLRule) interface{} { - flat := []map[string]interface{}(nil) +func flattenACLs(aclRules []*redis.ACLRule) any { + flat := []map[string]any(nil) for _, acl := range aclRules { - flat = append(flat, map[string]interface{}{ + flat = append(flat, map[string]any{ "id": acl.ID, "ip": acl.IPCidr.String(), "description": types.FlattenStringPtr(acl.Description), @@ -85,8 +85,8 @@ func flattenACLs(aclRules []*redis.ACLRule) interface{} { return flat } -func expandSettings(i interface{}) []*redis.ClusterSetting { - rawSettings := i.(map[string]interface{}) +func expandSettings(i any) []*redis.ClusterSetting { + rawSettings := i.(map[string]any) settings := []*redis.ClusterSetting(nil) for key, value := range rawSettings { @@ -99,7 +99,7 @@ func expandSettings(i interface{}) []*redis.ClusterSetting { return settings } -func flattenSettings(settings []*redis.ClusterSetting) interface{} { +func flattenSettings(settings []*redis.ClusterSetting) any { rawSettings := make(map[string]string) for _, setting := range settings { rawSettings[setting.Name] = setting.Value @@ -108,8 +108,8 @@ func flattenSettings(settings []*redis.ClusterSetting) interface{} { return rawSettings } -func flattenPrivateNetwork(endpoints []*redis.Endpoint) (interface{}, bool) { - pnFlat := []map[string]interface{}(nil) +func flattenPrivateNetwork(endpoints []*redis.Endpoint) (any, bool) { + pnFlat := []map[string]any(nil) for _, endpoint := range endpoints { if endpoint.PrivateNetwork == nil { @@ -125,12 +125,12 @@ func flattenPrivateNetwork(endpoints []*redis.Endpoint) (interface{}, bool) { pnRegionalID := regional.NewIDString(fetchRegion, pn.ID) - serviceIps := []interface{}(nil) + serviceIps := []any(nil) for _, ip := range pn.ServiceIPs { serviceIps = append(serviceIps, ip.String()) } - pnFlat = append(pnFlat, map[string]interface{}{ + pnFlat = append(pnFlat, map[string]any{ "endpoint_id": endpoint.ID, "zone": pn.Zone, "id": pnRegionalID, @@ -141,20 +141,20 @@ func flattenPrivateNetwork(endpoints []*redis.Endpoint) (interface{}, bool) { return pnFlat, len(pnFlat) != 0 } -func flattenPublicNetwork(endpoints []*redis.Endpoint) interface{} { - pnFlat := []map[string]interface{}(nil) +func flattenPublicNetwork(endpoints []*redis.Endpoint) any { + pnFlat := []map[string]any(nil) for _, endpoint := range endpoints { if endpoint.PublicNetwork == nil { continue } - ipsFlat := []interface{}(nil) + ipsFlat := []any(nil) for _, ip := range endpoint.IPs { ipsFlat = append(ipsFlat, ip.String()) } - pnFlat = append(pnFlat, map[string]interface{}{ + pnFlat = append(pnFlat, map[string]any{ "id": endpoint.ID, "port": int(endpoint.Port), "ips": ipsFlat, diff --git a/internal/services/registry/helpers.go b/internal/services/registry/helpers.go index 3ebb0bd77f..32172fdc3d 100644 --- a/internal/services/registry/helpers.go +++ b/internal/services/registry/helpers.go @@ -20,7 +20,7 @@ type ErrorRegistryMessage struct { } // NewAPIWithRegion returns a new container registry API and the region. -func NewAPIWithRegion(d *schema.ResourceData, m interface{}) (*registry.API, scw.Region, error) { +func NewAPIWithRegion(d *schema.ResourceData, m any) (*registry.API, scw.Region, error) { api := registry.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -32,7 +32,7 @@ func NewAPIWithRegion(d *schema.ResourceData, m interface{}) (*registry.API, scw } // NewAPIWithRegionAndID returns a new container registry API, region and ID. -func NewAPIWithRegionAndID(m interface{}, id string) (*registry.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*registry.API, scw.Region, string, error) { api := registry.NewAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) diff --git a/internal/services/registry/image_data_source.go b/internal/services/registry/image_data_source.go index bcc91eff5d..fd84e37f16 100644 --- a/internal/services/registry/image_data_source.go +++ b/internal/services/registry/image_data_source.go @@ -70,7 +70,7 @@ func DataSourceImage() *schema.Resource { } } -func DataSourceRegistryImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceRegistryImageRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := NewAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/registry/namespace.go b/internal/services/registry/namespace.go index e297ffae88..1a94602a60 100644 --- a/internal/services/registry/namespace.go +++ b/internal/services/registry/namespace.go @@ -59,7 +59,7 @@ func ResourceNamespace() *schema.Resource { } } -func ResourceNamespaceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceNamespaceCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := NewAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -86,7 +86,7 @@ func ResourceNamespaceCreate(ctx context.Context, d *schema.ResourceData, m inte return ResourceNamespaceRead(ctx, d, m) } -func ResourceNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceNamespaceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -114,7 +114,7 @@ func ResourceNamespaceRead(ctx context.Context, d *schema.ResourceData, m interf return nil } -func ResourceNamespaceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceNamespaceUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -145,7 +145,7 @@ func ResourceNamespaceUpdate(ctx context.Context, d *schema.ResourceData, m inte return ResourceNamespaceRead(ctx, d, m) } -func ResourceNamespaceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceNamespaceDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/registry/namespace_data_source.go b/internal/services/registry/namespace_data_source.go index 8a3717f0f5..d119db14eb 100644 --- a/internal/services/registry/namespace_data_source.go +++ b/internal/services/registry/namespace_data_source.go @@ -33,7 +33,7 @@ func DataSourceNamespace() *schema.Resource { } } -func DataSourceNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceNamespaceRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := NewAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/registry/tag_data_source.go b/internal/services/registry/tag_data_source.go index 3f3bd7d684..be4626dd2e 100644 --- a/internal/services/registry/tag_data_source.go +++ b/internal/services/registry/tag_data_source.go @@ -66,7 +66,7 @@ func DataSourceImageTag() *schema.Resource { } } -func DataSourceImageTagRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceImageTagRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := NewAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/scwconfig/scw_config_data_source.go b/internal/services/scwconfig/scw_config_data_source.go index a25e3fe7a4..bdf32f5419 100644 --- a/internal/services/scwconfig/scw_config_data_source.go +++ b/internal/services/scwconfig/scw_config_data_source.go @@ -57,7 +57,7 @@ func DataSourceConfig() *schema.Resource { } } -func dataSourceConfigRead(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func dataSourceConfigRead(_ context.Context, d *schema.ResourceData, m any) diag.Diagnostics { client := meta.ExtractScwClient(m) providerMeta := m.(*meta.Meta) diff --git a/internal/services/sdb/database.go b/internal/services/sdb/database.go index 0655e5422e..637c5142d7 100644 --- a/internal/services/sdb/database.go +++ b/internal/services/sdb/database.go @@ -60,7 +60,7 @@ func ResourceDatabase() *schema.Resource { } } -func ResourceDatabaseCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDatabaseCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -88,7 +88,7 @@ func ResourceDatabaseCreate(ctx context.Context, d *schema.ResourceData, m inter return ResourceDatabaseRead(ctx, d, m) } -func ResourceDatabaseRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDatabaseRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -115,7 +115,7 @@ func ResourceDatabaseRead(ctx context.Context, d *schema.ResourceData, m interfa return nil } -func ResourceDatabaseUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDatabaseUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -152,7 +152,7 @@ func ResourceDatabaseUpdate(ctx context.Context, d *schema.ResourceData, m inter return ResourceDatabaseRead(ctx, d, m) } -func ResourceDatabaseDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDatabaseDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/sdb/helpers.go b/internal/services/sdb/helpers.go index 191e63fc65..7912d2b2e1 100644 --- a/internal/services/sdb/helpers.go +++ b/internal/services/sdb/helpers.go @@ -18,7 +18,7 @@ const ( ) // newAPIWithRegion returns a new serverless_sqldb API and the region for a Create request -func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*sdbSDK.API, scw.Region, error) { +func newAPIWithRegion(d *schema.ResourceData, m any) (*sdbSDK.API, scw.Region, error) { sdbAPI := sdbSDK.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -30,7 +30,7 @@ func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*sdbSDK.API, scw.R } // NewAPIWithRegionAndID returns a new serverless_sqldb API with region and ID extracted from the state -func NewAPIWithRegionAndID(m interface{}, regionalID string) (*sdbSDK.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, regionalID string) (*sdbSDK.API, scw.Region, string, error) { sdbAPI := sdbSDK.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionalID) diff --git a/internal/services/secret/helpers.go b/internal/services/secret/helpers.go index e7c4fc0b86..2d00cc5b87 100644 --- a/internal/services/secret/helpers.go +++ b/internal/services/secret/helpers.go @@ -22,7 +22,7 @@ const ( var ErrCannotDeleteProtectedSecret = errors.New("cannot delete a protected secret") // newAPIWithRegion returns a new Secret API and the region for a Create request -func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*secret.API, scw.Region, error) { +func newAPIWithRegion(d *schema.ResourceData, m any) (*secret.API, scw.Region, error) { api := secret.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -34,7 +34,7 @@ func newAPIWithRegion(d *schema.ResourceData, m interface{}) (*secret.API, scw.R } // newAPIWithRegionAndDefault returns a new Secret API and the region for a Create request -func newAPIWithRegionOptionalProjectIDAndDefault(d *schema.ResourceData, m interface{}, defaultRegion scw.Region) (*secret.API, scw.Region, *string, error) { +func newAPIWithRegionOptionalProjectIDAndDefault(d *schema.ResourceData, m any, defaultRegion scw.Region) (*secret.API, scw.Region, *string, error) { api := secret.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegionWithDefault(d, m, defaultRegion) @@ -53,7 +53,7 @@ func newAPIWithRegionOptionalProjectIDAndDefault(d *schema.ResourceData, m inter } // newAPIWithRegionAndProjectID returns a new Secret API, with region and projectID -func newAPIWithRegionAndProjectID(d *schema.ResourceData, m interface{}) (*secret.API, scw.Region, *string, error) { +func newAPIWithRegionAndProjectID(d *schema.ResourceData, m any) (*secret.API, scw.Region, *string, error) { api := secret.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -72,7 +72,7 @@ func newAPIWithRegionAndProjectID(d *schema.ResourceData, m interface{}) (*secre } // NewAPIWithRegionAndID returns a Secret API with locality and ID extracted from the state -func NewAPIWithRegionAndID(m interface{}, id string) (*secret.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*secret.API, scw.Region, string, error) { api := secret.NewAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) @@ -84,7 +84,7 @@ func NewAPIWithRegionAndID(m interface{}, id string) (*secret.API, scw.Region, s } // NewVersionAPIWithRegionAndID returns a Secret API with locality and Nested ID extracted from the state -func NewVersionAPIWithRegionAndID(m interface{}, id string) (*secret.API, scw.Region, string, string, error) { +func NewVersionAPIWithRegionAndID(m any, id string) (*secret.API, scw.Region, string, string, error) { region, id, revision, err := locality.ParseLocalizedNestedID(id) if err != nil { return nil, "", "", "", err @@ -145,12 +145,12 @@ func updateSecretProtection(api *secret.API, region scw.Region, secretID string, } func expandEphemeralPolicy(rawSchemaPolicy any) (*secret.EphemeralPolicy, error) { - rawList := rawSchemaPolicy.([]interface{}) + rawList := rawSchemaPolicy.([]any) if len(rawList) != 1 { return nil, fmt.Errorf("expected 1 policy, found %d", len(rawList)) } - rawPolicy := rawList[0].(map[string]interface{}) + rawPolicy := rawList[0].(map[string]any) ttl, err := types.ExpandDuration(rawPolicy["ttl"]) if err != nil { @@ -169,12 +169,12 @@ func expandEphemeralPolicy(rawSchemaPolicy any) (*secret.EphemeralPolicy, error) return policy, nil } -func flattenEphemeralPolicy(policy *secret.EphemeralPolicy) []map[string]interface{} { +func flattenEphemeralPolicy(policy *secret.EphemeralPolicy) []map[string]any { if policy == nil { return nil } - policyElem := map[string]interface{}{} + policyElem := map[string]any{} if policy.TimeToLive != nil { policyElem["ttl"] = types.FlattenDuration(policy.TimeToLive.ToTimeDuration()) } @@ -185,5 +185,5 @@ func flattenEphemeralPolicy(policy *secret.EphemeralPolicy) []map[string]interfa policyElem["action"] = policy.Action - return []map[string]interface{}{policyElem} + return []map[string]any{policyElem} } diff --git a/internal/services/secret/secret.go b/internal/services/secret/secret.go index 1230e1b35e..c54bd43ab3 100644 --- a/internal/services/secret/secret.go +++ b/internal/services/secret/secret.go @@ -165,7 +165,7 @@ func ResourceSecret() *schema.Resource { } } -func ResourceSecretCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceSecretCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -212,7 +212,7 @@ func ResourceSecretCreate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceSecretRead(ctx, d, m) } -func ResourceSecretRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceSecretRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -263,9 +263,9 @@ func ResourceSecretRead(ctx context.Context, d *schema.ResourceData, m interface _ = d.Set("ephemeral_policy", flattenEphemeralPolicy(secretResponse.EphemeralPolicy)) _ = d.Set("type", secretResponse.Type) - versionsList := make([]map[string]interface{}, 0, len(versions.Versions)) + versionsList := make([]map[string]any, 0, len(versions.Versions)) for _, version := range versions.Versions { - versionsList = append(versionsList, map[string]interface{}{ + versionsList = append(versionsList, map[string]any{ "revision": strconv.Itoa(int(version.Revision)), "secret_id": version.SecretID, "status": version.Status.String(), @@ -281,7 +281,7 @@ func ResourceSecretRead(ctx context.Context, d *schema.ResourceData, m interface return nil } -func ResourceSecretUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceSecretUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -340,7 +340,7 @@ func ResourceSecretUpdate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceSecretRead(ctx, d, m) } -func ResourceSecretDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceSecretDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/secret/secret_data_source.go b/internal/services/secret/secret_data_source.go index e87740de9d..1fe2663fd8 100644 --- a/internal/services/secret/secret_data_source.go +++ b/internal/services/secret/secret_data_source.go @@ -43,7 +43,7 @@ func DataSourceSecret() *schema.Resource { } } -func DataSourceSecretRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceSecretRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, projectID, err := newAPIWithRegionAndProjectID(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/secret/version.go b/internal/services/secret/version.go index 4e7df0fd0e..9a0a46f073 100644 --- a/internal/services/secret/version.go +++ b/internal/services/secret/version.go @@ -42,7 +42,7 @@ func ResourceVersion() *schema.Resource { Description: "The data payload of your secret version.", Sensitive: true, ForceNew: true, - StateFunc: func(i interface{}) string { + StateFunc: func(i any) string { return Base64Encoded([]byte(i.(string))) }, }, @@ -76,7 +76,7 @@ func ResourceVersion() *schema.Resource { } } -func ResourceVersionCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVersionCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -103,7 +103,7 @@ func ResourceVersionCreate(ctx context.Context, d *schema.ResourceData, m interf return ResourceVersionRead(ctx, d, m) } -func ResourceVersionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVersionRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, revision, err := NewVersionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -136,7 +136,7 @@ func ResourceVersionRead(ctx context.Context, d *schema.ResourceData, m interfac return nil } -func ResourceVersionUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVersionUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, revision, err := NewVersionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -165,7 +165,7 @@ func ResourceVersionUpdate(ctx context.Context, d *schema.ResourceData, m interf return ResourceVersionRead(ctx, d, m) } -func ResourceVersionDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVersionDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, revision, err := NewVersionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/secret/version_data_source.go b/internal/services/secret/version_data_source.go index cc0c5cd558..2063e9e788 100644 --- a/internal/services/secret/version_data_source.go +++ b/internal/services/secret/version_data_source.go @@ -56,7 +56,7 @@ func DataSourceVersion() *schema.Resource { } } -func datasourceSchemaFromResourceVersionSchema(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func datasourceSchemaFromResourceVersionSchema(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { secretID, existSecretID := d.GetOk("secret_id") api, region, projectID, err := newAPIWithRegionOptionalProjectIDAndDefault(d, m, regional.ExpandID(secretID).Region) diff --git a/internal/services/tem/blockedlist.go b/internal/services/tem/blockedlist.go index 0da0fef3ae..48e2b0e6de 100644 --- a/internal/services/tem/blockedlist.go +++ b/internal/services/tem/blockedlist.go @@ -55,7 +55,7 @@ func ResourceBlockedList() *schema.Resource { } } -func ResourceBlockedListCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBlockedListCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := temAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -86,7 +86,7 @@ func ResourceBlockedListCreate(ctx context.Context, d *schema.ResourceData, m in return ResourceBlockedListRead(ctx, d, m) } -func ResourceBlockedListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBlockedListRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, domainID, err := NewAPIWithRegionAndID(m, d.Get("domain_id").(string)) if err != nil { return diag.FromErr(err) @@ -121,7 +121,7 @@ func ResourceBlockedListRead(ctx context.Context, d *schema.ResourceData, m inte return nil } -func ResourceBlockedListDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceBlockedListDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/tem/domain.go b/internal/services/tem/domain.go index 9473e6adfa..20716f67d6 100644 --- a/internal/services/tem/domain.go +++ b/internal/services/tem/domain.go @@ -41,7 +41,7 @@ func ResourceDomain() *schema.Resource { Required: true, ForceNew: true, Description: "Accept the Scaleway Terms of Service", - ValidateFunc: func(i interface{}, _ string) (warnings []string, errs []error) { + ValidateFunc: func(i any, _ string) (warnings []string, errs []error) { v := i.(bool) if !v { errs = append(errs, errors.New("you must accept the Scaleway Terms of Service to use this service")) @@ -189,7 +189,7 @@ func ResourceDomain() *schema.Resource { } } -func ResourceDomainCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDomainCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := temAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -211,7 +211,7 @@ func ResourceDomainCreate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceDomainRead(ctx, d, m) } -func ResourceDomainRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDomainRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -266,7 +266,7 @@ func ResourceDomainRead(ctx context.Context, d *schema.ResourceData, m interface return nil } -func ResourceDomainUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDomainUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -288,7 +288,7 @@ func ResourceDomainUpdate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceDomainRead(ctx, d, m) } -func ResourceDomainDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceDomainDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/tem/domain_data_source.go b/internal/services/tem/domain_data_source.go index 75d8dd497d..e1584cb560 100644 --- a/internal/services/tem/domain_data_source.go +++ b/internal/services/tem/domain_data_source.go @@ -36,7 +36,7 @@ func DataSourceDomain() *schema.Resource { } } -func DataSourceDomainRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceDomainRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := temAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/tem/domain_validation.go b/internal/services/tem/domain_validation.go index b25302927a..671d2954ee 100644 --- a/internal/services/tem/domain_validation.go +++ b/internal/services/tem/domain_validation.go @@ -53,7 +53,7 @@ func ResourceDomainValidation() *schema.Resource { } } -func ResourceDomainValidationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceDomainValidationCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { api, region, err := temAPIWithRegion(d, meta) if err != nil { return diag.FromErr(err) @@ -102,7 +102,7 @@ func ResourceDomainValidationCreate(ctx context.Context, d *schema.ResourceData, return ResourceDomainValidationRead(ctx, d, meta) } -func ResourceDomainValidationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func ResourceDomainValidationRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { api, region, err := temAPIWithRegion(d, meta) if err != nil { return diag.FromErr(err) @@ -130,7 +130,7 @@ func ResourceDomainValidationRead(ctx context.Context, d *schema.ResourceData, m return nil } -func ResourceDomainValidationDelete(_ context.Context, d *schema.ResourceData, _ interface{}) diag.Diagnostics { +func ResourceDomainValidationDelete(_ context.Context, d *schema.ResourceData, _ any) diag.Diagnostics { d.SetId("") return nil diff --git a/internal/services/tem/helpers.go b/internal/services/tem/helpers.go index 15b17de16f..7f7d6e1857 100644 --- a/internal/services/tem/helpers.go +++ b/internal/services/tem/helpers.go @@ -21,7 +21,7 @@ const ( ) // temAPIWithRegion returns a new Tem API and the region for a Create request -func temAPIWithRegion(d *schema.ResourceData, m interface{}) (*tem.API, scw.Region, error) { +func temAPIWithRegion(d *schema.ResourceData, m any) (*tem.API, scw.Region, error) { api := tem.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -33,7 +33,7 @@ func temAPIWithRegion(d *schema.ResourceData, m interface{}) (*tem.API, scw.Regi } // NewAPIWithRegionAndID returns a Tem API with zone and ID extracted from the state -func NewAPIWithRegionAndID(m interface{}, id string) (*tem.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*tem.API, scw.Region, string, error) { api := tem.NewAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) @@ -44,7 +44,7 @@ func NewAPIWithRegionAndID(m interface{}, id string) (*tem.API, scw.Region, stri return api, region, id, nil } -func getDefaultProjectID(ctx context.Context, m interface{}) (string, error) { +func getDefaultProjectID(ctx context.Context, m any) (string, error) { accountAPI := account.NewProjectAPI(m) res, err := accountAPI.ListProjects(&accountSDK.ProjectAPIListProjectsRequest{ diff --git a/internal/services/tem/offer_subscription_data_source.go b/internal/services/tem/offer_subscription_data_source.go index 2eaf552ff1..33b5b2282e 100644 --- a/internal/services/tem/offer_subscription_data_source.go +++ b/internal/services/tem/offer_subscription_data_source.go @@ -68,7 +68,7 @@ func DataSourceOfferSubscription() *schema.Resource { } } -func DataSourceOfferSubscriptionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceOfferSubscriptionRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := temAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/tem/types.go b/internal/services/tem/types.go index 0cf490ac07..1adb2314bd 100644 --- a/internal/services/tem/types.go +++ b/internal/services/tem/types.go @@ -5,12 +5,12 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func flattenDomainReputation(reputation *tem.DomainReputation) interface{} { +func flattenDomainReputation(reputation *tem.DomainReputation) any { if reputation == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "status": reputation.Status.String(), "score": reputation.Score, @@ -21,7 +21,7 @@ func flattenDomainReputation(reputation *tem.DomainReputation) interface{} { } } -func expandWebhookEventTypes(eventTypesInterface []interface{}) []tem.WebhookEventType { +func expandWebhookEventTypes(eventTypesInterface []any) []tem.WebhookEventType { eventTypes := make([]tem.WebhookEventType, len(eventTypesInterface)) for i, v := range eventTypesInterface { eventTypes[i] = tem.WebhookEventType(v.(string)) diff --git a/internal/services/tem/webhook.go b/internal/services/tem/webhook.go index 4150eb1d2c..2d77aa7873 100644 --- a/internal/services/tem/webhook.go +++ b/internal/services/tem/webhook.go @@ -70,13 +70,13 @@ func ResourceWebhook() *schema.Resource { } } -func ResourceWebhookCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceWebhookCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := temAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } - eventTypes := expandWebhookEventTypes(d.Get("event_types").([]interface{})) + eventTypes := expandWebhookEventTypes(d.Get("event_types").([]any)) webhook, err := api.CreateWebhook(&tem.CreateWebhookRequest{ Region: region, @@ -95,7 +95,7 @@ func ResourceWebhookCreate(ctx context.Context, d *schema.ResourceData, m interf return ResourceWebhookRead(ctx, d, m) } -func ResourceWebhookRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceWebhookRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -127,7 +127,7 @@ func ResourceWebhookRead(ctx context.Context, d *schema.ResourceData, m interfac return nil } -func ResourceWebhookUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceWebhookUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -143,7 +143,7 @@ func ResourceWebhookUpdate(ctx context.Context, d *schema.ResourceData, m interf } if d.HasChange("event_types") { - rawEventTypes := d.Get("event_types").([]interface{}) + rawEventTypes := d.Get("event_types").([]any) eventTypes := make([]tem.WebhookEventType, len(rawEventTypes)) for i, raw := range rawEventTypes { @@ -165,7 +165,7 @@ func ResourceWebhookUpdate(ctx context.Context, d *schema.ResourceData, m interf return ResourceWebhookRead(ctx, d, m) } -func ResourceWebhookDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceWebhookDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpc/acl.go b/internal/services/vpc/acl.go index 25c220b642..1a4c2ef5ba 100644 --- a/internal/services/vpc/acl.go +++ b/internal/services/vpc/acl.go @@ -103,7 +103,7 @@ func ResourceACL() *schema.Resource { } } -func ResourceVPCACLCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCACLCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, err := vpcAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -135,7 +135,7 @@ func ResourceVPCACLCreate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceVPCACLRead(ctx, d, m) } -func ResourceVPCACLRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCACLRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -162,7 +162,7 @@ func ResourceVPCACLRead(ctx context.Context, d *schema.ResourceData, m interface return nil } -func ResourceVPCACLUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCACLUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -192,7 +192,7 @@ func ResourceVPCACLUpdate(ctx context.Context, d *schema.ResourceData, m interfa return ResourceVPCACLRead(ctx, d, m) } -func ResourceVPCACLDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCACLDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpc/helpers.go b/internal/services/vpc/helpers.go index 08e40f394a..6e7904b57d 100644 --- a/internal/services/vpc/helpers.go +++ b/internal/services/vpc/helpers.go @@ -20,7 +20,7 @@ import ( const defaultVPCPrivateNetworkRetryInterval = 30 * time.Second // vpcAPIWithRegion returns a new VPC API and the region for a Create request -func vpcAPIWithRegion(d *schema.ResourceData, m interface{}) (*vpc.API, scw.Region, error) { +func vpcAPIWithRegion(d *schema.ResourceData, m any) (*vpc.API, scw.Region, error) { vpcAPI := vpc.NewAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -32,7 +32,7 @@ func vpcAPIWithRegion(d *schema.ResourceData, m interface{}) (*vpc.API, scw.Regi } // NewAPIWithRegionAndID returns a new VPC API with locality and ID extracted from the state -func NewAPIWithRegionAndID(m interface{}, id string) (*vpc.API, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*vpc.API, scw.Region, string, error) { vpcAPI := vpc.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(id) @@ -43,12 +43,12 @@ func NewAPIWithRegionAndID(m interface{}, id string) (*vpc.API, scw.Region, stri return vpcAPI, region, ID, err } -func NewAPI(m interface{}) (*vpc.API, error) { +func NewAPI(m any) (*vpc.API, error) { return vpc.NewAPI(meta.ExtractScwClient(m)), nil } // routesAPIWithRegion returns a new VPC API and the region for a Create request -func routesAPIWithRegion(d *schema.ResourceData, m interface{}) (*vpc.RoutesWithNexthopAPI, scw.Region, error) { +func routesAPIWithRegion(d *schema.ResourceData, m any) (*vpc.RoutesWithNexthopAPI, scw.Region, error) { routesAPI := vpc.NewRoutesWithNexthopAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -65,7 +65,7 @@ func vpcPrivateNetworkUpgradeV1SchemaType() cty.Type { }) } -func vpcPrivateNetworkV1SUpgradeFunc(_ context.Context, rawState map[string]interface{}, _ interface{}) (map[string]interface{}, error) { +func vpcPrivateNetworkV1SUpgradeFunc(_ context.Context, rawState map[string]any, _ any) (map[string]any, error) { var err error ID, exist := rawState["id"] diff --git a/internal/services/vpc/private_network.go b/internal/services/vpc/private_network.go index b4b3e7dfe9..d25b5f0bef 100644 --- a/internal/services/vpc/private_network.go +++ b/internal/services/vpc/private_network.go @@ -185,7 +185,7 @@ func ResourcePrivateNetwork() *schema.Resource { } } -func ResourceVPCPrivateNetworkCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPrivateNetworkCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, err := vpcAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -226,7 +226,7 @@ func ResourceVPCPrivateNetworkCreate(ctx context.Context, d *schema.ResourceData return ResourceVPCPrivateNetworkRead(ctx, d, m) } -func ResourceVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -269,7 +269,7 @@ func ResourceVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData, return nil } -func ResourceVPCPrivateNetworkUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPrivateNetworkUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -288,7 +288,7 @@ func ResourceVPCPrivateNetworkUpdate(ctx context.Context, d *schema.ResourceData return ResourceVPCPrivateNetworkRead(ctx, d, m) } -func ResourceVPCPrivateNetworkDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPrivateNetworkDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpc/private_network_data_source.go b/internal/services/vpc/private_network_data_source.go index f5f8977229..564f80b1e6 100644 --- a/internal/services/vpc/private_network_data_source.go +++ b/internal/services/vpc/private_network_data_source.go @@ -42,7 +42,7 @@ func DataSourcePrivateNetwork() *schema.Resource { } } -func DataSourceVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, err := vpcAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpc/route.go b/internal/services/vpc/route.go index 342ee1b494..102ad71c14 100644 --- a/internal/services/vpc/route.go +++ b/internal/services/vpc/route.go @@ -78,7 +78,7 @@ func ResourceRoute() *schema.Resource { } } -func ResourceRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRouteCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, err := vpcAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -114,7 +114,7 @@ func ResourceRouteCreate(ctx context.Context, d *schema.ResourceData, m interfac return ResourceRouteRead(ctx, d, m) } -func ResourceRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRouteRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -156,7 +156,7 @@ func ResourceRouteRead(ctx context.Context, d *schema.ResourceData, m interface{ return nil } -func ResourceRouteUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRouteUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -214,7 +214,7 @@ func ResourceRouteUpdate(ctx context.Context, d *schema.ResourceData, m interfac return ResourceRouteRead(ctx, d, m) } -func ResourceRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceRouteDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpc/routes_data_source.go b/internal/services/vpc/routes_data_source.go index 7d789eede9..cd8a8952e8 100644 --- a/internal/services/vpc/routes_data_source.go +++ b/internal/services/vpc/routes_data_source.go @@ -123,7 +123,7 @@ func DataSourceRoutes() *schema.Resource { } } -func DataSourceRoutesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceRoutesRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { routesAPI, region, err := routesAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -148,10 +148,10 @@ func DataSourceRoutesRead(ctx context.Context, d *schema.ResourceData, m interfa return diag.FromErr(err) } - routes := []interface{}(nil) + routes := []any(nil) for _, route := range res.Routes { - rawRoute := make(map[string]interface{}) + rawRoute := make(map[string]any) if route.Route != nil { rawRoute["id"] = regional.NewIDString(region, route.Route.ID) rawRoute["created_at"] = types.FlattenTime(route.Route.CreatedAt) diff --git a/internal/services/vpc/types.go b/internal/services/vpc/types.go index 7f8c876ce1..58fbd05229 100644 --- a/internal/services/vpc/types.go +++ b/internal/services/vpc/types.go @@ -13,8 +13,8 @@ import ( func expandSubnets(d *schema.ResourceData) (ipv4Subnets []scw.IPNet, ipv6Subnets []scw.IPNet, err error) { if v, ok := d.GetOk("ipv4_subnet"); ok { - for _, s := range v.([]interface{}) { - rawSubnet := s.(map[string]interface{}) + for _, s := range v.([]any) { + rawSubnet := s.(map[string]any) ipNet, err := types.ExpandIPNet(rawSubnet["subnet"].(string)) if err != nil { @@ -27,7 +27,7 @@ func expandSubnets(d *schema.ResourceData) (ipv4Subnets []scw.IPNet, ipv6Subnets if v, ok := d.GetOk("ipv6_subnets"); ok { for _, s := range v.(*schema.Set).List() { - rawSubnet := s.(map[string]interface{}) + rawSubnet := s.(map[string]any) ipNet, err := types.ExpandIPNet(rawSubnet["subnet"].(string)) if err != nil { @@ -41,7 +41,7 @@ func expandSubnets(d *schema.ResourceData) (ipv4Subnets []scw.IPNet, ipv6Subnets return } -func FlattenAndSortSubnets(sub interface{}) (interface{}, interface{}) { +func FlattenAndSortSubnets(sub any) (any, any) { switch subnets := sub.(type) { case []scw.IPNet: return flattenAndSortIPNetSubnets(subnets) @@ -52,13 +52,13 @@ func FlattenAndSortSubnets(sub interface{}) (interface{}, interface{}) { } } -func flattenAndSortIPNetSubnets(subnets []scw.IPNet) (interface{}, interface{}) { +func flattenAndSortIPNetSubnets(subnets []scw.IPNet) (any, any) { if subnets == nil { return "", nil } - flatIpv4Subnets := []map[string]interface{}(nil) - flatIpv6Subnets := []map[string]interface{}(nil) + flatIpv4Subnets := []map[string]any(nil) + flatIpv6Subnets := []map[string]any(nil) for _, s := range subnets { // If it's an IPv4 subnet @@ -68,7 +68,7 @@ func flattenAndSortIPNetSubnets(subnets []scw.IPNet) (interface{}, interface{}) return "", nil } - flatIpv4Subnets = append(flatIpv4Subnets, map[string]interface{}{ + flatIpv4Subnets = append(flatIpv4Subnets, map[string]any{ "subnet": sub, "address": s.IP.String(), "subnet_mask": maskHexToDottedDecimal(s.Mask), @@ -80,7 +80,7 @@ func flattenAndSortIPNetSubnets(subnets []scw.IPNet) (interface{}, interface{}) return "", nil } - flatIpv6Subnets = append(flatIpv6Subnets, map[string]interface{}{ + flatIpv6Subnets = append(flatIpv6Subnets, map[string]any{ "subnet": sub, "address": s.IP.String(), "subnet_mask": maskHexToDottedDecimal(s.Mask), @@ -92,13 +92,13 @@ func flattenAndSortIPNetSubnets(subnets []scw.IPNet) (interface{}, interface{}) return flatIpv4Subnets, flatIpv6Subnets } -func flattenAndSortSubnetV2s(subnets []*vpc.Subnet) (interface{}, interface{}) { +func flattenAndSortSubnetV2s(subnets []*vpc.Subnet) (any, any) { if subnets == nil { return "", nil } - flatIpv4Subnets := []map[string]interface{}(nil) - flatIpv6Subnets := []map[string]interface{}(nil) + flatIpv4Subnets := []map[string]any(nil) + flatIpv6Subnets := []map[string]any(nil) for _, s := range subnets { // If it's an IPv4 subnet @@ -108,7 +108,7 @@ func flattenAndSortSubnetV2s(subnets []*vpc.Subnet) (interface{}, interface{}) { return "", nil } - flatIpv4Subnets = append(flatIpv4Subnets, map[string]interface{}{ + flatIpv4Subnets = append(flatIpv4Subnets, map[string]any{ "id": s.ID, "created_at": types.FlattenTime(s.CreatedAt), "updated_at": types.FlattenTime(s.UpdatedAt), @@ -123,7 +123,7 @@ func flattenAndSortSubnetV2s(subnets []*vpc.Subnet) (interface{}, interface{}) { return "", nil } - flatIpv6Subnets = append(flatIpv6Subnets, map[string]interface{}{ + flatIpv6Subnets = append(flatIpv6Subnets, map[string]any{ "id": s.ID, "created_at": types.FlattenTime(s.CreatedAt), "updated_at": types.FlattenTime(s.UpdatedAt), @@ -138,15 +138,15 @@ func flattenAndSortSubnetV2s(subnets []*vpc.Subnet) (interface{}, interface{}) { return flatIpv4Subnets, flatIpv6Subnets } -func expandACLRules(data interface{}) ([]*vpc.ACLRule, error) { +func expandACLRules(data any) ([]*vpc.ACLRule, error) { if data == nil { return nil, nil } rules := []*vpc.ACLRule(nil) - for _, rule := range data.([]interface{}) { - rawRule := rule.(map[string]interface{}) + for _, rule := range data.([]any) { + rawRule := rule.(map[string]any) ACLRule := &vpc.ACLRule{} source, err := types.ExpandIPNet(rawRule["source"].(string)) @@ -175,12 +175,12 @@ func expandACLRules(data interface{}) ([]*vpc.ACLRule, error) { return rules, nil } -func flattenACLRules(rules []*vpc.ACLRule) interface{} { +func flattenACLRules(rules []*vpc.ACLRule) any { if rules == nil { return nil } - flattenedRules := []map[string]interface{}(nil) + flattenedRules := []map[string]any(nil) for _, rule := range rules { flattenedSource, err := types.FlattenIPNet(rule.Source) @@ -193,7 +193,7 @@ func flattenACLRules(rules []*vpc.ACLRule) interface{} { return nil } - flattenedRules = append(flattenedRules, map[string]interface{}{ + flattenedRules = append(flattenedRules, map[string]any{ "protocol": rule.Protocol.String(), "source": flattenedSource, "src_port_low": int(rule.SrcPortLow), diff --git a/internal/services/vpc/vpc.go b/internal/services/vpc/vpc.go index 2b98fdb89f..f571d74f7f 100644 --- a/internal/services/vpc/vpc.go +++ b/internal/services/vpc/vpc.go @@ -65,7 +65,7 @@ func ResourceVPC() *schema.Resource { Description: "The date and time of the last update of the private network", }, }, - CustomizeDiff: func(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { + CustomizeDiff: func(_ context.Context, diff *schema.ResourceDiff, _ any) error { before, after := diff.GetChange("enable_routing") if before != nil && before.(bool) && after != nil && !after.(bool) { return errors.New("routing cannot be disabled on this VPC") @@ -76,7 +76,7 @@ func ResourceVPC() *schema.Resource { } } -func ResourceVPCCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, err := vpcAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -98,7 +98,7 @@ func ResourceVPCCreate(ctx context.Context, d *schema.ResourceData, m interface{ return ResourceVPCRead(ctx, d, m) } -func ResourceVPCRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -134,7 +134,7 @@ func ResourceVPCRead(ctx context.Context, d *schema.ResourceData, m interface{}) return nil } -func ResourceVPCUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -180,7 +180,7 @@ func ResourceVPCUpdate(ctx context.Context, d *schema.ResourceData, m interface{ return ResourceVPCRead(ctx, d, m) } -func ResourceVPCDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, ID, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpc/vpc_data_source.go b/internal/services/vpc/vpc_data_source.go index 25249b1659..a89daa8167 100644 --- a/internal/services/vpc/vpc_data_source.go +++ b/internal/services/vpc/vpc_data_source.go @@ -41,13 +41,13 @@ func DataSourceVPC() *schema.Resource { } } -func DataSourceVPCRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceVPCRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, err := vpcAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } - var vpcID interface{} + var vpcID any var ok bool diff --git a/internal/services/vpc/vpcs_data_source.go b/internal/services/vpc/vpcs_data_source.go index a886ec42f3..2823c232cf 100644 --- a/internal/services/vpc/vpcs_data_source.go +++ b/internal/services/vpc/vpcs_data_source.go @@ -74,7 +74,7 @@ func DataSourceVPCs() *schema.Resource { } } -func DataSourceVPCsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceVPCsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcAPI, region, err := vpcAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -90,10 +90,10 @@ func DataSourceVPCsRead(ctx context.Context, d *schema.ResourceData, m interface return diag.FromErr(err) } - vpcs := []interface{}(nil) + vpcs := []any(nil) for _, virtualPrivateCloud := range res.Vpcs { - rawVpc := make(map[string]interface{}) + rawVpc := make(map[string]any) rawVpc["id"] = regional.NewIDString(region, virtualPrivateCloud.ID) rawVpc["name"] = virtualPrivateCloud.Name rawVpc["created_at"] = types.FlattenTime(virtualPrivateCloud.CreatedAt) diff --git a/internal/services/vpcgw/dhcp.go b/internal/services/vpcgw/dhcp.go index d9ef1c40ea..9c8b88ab97 100644 --- a/internal/services/vpcgw/dhcp.go +++ b/internal/services/vpcgw/dhcp.go @@ -131,7 +131,7 @@ func ResourceDHCP() *schema.Resource { } } -func ResourceVPCPublicGatewayDHCPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayDHCPCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -198,7 +198,7 @@ func ResourceVPCPublicGatewayDHCPCreate(ctx context.Context, d *schema.ResourceD return ResourceVPCPublicGatewayDHCPRead(ctx, d, m) } -func ResourceVPCPublicGatewayDHCPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayDHCPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -240,7 +240,7 @@ func ResourceVPCPublicGatewayDHCPRead(ctx context.Context, d *schema.ResourceDat return nil } -func ResourceVPCPublicGatewayDHCPUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayDHCPUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -320,7 +320,7 @@ func ResourceVPCPublicGatewayDHCPUpdate(ctx context.Context, d *schema.ResourceD return ResourceVPCPublicGatewayDHCPRead(ctx, d, m) } -func ResourceVPCPublicGatewayDHCPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayDHCPDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpcgw/dhcp_data_source.go b/internal/services/vpcgw/dhcp_data_source.go index 73f34178fe..41ce0c91ea 100644 --- a/internal/services/vpcgw/dhcp_data_source.go +++ b/internal/services/vpcgw/dhcp_data_source.go @@ -26,7 +26,7 @@ func DataSourceDHCP() *schema.Resource { } } -func DataSourceVPCPublicGatewayDHCPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceVPCPublicGatewayDHCPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { _, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpcgw/dhcp_reservation.go b/internal/services/vpcgw/dhcp_reservation.go index 905e825860..b1bcbe6f8f 100644 --- a/internal/services/vpcgw/dhcp_reservation.go +++ b/internal/services/vpcgw/dhcp_reservation.go @@ -79,7 +79,7 @@ func ResourceDHCPReservation() *schema.Resource { } } -func ResourceVPCPublicGatewayDHCPCReservationCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayDHCPCReservationCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) @@ -122,7 +122,7 @@ func ResourceVPCPublicGatewayDHCPCReservationCreate(ctx context.Context, d *sche return ResourceVPCPublicGatewayDHCPReservationRead(ctx, d, m) } -func ResourceVPCPublicGatewayDHCPReservationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayDHCPReservationRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -154,7 +154,7 @@ func ResourceVPCPublicGatewayDHCPReservationRead(ctx context.Context, d *schema. return nil } -func ResourceVPCPublicGatewayDHCPReservationUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayDHCPReservationUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -193,7 +193,7 @@ func ResourceVPCPublicGatewayDHCPReservationUpdate(ctx context.Context, d *schem return ResourceVPCPublicGatewayDHCPReservationRead(ctx, d, m) } -func ResourceVPCPublicGatewayDHCPReservationDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayDHCPReservationDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpcgw/dhcp_reservation_data_source.go b/internal/services/vpcgw/dhcp_reservation_data_source.go index bf8a8d1fa1..9d93ac2766 100644 --- a/internal/services/vpcgw/dhcp_reservation_data_source.go +++ b/internal/services/vpcgw/dhcp_reservation_data_source.go @@ -46,7 +46,7 @@ func DataSourceDHCPReservation() *schema.Resource { } } -func DataSourceDHCPReservationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceDHCPReservationRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpcgw/helpers.go b/internal/services/vpcgw/helpers.go index d6d317d19a..3c12bca349 100644 --- a/internal/services/vpcgw/helpers.go +++ b/internal/services/vpcgw/helpers.go @@ -28,7 +28,7 @@ const ( ) // newAPIWithZone returns a new VPC API and the zone for a Create request -func newAPIWithZone(d *schema.ResourceData, m interface{}) (*vpcgw.API, scw.Zone, error) { +func newAPIWithZone(d *schema.ResourceData, m any) (*vpcgw.API, scw.Zone, error) { api := vpcgw.NewAPI(meta.ExtractScwClient(m)) zone, err := meta.ExtractZone(d, m) @@ -39,7 +39,7 @@ func newAPIWithZone(d *schema.ResourceData, m interface{}) (*vpcgw.API, scw.Zone return api, zone, nil } -func newAPIWithZoneV2(d *schema.ResourceData, m interface{}) (*v2.API, scw.Zone, error) { +func newAPIWithZoneV2(d *schema.ResourceData, m any) (*v2.API, scw.Zone, error) { api := v2.NewAPI(meta.ExtractScwClient(m)) zone, err := meta.ExtractZone(d, m) @@ -50,7 +50,7 @@ func newAPIWithZoneV2(d *schema.ResourceData, m interface{}) (*v2.API, scw.Zone, return api, zone, nil } -func NewAPIWithZoneAndID(m interface{}, id string) (*vpcgw.API, scw.Zone, string, error) { +func NewAPIWithZoneAndID(m any, id string) (*vpcgw.API, scw.Zone, string, error) { api := vpcgw.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) @@ -61,7 +61,7 @@ func NewAPIWithZoneAndID(m interface{}, id string) (*vpcgw.API, scw.Zone, string return api, zone, ID, nil } -func NewAPIWithZoneAndIDv2(m interface{}, id string) (*v2.API, scw.Zone, string, error) { +func NewAPIWithZoneAndIDv2(m any, id string) (*v2.API, scw.Zone, string, error) { api := v2.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) @@ -92,12 +92,12 @@ func retryUpdateGatewayReverseDNS(ctx context.Context, api *v2.API, req *v2.Upda } } -func expandUpdateIpamConfig(raw interface{}) *vpcgw.UpdateGatewayNetworkRequestIpamConfig { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandUpdateIpamConfig(raw any) *vpcgw.UpdateGatewayNetworkRequestIpamConfig { + if raw == nil || len(raw.([]any)) != 1 { return nil } - rawMap := raw.([]interface{})[0].(map[string]interface{}) + rawMap := raw.([]any)[0].(map[string]any) updateIpamConfig := &vpcgw.UpdateGatewayNetworkRequestIpamConfig{ PushDefaultRoute: scw.BoolPtr(rawMap["push_default_route"].(bool)), @@ -110,12 +110,12 @@ func expandUpdateIpamConfig(raw interface{}) *vpcgw.UpdateGatewayNetworkRequestI return updateIpamConfig } -func expandIpamConfigV2(raw interface{}) (bool, *string) { - if raw == nil || len(raw.([]interface{})) != 1 { +func expandIpamConfigV2(raw any) (bool, *string) { + if raw == nil || len(raw.([]any)) != 1 { return false, nil } - rawMap := raw.([]interface{})[0].(map[string]interface{}) + rawMap := raw.([]any)[0].(map[string]any) pushDefaultRoute := rawMap["push_default_route"].(bool) @@ -128,12 +128,12 @@ func expandIpamConfigV2(raw interface{}) (bool, *string) { return pushDefaultRoute, ipamIPID } -func flattenIpamConfig(config *vpcgw.IpamConfig, region scw.Region) interface{} { +func flattenIpamConfig(config *vpcgw.IpamConfig, region scw.Region) any { if config == nil { return nil } - return []map[string]interface{}{ + return []map[string]any{ { "push_default_route": config.PushDefaultRoute, "ipam_ip_id": regional.NewIDString(region, config.IpamIPID), @@ -293,7 +293,7 @@ func readVPCGWNetworkResourceDataV2(d *schema.ResourceData, gatewayNetwork *v2.G _ = d.Set("updated_at", gatewayNetwork.UpdatedAt.Format(time.RFC3339)) } - ipamConfig := []map[string]interface{}{ + ipamConfig := []map[string]any{ { "push_default_route": gatewayNetwork.PushDefaultRoute, "ipam_ip_id": gatewayNetwork.IpamIPID, @@ -305,7 +305,7 @@ func readVPCGWNetworkResourceDataV2(d *schema.ResourceData, gatewayNetwork *v2.G return nil } -func setPrivateIPsV1(ctx context.Context, d *schema.ResourceData, api *vpcgw.API, gn *vpcgw.GatewayNetwork, m interface{}) diag.Diagnostics { +func setPrivateIPsV1(ctx context.Context, d *schema.ResourceData, api *vpcgw.API, gn *vpcgw.GatewayNetwork, m any) diag.Diagnostics { resourceID := gn.ID region, err := gn.Zone.Region() @@ -366,7 +366,7 @@ func setPrivateIPsV1(ctx context.Context, d *schema.ResourceData, api *vpcgw.API return nil } -func setPrivateIPsV2(ctx context.Context, d *schema.ResourceData, api *v2.API, gn *v2.GatewayNetwork, m interface{}) diag.Diagnostics { +func setPrivateIPsV2(ctx context.Context, d *schema.ResourceData, api *v2.API, gn *v2.GatewayNetwork, m any) diag.Diagnostics { resourceID := gn.ID region, err := gn.Zone.Region() diff --git a/internal/services/vpcgw/ip.go b/internal/services/vpcgw/ip.go index 8e7513b07b..9168448d03 100644 --- a/internal/services/vpcgw/ip.go +++ b/internal/services/vpcgw/ip.go @@ -62,7 +62,7 @@ func ResourceIP() *schema.Resource { } } -func ResourceIPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIPCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZoneV2(d, m) if err != nil { return diag.FromErr(err) @@ -99,7 +99,7 @@ func ResourceIPCreate(ctx context.Context, d *schema.ResourceData, m interface{} return ResourceIPRead(ctx, d, m) } -func ResourceIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceIPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -131,7 +131,7 @@ func ResourceIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) return nil } -func ResourceVPCPublicGatewayIPUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayIPUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -164,7 +164,7 @@ func ResourceVPCPublicGatewayIPUpdate(ctx context.Context, d *schema.ResourceDat return ResourceIPRead(ctx, d, m) } -func ResourceVPCPublicGatewayIPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayIPDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpcgw/ip_data_source.go b/internal/services/vpcgw/ip_data_source.go index 814b7d7c1d..2068b96654 100644 --- a/internal/services/vpcgw/ip_data_source.go +++ b/internal/services/vpcgw/ip_data_source.go @@ -26,7 +26,7 @@ func DataSourceIP() *schema.Resource { } } -func DataSourceVPCPublicGatewayIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceVPCPublicGatewayIPRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { _, zone, err := newAPIWithZone(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpcgw/ip_reverse.go b/internal/services/vpcgw/ip_reverse.go index f9a857e738..e8d6084497 100644 --- a/internal/services/vpcgw/ip_reverse.go +++ b/internal/services/vpcgw/ip_reverse.go @@ -46,7 +46,7 @@ func ResourceIPReverseDNS() *schema.Resource { } } -func ResourceVPCPublicGatewayIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZoneV2(d, m) if err != nil { return diag.FromErr(err) @@ -84,7 +84,7 @@ func ResourceVPCPublicGatewayIPReverseDNSCreate(ctx context.Context, d *schema.R return ResourceVPCPublicGatewayIPReverseDNSRead(ctx, d, m) } -func ResourceVPCPublicGatewayIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -110,7 +110,7 @@ func ResourceVPCPublicGatewayIPReverseDNSRead(ctx context.Context, d *schema.Res return nil } -func ResourceVPCPublicGatewayIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -138,7 +138,7 @@ func ResourceVPCPublicGatewayIPReverseDNSUpdate(ctx context.Context, d *schema.R return ResourceVPCPublicGatewayIPReverseDNSRead(ctx, d, m) } -func ResourceVPCPublicGatewayIPReverseDNSDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayIPReverseDNSDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpcgw/network.go b/internal/services/vpcgw/network.go index 3da2dc6cfe..1999165134 100644 --- a/internal/services/vpcgw/network.go +++ b/internal/services/vpcgw/network.go @@ -59,7 +59,7 @@ func ResourceNetwork() *schema.Resource { Description: "The ID of the public gateway DHCP config", ConflictsWith: []string{"static_address", "ipam_config"}, DiffSuppressFunc: func(_, oldValue, newValue string, d *schema.ResourceData) bool { - if v, ok := d.Get("ipam_config").([]interface{}); ok && len(v) > 0 { + if v, ok := d.Get("ipam_config").([]any); ok && len(v) > 0 { return true } @@ -166,7 +166,7 @@ func ResourceNetwork() *schema.Resource { } } -func ResourceVPCGatewayNetworkCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCGatewayNetworkCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZoneV2(d, m) if err != nil { return diag.FromErr(err) @@ -216,7 +216,7 @@ func ResourceVPCGatewayNetworkCreate(ctx context.Context, d *schema.ResourceData return ResourceVPCGatewayNetworkRead(ctx, d, m) } -func ResourceVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -261,7 +261,7 @@ func ResourceVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData, return readVPCGWNetworkResourceDataV2(d, gatewayNetwork, diags) } -func ResourceVPCGatewayNetworkUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCGatewayNetworkUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -307,7 +307,7 @@ func ResourceVPCGatewayNetworkUpdate(ctx context.Context, d *schema.ResourceData return ResourceVPCGatewayNetworkRead(ctx, d, m) } -func ResourceVPCGatewayNetworkDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCGatewayNetworkDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpcgw/network_data_source.go b/internal/services/vpcgw/network_data_source.go index dd57fcd355..dd221ba8a9 100644 --- a/internal/services/vpcgw/network_data_source.go +++ b/internal/services/vpcgw/network_data_source.go @@ -42,7 +42,7 @@ func DataSourceNetwork() *schema.Resource { } } -func DataSourceVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { vpcgwAPI, zone, err := newAPIWithZoneV2(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpcgw/pat_rule.go b/internal/services/vpcgw/pat_rule.go index 3ab9e6238f..5f63685e89 100644 --- a/internal/services/vpcgw/pat_rule.go +++ b/internal/services/vpcgw/pat_rule.go @@ -87,7 +87,7 @@ func ResourcePATRule() *schema.Resource { } } -func ResourceVPCPublicGatewayPATRuleCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayPATRuleCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZoneV2(d, m) if err != nil { return diag.FromErr(err) @@ -129,7 +129,7 @@ func ResourceVPCPublicGatewayPATRuleCreate(ctx context.Context, d *schema.Resour return ResourceVPCPublicGatewayPATRuleRead(ctx, d, m) } -func ResourceVPCPublicGatewayPATRuleRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayPATRuleRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -162,7 +162,7 @@ func ResourceVPCPublicGatewayPATRuleRead(ctx context.Context, d *schema.Resource return nil } -func ResourceVPCPublicGatewayPATRuleUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayPATRuleUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -235,7 +235,7 @@ func ResourceVPCPublicGatewayPATRuleUpdate(ctx context.Context, d *schema.Resour return ResourceVPCPublicGatewayPATRuleRead(ctx, d, m) } -func ResourceVPCPublicGatewayPATRuleDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayPATRuleDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, ID, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpcgw/pat_rule_data_source.go b/internal/services/vpcgw/pat_rule_data_source.go index 7d3805271a..430999a0a9 100644 --- a/internal/services/vpcgw/pat_rule_data_source.go +++ b/internal/services/vpcgw/pat_rule_data_source.go @@ -32,7 +32,7 @@ func DataSourcePATRule() *schema.Resource { } } -func DataSourceVPCPublicGatewayPATRuleRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceVPCPublicGatewayPATRuleRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZoneV2(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpcgw/public_gateway.go b/internal/services/vpcgw/public_gateway.go index c8739a929a..180bda7a46 100644 --- a/internal/services/vpcgw/public_gateway.go +++ b/internal/services/vpcgw/public_gateway.go @@ -134,7 +134,7 @@ func ResourcePublicGateway() *schema.Resource { } } -func ResourceVPCPublicGatewayCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZoneV2(d, m) if err != nil { return diag.FromErr(err) @@ -186,7 +186,7 @@ func ResourceVPCPublicGatewayCreate(ctx context.Context, d *schema.ResourceData, return ResourceVPCPublicGatewayRead(ctx, d, m) } -func ResourceVPCPublicGatewayRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -221,7 +221,7 @@ func ResourceVPCPublicGatewayRead(ctx context.Context, d *schema.ResourceData, m return readVPCGWResourceDataV2(d, gatewayV2) } -func ResourceVPCPublicGatewayUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -270,7 +270,7 @@ func ResourceVPCPublicGatewayUpdate(ctx context.Context, d *schema.ResourceData, return ResourceVPCPublicGatewayRead(ctx, d, m) } -func ResourceVPCPublicGatewayDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func ResourceVPCPublicGatewayDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, id, err := NewAPIWithZoneAndIDv2(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/vpcgw/public_gateway_data_source.go b/internal/services/vpcgw/public_gateway_data_source.go index 35eae6a0b2..c7aa50a29a 100644 --- a/internal/services/vpcgw/public_gateway_data_source.go +++ b/internal/services/vpcgw/public_gateway_data_source.go @@ -34,7 +34,7 @@ func DataSourceVPCPublicGateway() *schema.Resource { } } -func DataSourceVPCPublicGatewayRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceVPCPublicGatewayRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, zone, err := newAPIWithZoneV2(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/webhosting/helpers.go b/internal/services/webhosting/helpers.go index 5b72731bf3..7cbdef75cd 100644 --- a/internal/services/webhosting/helpers.go +++ b/internal/services/webhosting/helpers.go @@ -17,7 +17,7 @@ const ( hostingRetryInterval = 5 * time.Second ) -func newOfferAPIWithRegion(d *schema.ResourceData, m interface{}) (*webhosting.OfferAPI, scw.Region, error) { +func newOfferAPIWithRegion(d *schema.ResourceData, m any) (*webhosting.OfferAPI, scw.Region, error) { api := webhosting.NewOfferAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -29,7 +29,7 @@ func newOfferAPIWithRegion(d *schema.ResourceData, m interface{}) (*webhosting.O } // newHostingAPIWithRegion returns a new Hosting API and the region for a Create request. -func newHostingAPIWithRegion(d *schema.ResourceData, m interface{}) (*webhosting.HostingAPI, scw.Region, error) { +func newHostingAPIWithRegion(d *schema.ResourceData, m any) (*webhosting.HostingAPI, scw.Region, error) { api := webhosting.NewHostingAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -40,7 +40,7 @@ func newHostingAPIWithRegion(d *schema.ResourceData, m interface{}) (*webhosting return api, region, nil } -func newDNSAPIWithRegion(d *schema.ResourceData, m interface{}) (*webhosting.DnsAPI, scw.Region, error) { +func newDNSAPIWithRegion(d *schema.ResourceData, m any) (*webhosting.DnsAPI, scw.Region, error) { api := webhosting.NewDnsAPI(meta.ExtractScwClient(m)) region, err := meta.ExtractRegion(d, m) @@ -52,7 +52,7 @@ func newDNSAPIWithRegion(d *schema.ResourceData, m interface{}) (*webhosting.Dns } // NewAPIWithRegionAndID returns a Hosting API with region and ID extracted from the state. -func NewAPIWithRegionAndID(m interface{}, id string) (*webhosting.HostingAPI, scw.Region, string, error) { +func NewAPIWithRegionAndID(m any, id string) (*webhosting.HostingAPI, scw.Region, string, error) { api := webhosting.NewHostingAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) @@ -77,10 +77,10 @@ func waitForHosting(ctx context.Context, api *webhosting.HostingAPI, region scw. }, scw.WithContext(ctx)) } -func flattenDNSRecords(records []*webhosting.DNSRecord) []map[string]interface{} { - result := []map[string]interface{}{} +func flattenDNSRecords(records []*webhosting.DNSRecord) []map[string]any { + result := []map[string]any{} for _, r := range records { - result = append(result, map[string]interface{}{ + result = append(result, map[string]any{ "name": r.Name, "type": r.Type.String(), "ttl": r.TTL, @@ -93,10 +93,10 @@ func flattenDNSRecords(records []*webhosting.DNSRecord) []map[string]interface{} return result } -func flattenNameServers(servers []*webhosting.Nameserver) []map[string]interface{} { - result := []map[string]interface{}{} +func flattenNameServers(servers []*webhosting.Nameserver) []map[string]any { + result := []map[string]any{} for _, s := range servers { - result = append(result, map[string]interface{}{ + result = append(result, map[string]any{ "hostname": s.Hostname, "status": s.Status.String(), "is_default": s.IsDefault, diff --git a/internal/services/webhosting/offer_data_source.go b/internal/services/webhosting/offer_data_source.go index 5160d0f6f5..64005a9b05 100644 --- a/internal/services/webhosting/offer_data_source.go +++ b/internal/services/webhosting/offer_data_source.go @@ -176,7 +176,7 @@ func DataSourceOffer() *schema.Resource { } } -func dataSourceOfferRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func dataSourceOfferRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newOfferAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/services/webhosting/types.go b/internal/services/webhosting/types.go index b740bb64c1..4b54e33473 100644 --- a/internal/services/webhosting/types.go +++ b/internal/services/webhosting/types.go @@ -6,12 +6,12 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/types" ) -func flattenOffer(offer *webhosting.Offer) interface{} { +func flattenOffer(offer *webhosting.Offer) any { if offer == nil { - return []interface{}{} + return []any{} } - return []map[string]interface{}{ + return []map[string]any{ { "id": offer.ID, "name": offer.Name, @@ -26,15 +26,15 @@ func flattenOffer(offer *webhosting.Offer) interface{} { } } -func flattenOfferOptions(options []*webhosting.OfferOption) interface{} { +func flattenOfferOptions(options []*webhosting.OfferOption) any { if options == nil { - return []interface{}{} + return []any{} } - res := make([]map[string]interface{}, 0, len(options)) + res := make([]map[string]any, 0, len(options)) for _, option := range options { - res = append(res, map[string]interface{}{ + res = append(res, map[string]any{ "id": option.ID, "name": string(option.Name), "billing_operation_path": option.BillingOperationPath, @@ -49,12 +49,12 @@ func flattenOfferOptions(options []*webhosting.OfferOption) interface{} { return res } -func flattenOfferPrice(price *scw.Money) interface{} { +func flattenOfferPrice(price *scw.Money) any { return price.String() } -func flattenHostingCpanelUrls(cpanelURL *webhosting.PlatformControlPanelURLs) []map[string]interface{} { - return []map[string]interface{}{ +func flattenHostingCpanelUrls(cpanelURL *webhosting.PlatformControlPanelURLs) []map[string]any { + return []map[string]any{ { "dashboard": cpanelURL.Dashboard, "webmail": cpanelURL.Webmail, @@ -62,14 +62,14 @@ func flattenHostingCpanelUrls(cpanelURL *webhosting.PlatformControlPanelURLs) [] } } -func flattenHostingOptions(options []*webhosting.OfferOption) []map[string]interface{} { +func flattenHostingOptions(options []*webhosting.OfferOption) []map[string]any { if options == nil { return nil } - flattenedOptions := []map[string]interface{}(nil) + flattenedOptions := []map[string]any(nil) for _, option := range options { - flattenedOptions = append(flattenedOptions, map[string]interface{}{ + flattenedOptions = append(flattenedOptions, map[string]any{ "id": option.ID, "name": option.Name, }) @@ -78,7 +78,7 @@ func flattenHostingOptions(options []*webhosting.OfferOption) []map[string]inter return flattenedOptions } -func expandOfferOptions(data interface{}) []*webhosting.OfferOptionRequest { +func expandOfferOptions(data any) []*webhosting.OfferOptionRequest { optionIDs := types.ExpandStrings(data) offerOptions := make([]*webhosting.OfferOptionRequest, 0, len(optionIDs)) diff --git a/internal/services/webhosting/webhosting.go b/internal/services/webhosting/webhosting.go index 838beb01f5..478b9851b1 100644 --- a/internal/services/webhosting/webhosting.go +++ b/internal/services/webhosting/webhosting.go @@ -175,7 +175,7 @@ func ResourceWebhosting() *schema.Resource { return s }(), }, - CustomizeDiff: func(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { + CustomizeDiff: func(_ context.Context, diff *schema.ResourceDiff, _ any) error { if diff.HasChange("tags") { oldTagsInterface, newTagsInterface := diff.GetChange("tags") oldTags := types.ExpandStrings(oldTagsInterface) @@ -193,7 +193,7 @@ func ResourceWebhosting() *schema.Resource { } } -func resourceWebhostingCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceWebhostingCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newHostingAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) @@ -238,7 +238,7 @@ func resourceWebhostingCreate(ctx context.Context, d *schema.ResourceData, m int return resourceWebhostingRead(ctx, d, m) } -func resourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -290,7 +290,7 @@ func resourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m inter return nil } -func resourceWebhostingUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceWebhostingUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) @@ -343,7 +343,7 @@ func resourceWebhostingUpdate(ctx context.Context, d *schema.ResourceData, m int return resourceWebhostingRead(ctx, d, m) } -func resourceHostingDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func resourceHostingDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, id, err := NewAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) diff --git a/internal/services/webhosting/webhosting_data_source.go b/internal/services/webhosting/webhosting_data_source.go index 976592c1f7..d8f5f135bf 100644 --- a/internal/services/webhosting/webhosting_data_source.go +++ b/internal/services/webhosting/webhosting_data_source.go @@ -40,7 +40,7 @@ func DataSourceWebhosting() *schema.Resource { } } -func DataSourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { +func DataSourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics { api, region, err := newHostingAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) diff --git a/internal/types/bool.go b/internal/types/bool.go index d8087a2ecc..19335cfe91 100644 --- a/internal/types/bool.go +++ b/internal/types/bool.go @@ -5,7 +5,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/scw" ) -func FlattenBoolPtr(b *bool) interface{} { +func FlattenBoolPtr(b *bool) any { if b == nil { return nil } @@ -13,7 +13,7 @@ func FlattenBoolPtr(b *bool) interface{} { return *b } -func ExpandBoolPtr(data interface{}) *bool { +func ExpandBoolPtr(data any) *bool { if data == nil { return nil } @@ -21,7 +21,7 @@ func ExpandBoolPtr(data interface{}) *bool { return scw.BoolPtr(data.(bool)) } -func GetBool(d *schema.ResourceData, key string) interface{} { +func GetBool(d *schema.ResourceData, key string) any { val, ok := d.GetOkExists(key) //nolint:staticcheck if !ok { return nil diff --git a/internal/types/ip.go b/internal/types/ip.go index f6d840cf4d..a2803f30b5 100644 --- a/internal/types/ip.go +++ b/internal/types/ip.go @@ -27,7 +27,7 @@ func ExpandIPNet(raw string) (scw.IPNet, error) { return ipNet, nil } -func FlattenIPPtr(ip *net.IP) interface{} { +func FlattenIPPtr(ip *net.IP) any { if ip == nil { return "" } diff --git a/internal/types/map.go b/internal/types/map.go index d301252423..2833dbc8b1 100644 --- a/internal/types/map.go +++ b/internal/types/map.go @@ -1,11 +1,11 @@ package types -func FlattenMap(m map[string]string) interface{} { +func FlattenMap(m map[string]string) any { if m == nil { return nil } - flattenedMap := make(map[string]interface{}) + flattenedMap := make(map[string]any) for k, v := range m { flattenedMap[k] = v } @@ -13,12 +13,12 @@ func FlattenMap(m map[string]string) interface{} { return flattenedMap } -func FlattenMapStringStringPtr(m map[string]*string) interface{} { +func FlattenMapStringStringPtr(m map[string]*string) any { if m == nil { return nil } - flattenedMap := make(map[string]interface{}) + flattenedMap := make(map[string]any) for k, v := range m { if v != nil { @@ -31,26 +31,26 @@ func FlattenMapStringStringPtr(m map[string]*string) interface{} { return flattenedMap } -func ExpandMapPtrStringString(data interface{}) *map[string]string { +func ExpandMapPtrStringString(data any) *map[string]string { if data == nil { return nil } m := make(map[string]string) - for k, v := range data.(map[string]interface{}) { + for k, v := range data.(map[string]any) { m[k] = v.(string) } return &m } -func ExpandMapStringStringPtr(data interface{}) map[string]*string { +func ExpandMapStringStringPtr(data any) map[string]*string { if data == nil { return nil } m := make(map[string]*string) - for k, v := range data.(map[string]interface{}) { + for k, v := range data.(map[string]any) { m[k] = ExpandStringPtr(v) } @@ -63,7 +63,7 @@ func ExpandMapStringString(data any) map[string]string { } m := make(map[string]string) - for k, v := range data.(map[string]interface{}) { + for k, v := range data.(map[string]any) { m[k] = v.(string) } diff --git a/internal/types/number.go b/internal/types/number.go index 5be0b8eaf8..d649bb427b 100644 --- a/internal/types/number.go +++ b/internal/types/number.go @@ -2,7 +2,7 @@ package types import "github.com/scaleway/scaleway-sdk-go/scw" -func FlattenInt32Ptr(i *int32) interface{} { +func FlattenInt32Ptr(i *int32) any { if i == nil { return 0 } @@ -10,7 +10,7 @@ func FlattenInt32Ptr(i *int32) interface{} { return *i } -func FlattenUint32Ptr(i *uint32) interface{} { +func FlattenUint32Ptr(i *uint32) any { if i == nil { return 0 } @@ -18,7 +18,7 @@ func FlattenUint32Ptr(i *uint32) interface{} { return *i } -func ExpandInt32Ptr(data interface{}) *int32 { +func ExpandInt32Ptr(data any) *int32 { if data == nil || data == "" { return nil } @@ -26,7 +26,7 @@ func ExpandInt32Ptr(data interface{}) *int32 { return scw.Int32Ptr(int32(data.(int))) } -func ExpandUint32Ptr(data interface{}) *uint32 { +func ExpandUint32Ptr(data any) *uint32 { if data == nil || data == "" { return nil } @@ -34,7 +34,7 @@ func ExpandUint32Ptr(data interface{}) *uint32 { return scw.Uint32Ptr(uint32(data.(int))) } -func ExpandUint64Ptr(data interface{}) *uint64 { +func ExpandUint64Ptr(data any) *uint64 { if data == nil || data == "" { return nil } diff --git a/internal/types/scw.go b/internal/types/scw.go index ea7e5451e7..a05dffb8aa 100644 --- a/internal/types/scw.go +++ b/internal/types/scw.go @@ -2,7 +2,7 @@ package types import "github.com/scaleway/scaleway-sdk-go/scw" -func FlattenSize(size *scw.Size) interface{} { +func FlattenSize(size *scw.Size) any { if size == nil { return 0 } @@ -10,7 +10,7 @@ func FlattenSize(size *scw.Size) interface{} { return *size } -func ExpandSize(data interface{}) *scw.Size { +func ExpandSize(data any) *scw.Size { if data == nil || data == "" { return nil } diff --git a/internal/types/string.go b/internal/types/string.go index b48360fa4a..6f15201c69 100644 --- a/internal/types/string.go +++ b/internal/types/string.go @@ -11,7 +11,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" ) -func FlattenStringPtr(s *string) interface{} { +func FlattenStringPtr(s *string) any { if s == nil { return "" } @@ -19,7 +19,7 @@ func FlattenStringPtr(s *string) interface{} { return *s } -func ExpandStringPtr(data interface{}) *string { +func ExpandStringPtr(data any) *string { if data == nil || data == "" { return nil } @@ -32,7 +32,7 @@ func NewRandomName(prefix string) string { return namegenerator.GetRandomName("tf", prefix) } -func ExpandOrGenerateString(data interface{}, prefix string) string { +func ExpandOrGenerateString(data any, prefix string) string { if data == nil || data == "" { return NewRandomName(prefix) } @@ -40,7 +40,7 @@ func ExpandOrGenerateString(data interface{}, prefix string) string { return data.(string) } -func ExpandStringWithDefault(data interface{}, defaultValue string) string { +func ExpandStringWithDefault(data any, defaultValue string) string { if data == nil || data.(string) == "" { return defaultValue } @@ -48,21 +48,21 @@ func ExpandStringWithDefault(data interface{}, defaultValue string) string { return data.(string) } -func ExpandSliceStringPtr(data interface{}) []*string { +func ExpandSliceStringPtr(data any) []*string { if data == nil { return nil } stringSlice := []*string(nil) - for _, s := range data.([]interface{}) { + for _, s := range data.([]any) { stringSlice = append(stringSlice, ExpandStringPtr(s)) } return stringSlice } -func FlattenSliceStringPtr(s []*string) interface{} { - res := make([]interface{}, 0, len(s)) +func FlattenSliceStringPtr(s []*string) any { + res := make([]any, 0, len(s)) for _, strPtr := range s { res = append(res, FlattenStringPtr(strPtr)) } @@ -70,8 +70,8 @@ func FlattenSliceStringPtr(s []*string) interface{} { return res } -func FlattenSliceString(s []string) interface{} { - res := make([]interface{}, 0, len(s)) +func FlattenSliceString(s []string) any { + res := make([]any, 0, len(s)) for _, strPtr := range s { res = append(res, strPtr) } @@ -79,7 +79,7 @@ func FlattenSliceString(s []string) interface{} { return res } -func ExpandUpdatedStringPtr(data interface{}) *string { +func ExpandUpdatedStringPtr(data any) *string { str := "" if data != nil { str = data.(string) @@ -88,10 +88,10 @@ func ExpandUpdatedStringPtr(data interface{}) *string { return &str } -func ExpandStrings(data interface{}) []string { - stringSlice := make([]string, 0, len(data.([]interface{}))) +func ExpandStrings(data any) []string { + stringSlice := make([]string, 0, len(data.([]any))) - for _, s := range data.([]interface{}) { + for _, s := range data.([]any) { // zero-value is nil, ["foo", ""] if s == nil { s = "" @@ -103,14 +103,14 @@ func ExpandStrings(data interface{}) []string { return stringSlice } -func ExpandStringsPtr(data interface{}) *[]string { - stringSlice := make([]string, 0, len(data.([]interface{}))) +func ExpandStringsPtr(data any) *[]string { + stringSlice := make([]string, 0, len(data.([]any))) - if _, ok := data.([]interface{}); !ok || data == nil { + if _, ok := data.([]any); !ok || data == nil { return nil } - for _, s := range data.([]interface{}) { + for _, s := range data.([]any) { // zero-value is nil, ["foo", ""] if s == nil { s = "" @@ -128,13 +128,13 @@ func ExpandStringsPtr(data interface{}) *[]string { // ExpandUpdatedStringsPtr expands a string slice but will default to an empty list. // Should be used on schema update so emptying a list will update resource. -func ExpandUpdatedStringsPtr(data interface{}) *[]string { +func ExpandUpdatedStringsPtr(data any) *[]string { stringSlice := []string{} - if _, ok := data.([]interface{}); !ok || data == nil { + if _, ok := data.([]any); !ok || data == nil { return &stringSlice } - for _, s := range data.([]interface{}) { + for _, s := range data.([]any) { // zero-value is nil, ["foo", ""] if s == nil { s = "" @@ -146,47 +146,47 @@ func ExpandUpdatedStringsPtr(data interface{}) *[]string { return &stringSlice } -func ExpandSliceIDs(rawIDs interface{}) []string { - stringSlice := make([]string, 0, len(rawIDs.([]interface{}))) - if _, ok := rawIDs.([]interface{}); !ok || rawIDs == nil { +func ExpandSliceIDs(rawIDs any) []string { + stringSlice := make([]string, 0, len(rawIDs.([]any))) + if _, ok := rawIDs.([]any); !ok || rawIDs == nil { return stringSlice } - for _, s := range rawIDs.([]interface{}) { + for _, s := range rawIDs.([]any) { stringSlice = append(stringSlice, locality.ExpandID(s.(string))) } return stringSlice } -func ExpandSliceIDsPtr(rawIDs interface{}) *[]string { - stringSlice := make([]string, 0, len(rawIDs.([]interface{}))) - if _, ok := rawIDs.([]interface{}); !ok || rawIDs == nil { +func ExpandSliceIDsPtr(rawIDs any) *[]string { + stringSlice := make([]string, 0, len(rawIDs.([]any))) + if _, ok := rawIDs.([]any); !ok || rawIDs == nil { return &stringSlice } - for _, s := range rawIDs.([]interface{}) { + for _, s := range rawIDs.([]any) { stringSlice = append(stringSlice, locality.ExpandID(s.(string))) } return &stringSlice } -func ExpandStringsOrEmpty(data interface{}) []string { - stringSlice := make([]string, 0, len(data.([]interface{}))) - if _, ok := data.([]interface{}); !ok || data == nil { +func ExpandStringsOrEmpty(data any) []string { + stringSlice := make([]string, 0, len(data.([]any))) + if _, ok := data.([]any); !ok || data == nil { return stringSlice } - for _, s := range data.([]interface{}) { + for _, s := range data.([]any) { stringSlice = append(stringSlice, s.(string)) } return stringSlice } -func FlattenSliceIDs(certificates []string, zone scw.Zone) interface{} { - res := []interface{}(nil) +func FlattenSliceIDs(certificates []string, zone scw.Zone) any { + res := []any(nil) for _, certificateID := range certificates { res = append(res, zonal.NewIDString(zone, certificateID)) } diff --git a/internal/types/time.go b/internal/types/time.go index 8cea53d913..1c391a30e7 100644 --- a/internal/types/time.go +++ b/internal/types/time.go @@ -2,7 +2,7 @@ package types import "time" -func FlattenDuration(duration *time.Duration) interface{} { +func FlattenDuration(duration *time.Duration) any { if duration != nil { return duration.String() } @@ -10,7 +10,7 @@ func FlattenDuration(duration *time.Duration) interface{} { return "" } -func ExpandDuration(data interface{}) (*time.Duration, error) { +func ExpandDuration(data any) (*time.Duration, error) { if data == nil || data == "" { return nil, nil } @@ -23,7 +23,7 @@ func ExpandDuration(data interface{}) (*time.Duration, error) { return &d, nil } -func FlattenTime(date *time.Time) interface{} { +func FlattenTime(date *time.Time) any { if date != nil { return date.Format(time.RFC3339) } @@ -33,7 +33,7 @@ func FlattenTime(date *time.Time) interface{} { // ExpandTimePtr returns a time pointer for an RFC3339 time. // It returns nil if time is not valid, you should use validateDate to validate field. -func ExpandTimePtr(i interface{}) *time.Time { +func ExpandTimePtr(i any) *time.Time { rawTime := ExpandStringPtr(i) if rawTime == nil { return nil diff --git a/internal/verify/cron.go b/internal/verify/cron.go index f752c696ba..137bfeaec9 100644 --- a/internal/verify/cron.go +++ b/internal/verify/cron.go @@ -8,7 +8,7 @@ import ( ) func ValidateCronExpression() schema.SchemaValidateDiagFunc { - return func(i interface{}, path cty.Path) diag.Diagnostics { + return func(i any, path cty.Path) diag.Diagnostics { v, ok := i.(string) if !ok { diags := diag.Diagnostics{diag.Diagnostic{ diff --git a/internal/verify/date.go b/internal/verify/date.go index 9443eb7e8a..61632f4905 100644 --- a/internal/verify/date.go +++ b/internal/verify/date.go @@ -11,7 +11,7 @@ import ( // IsDate will validate that field is a valid ISO 8601 // It is the same as RFC3339 func IsDate() schema.SchemaValidateDiagFunc { - return func(value interface{}, path cty.Path) diag.Diagnostics { + return func(value any, path cty.Path) diag.Diagnostics { date, isStr := value.(string) if !isStr { return diag.Diagnostics{diag.Diagnostic{ @@ -35,7 +35,7 @@ func IsDate() schema.SchemaValidateDiagFunc { } func IsDuration() schema.SchemaValidateDiagFunc { - return func(value interface{}, path cty.Path) diag.Diagnostics { + return func(value any, path cty.Path) diag.Diagnostics { str, isStr := value.(string) if !isStr { return diag.Diagnostics{diag.Diagnostic{ diff --git a/internal/verify/email.go b/internal/verify/email.go index a08790042d..9b5c42d61b 100644 --- a/internal/verify/email.go +++ b/internal/verify/email.go @@ -8,7 +8,7 @@ import ( ) func IsEmail() schema.SchemaValidateDiagFunc { - return func(value interface{}, path cty.Path) diag.Diagnostics { + return func(value any, path cty.Path) diag.Diagnostics { email, isString := value.(string) if !isString { return diag.Diagnostics{diag.Diagnostic{ @@ -33,8 +33,8 @@ func IsEmail() schema.SchemaValidateDiagFunc { } func IsEmailList() schema.SchemaValidateDiagFunc { - return func(value interface{}, path cty.Path) diag.Diagnostics { - list, ok := value.([]interface{}) + return func(value any, path cty.Path) diag.Diagnostics { + list, ok := value.([]any) if !ok { return diag.Diagnostics{diag.Diagnostic{ Severity: diag.Error, diff --git a/internal/verify/email_test.go b/internal/verify/email_test.go index 1d71b48da5..f0f1eef987 100644 --- a/internal/verify/email_test.go +++ b/internal/verify/email_test.go @@ -31,13 +31,13 @@ func TestIsEmailList(t *testing.T) { validateFunc := verify.IsEmailList() tests := []struct { - emails []interface{} + emails []any valid bool }{ - {[]interface{}{"test@example.com", "test2@example.com"}, true}, - {[]interface{}{"test@example.com", "invalid-email"}, false}, - {[]interface{}{123, "test@example.com"}, false}, - {[]interface{}{}, true}, + {[]any{"test@example.com", "test2@example.com"}, true}, + {[]any{"test@example.com", "invalid-email"}, false}, + {[]any{123, "test@example.com"}, false}, + {[]any{}, true}, } for _, test := range tests { diff --git a/internal/verify/ip.go b/internal/verify/ip.go index 5c74461379..eb6c927fbe 100644 --- a/internal/verify/ip.go +++ b/internal/verify/ip.go @@ -9,7 +9,7 @@ import ( ) func IsStandaloneIPorCIDR() schema.SchemaValidateDiagFunc { - return func(value interface{}, path cty.Path) diag.Diagnostics { + return func(value any, path cty.Path) diag.Diagnostics { ip, isString := value.(string) if !isString { return diag.Diagnostics{diag.Diagnostic{ diff --git a/internal/verify/uuid.go b/internal/verify/uuid.go index b4cdd1617d..840221f859 100644 --- a/internal/verify/uuid.go +++ b/internal/verify/uuid.go @@ -11,7 +11,7 @@ import ( // IsUUIDorUUIDWithLocality validates the schema is a UUID or the combination of a locality and a UUID // e.g. "6ba7b810-9dad-11d1-80b4-00c04fd430c8" or "fr-par-1/6ba7b810-9dad-11d1-80b4-00c04fd430c8". func IsUUIDorUUIDWithLocality() schema.SchemaValidateDiagFunc { - return func(value interface{}, path cty.Path) diag.Diagnostics { + return func(value any, path cty.Path) diag.Diagnostics { return IsUUID()(locality.ExpandID(value), path) } } @@ -19,7 +19,7 @@ func IsUUIDorUUIDWithLocality() schema.SchemaValidateDiagFunc { // IsUUID validates the schema following the canonical UUID format // "6ba7b810-9dad-11d1-80b4-00c04fd430c8". func IsUUID() schema.SchemaValidateDiagFunc { - return func(value interface{}, path cty.Path) diag.Diagnostics { + return func(value any, path cty.Path) diag.Diagnostics { uuid, isString := value.(string) if !isString { return diag.Diagnostics{diag.Diagnostic{ @@ -43,7 +43,7 @@ func IsUUID() schema.SchemaValidateDiagFunc { } func IsUUIDWithLocality() schema.SchemaValidateDiagFunc { - return func(value interface{}, path cty.Path) diag.Diagnostics { + return func(value any, path cty.Path) diag.Diagnostics { uuid, isString := value.(string) if !isString { return diag.Diagnostics{diag.Diagnostic{ @@ -68,7 +68,7 @@ func IsUUIDWithLocality() schema.SchemaValidateDiagFunc { } func IsUUIDOrNameOffer() schema.SchemaValidateDiagFunc { - return func(value interface{}, path cty.Path) diag.Diagnostics { + return func(value any, path cty.Path) diag.Diagnostics { uuid, _ := value.(string) if !validation.IsUUID(uuid) { return diag.Diagnostics{diag.Diagnostic{ From a72fc967cbd7b876a668e7b0df16db4bec3a16e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Fri, 13 Jun 2025 14:58:26 +0200 Subject: [PATCH 2/3] Fix --- internal/locality/ids.go | 8 ++++---- internal/locality/validation.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/locality/ids.go b/internal/locality/ids.go index 7a7ecca035..1097746ce3 100644 --- a/internal/locality/ids.go +++ b/internal/locality/ids.go @@ -1,7 +1,7 @@ package locality // ExpandID returns the id whether it is a localizedID or a raw ID. -func ExpandID(id interface{}) string { +func ExpandID(id any) string { _, ID, err := ParseLocalizedID(id.(string)) if err != nil { return id.(string) @@ -10,10 +10,10 @@ func ExpandID(id interface{}) string { return ID } -func ExpandIDs(data interface{}) []string { - expandedIDs := make([]string, 0, len(data.([]interface{}))) +func ExpandIDs(data any) []string { + expandedIDs := make([]string, 0, len(data.([]any))) - for _, s := range data.([]interface{}) { + for _, s := range data.([]any) { if s == nil { s = "" } diff --git a/internal/locality/validation.go b/internal/locality/validation.go index a3087ab485..dd763915b6 100644 --- a/internal/locality/validation.go +++ b/internal/locality/validation.go @@ -9,7 +9,7 @@ import ( // ValidateStringInSliceWithWarning helps to only returns warnings in case we got a non-public locality passed func ValidateStringInSliceWithWarning(correctValues []string, field string) schema.SchemaValidateDiagFunc { - return func(i interface{}, path cty.Path) diag.Diagnostics { + return func(i any, path cty.Path) diag.Diagnostics { _, rawErr := validation.StringInSlice(correctValues, true)(i, field) var res diag.Diagnostics From 90bf7722baea546e66ef5352fd4200eb04aeea5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Fri, 13 Jun 2025 15:27:05 +0200 Subject: [PATCH 3/3] Fix --- internal/locality/regional/ids.go | 2 +- internal/locality/zonal/ids.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/locality/regional/ids.go b/internal/locality/regional/ids.go index c7755ce782..cc180896a7 100644 --- a/internal/locality/regional/ids.go +++ b/internal/locality/regional/ids.go @@ -25,7 +25,7 @@ func (z ID) String() string { return fmt.Sprintf("%s/%s", z.Region, z.ID) } -func ExpandID(id interface{}) ID { +func ExpandID(id any) ID { regionalID := ID{} tab := strings.Split(id.(string), "/") diff --git a/internal/locality/zonal/ids.go b/internal/locality/zonal/ids.go index f38323e3ee..66cc8c7fdb 100644 --- a/internal/locality/zonal/ids.go +++ b/internal/locality/zonal/ids.go @@ -25,7 +25,7 @@ func (z ID) String() string { return fmt.Sprintf("%s/%s", z.Zone, z.ID) } -func ExpandID(id interface{}) ID { +func ExpandID(id any) ID { zonedID := ID{} tab := strings.Split(id.(string), "/")