From 472efcbd8cf7a3a292d4f11707e57f49c374730b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Wed, 13 Mar 2024 08:39:42 +0100 Subject: [PATCH] chore: migrate meta to its own package (#2449) * chore: migrate meta to itw own package * chore: migrate version to its own package * chore: migrate meta to its own package * fix unecessary casts * Fix * mute R014 linter for tfproviderlint --- .github/workflows/tfproviderlint.yml | 2 +- cmd/tftemplate/datasource.go.tmpl | 6 +- cmd/tftemplate/helpers.go.tmpl | 8 +- cmd/tftemplate/resource.go.tmpl | 20 +- internal/meta/errors.go | 6 + internal/meta/extractors.go | 98 ++++++++++ internal/meta/meta.go | 185 ++++++++++++++++++ scaleway/data_source_account_project.go | 11 +- scaleway/data_source_account_project_test.go | 6 +- scaleway/data_source_baremetal_offer.go | 4 +- scaleway/data_source_baremetal_offer_test.go | 2 +- scaleway/data_source_baremetal_option.go | 4 +- scaleway/data_source_baremetal_option_test.go | 2 +- scaleway/data_source_baremetal_os.go | 4 +- scaleway/data_source_baremetal_os_test.go | 2 +- scaleway/data_source_baremetal_server.go | 6 +- scaleway/data_source_billing_consumption.go | 4 +- scaleway/data_source_billing_invoices.go | 4 +- scaleway/data_source_block_snapshot.go | 6 +- scaleway/data_source_block_volume.go | 6 +- scaleway/data_source_cockpit.go | 4 +- scaleway/data_source_cockpit_plan.go | 4 +- scaleway/data_source_container.go | 6 +- scaleway/data_source_container_namespace.go | 6 +- scaleway/data_source_document_db_database.go | 6 +- scaleway/data_source_document_db_instance.go | 6 +- ...urce_document_db_load_balancer_endpoint.go | 4 +- scaleway/data_source_domain_record.go | 6 +- scaleway/data_source_domain_zone.go | 4 +- scaleway/data_source_flexible_ip.go | 6 +- scaleway/data_source_flexible_ips.go | 4 +- scaleway/data_source_function.go | 6 +- scaleway/data_source_function_namespace.go | 6 +- scaleway/data_source_iam_application.go | 8 +- scaleway/data_source_iam_group.go | 8 +- scaleway/data_source_iam_ssh_key.go | 6 +- scaleway/data_source_iam_user.go | 6 +- scaleway/data_source_instance_image.go | 4 +- scaleway/data_source_instance_ip.go | 6 +- .../data_source_instance_placement_group.go | 6 +- scaleway/data_source_instance_private_nic.go | 6 +- .../data_source_instance_security_group.go | 6 +- scaleway/data_source_instance_server.go | 6 +- scaleway/data_source_instance_servers.go | 4 +- scaleway/data_source_instance_snapshot.go | 6 +- scaleway/data_source_instance_volume.go | 6 +- scaleway/data_source_iot_device.go | 6 +- scaleway/data_source_iot_hub.go | 6 +- scaleway/data_source_ipam_ip.go | 4 +- scaleway/data_source_ipam_ips.go | 4 +- scaleway/data_source_k8s_cluster.go | 6 +- scaleway/data_source_k8s_pool.go | 6 +- scaleway/data_source_k8s_version.go | 4 +- scaleway/data_source_k8s_version_test.go | 2 +- scaleway/data_source_lb.go | 6 +- scaleway/data_source_lb_acls.go | 4 +- scaleway/data_source_lb_backend.go | 6 +- scaleway/data_source_lb_backends.go | 4 +- scaleway/data_source_lb_certificate.go | 6 +- scaleway/data_source_lb_frontend.go | 6 +- scaleway/data_source_lb_frontends.go | 4 +- scaleway/data_source_lb_ip.go | 6 +- scaleway/data_source_lb_ips.go | 4 +- scaleway/data_source_lb_route.go | 6 +- scaleway/data_source_lb_routes.go | 4 +- scaleway/data_source_lbs.go | 4 +- scaleway/data_source_marketplace_image.go | 4 +- scaleway/data_source_mnq_sqs.go | 6 +- scaleway/data_source_object_bucket.go | 8 +- scaleway/data_source_object_bucket_policy.go | 6 +- scaleway/data_source_object_bucket_test.go | 2 +- scaleway/data_source_rdb_acl.go | 6 +- scaleway/data_source_rdb_database.go | 6 +- scaleway/data_source_rdb_database_backup.go | 6 +- scaleway/data_source_rdb_instance.go | 6 +- scaleway/data_source_rdb_privilege.go | 6 +- scaleway/data_source_redis_cluster.go | 6 +- scaleway/data_source_registry_image.go | 4 +- scaleway/data_source_registry_namespace.go | 6 +- scaleway/data_source_secret.go | 6 +- scaleway/data_source_secret_version.go | 6 +- scaleway/data_source_tem_domain.go | 6 +- scaleway/data_source_vpc.go | 6 +- scaleway/data_source_vpc_gateway_network.go | 6 +- scaleway/data_source_vpc_private_network.go | 6 +- scaleway/data_source_vpc_public_gateway.go | 6 +- .../data_source_vpc_public_gateway_dhcp.go | 6 +- ...rce_vpc_public_gateway_dhcp_reservation.go | 6 +- scaleway/data_source_vpc_public_gateway_ip.go | 6 +- ...data_source_vpc_public_gateway_pat_rule.go | 6 +- scaleway/data_source_vpcs.go | 4 +- scaleway/data_source_webhosting.go | 6 +- scaleway/data_source_webhosting_offer.go | 4 +- scaleway/helpers.go | 104 +--------- scaleway/helpers_account.go | 4 +- scaleway/helpers_apple_silicon.go | 9 +- scaleway/helpers_baremetal.go | 17 +- scaleway/helpers_billing.go | 4 +- scaleway/helpers_block.go | 9 +- scaleway/helpers_cockpit.go | 4 +- scaleway/helpers_container.go | 9 +- scaleway/helpers_container_triggers.go | 15 +- scaleway/helpers_document_db.go | 9 +- scaleway/helpers_domain.go | 5 +- scaleway/helpers_flexible_ip.go | 9 +- scaleway/helpers_function.go | 14 +- scaleway/helpers_function_triggers.go | 15 +- scaleway/helpers_iam.go | 8 +- scaleway/helpers_instance.go | 12 +- scaleway/helpers_instance_block.go | 13 +- scaleway/helpers_iot.go | 12 +- scaleway/helpers_ipam.go | 9 +- scaleway/helpers_jobs.go | 9 +- scaleway/helpers_k8s.go | 9 +- scaleway/helpers_lb.go | 9 +- scaleway/helpers_marketplace.go | 6 +- scaleway/helpers_mnq.go | 25 +-- scaleway/helpers_mnq_queue.go | 9 +- scaleway/helpers_mnq_sns.go | 10 +- scaleway/helpers_object.go | 61 +++--- scaleway/helpers_rdb.go | 15 +- scaleway/helpers_redis.go | 8 +- scaleway/helpers_registry.go | 9 +- scaleway/helpers_sdb_sql.go | 9 +- scaleway/helpers_secret.go | 26 +-- scaleway/helpers_tem.go | 9 +- scaleway/helpers_vpc.go | 16 +- scaleway/helpers_vpcgw.go | 9 +- scaleway/helpers_webhosting.go | 9 +- scaleway/provider.go | 177 +---------------- scaleway/provider_test.go | 63 +++--- scaleway/resource_account_project.go | 20 +- scaleway/resource_apple_silicon_server.go | 20 +- scaleway/resource_baremetal_server.go | 38 ++-- scaleway/resource_block_snapshot.go | 20 +- scaleway/resource_block_volume.go | 20 +- scaleway/resource_cockpit.go | 20 +- scaleway/resource_cockpit_grafana_user.go | 14 +- scaleway/resource_cockpit_token.go | 14 +- scaleway/resource_container.go | 20 +- scaleway/resource_container_cron.go | 20 +- scaleway/resource_container_domain.go | 14 +- scaleway/resource_container_namespace.go | 22 +-- scaleway/resource_container_test.go | 4 +- scaleway/resource_container_token.go | 14 +- scaleway/resource_container_trigger.go | 24 +-- scaleway/resource_document_db_database.go | 14 +- scaleway/resource_document_db_instance.go | 20 +- ...ce_document_db_private_network_endpoint.go | 20 +- scaleway/resource_document_db_privilege.go | 18 +- scaleway/resource_document_db_read_replica.go | 20 +- scaleway/resource_document_db_user.go | 20 +- scaleway/resource_domain_record.go | 22 +-- scaleway/resource_domain_zone.go | 24 +-- scaleway/resource_flexible_ip.go | 20 +- scaleway/resource_flexible_ip_mac_address.go | 20 +- scaleway/resource_function.go | 24 +-- scaleway/resource_function_cron.go | 20 +- scaleway/resource_function_domain.go | 14 +- scaleway/resource_function_namespace.go | 20 +- scaleway/resource_function_token.go | 14 +- scaleway/resource_function_trigger.go | 24 +-- scaleway/resource_iam_api_key.go | 22 +-- scaleway/resource_iam_application.go | 20 +- scaleway/resource_iam_group.go | 20 +- scaleway/resource_iam_group_membership.go | 14 +- scaleway/resource_iam_policy.go | 20 +- scaleway/resource_iam_ssh_key.go | 34 ++-- scaleway/resource_iam_user.go | 16 +- scaleway/resource_instance_image.go | 20 +- scaleway/resource_instance_image_test.go | 2 +- scaleway/resource_instance_ip.go | 20 +- scaleway/resource_instance_ip_reverse_dns.go | 20 +- scaleway/resource_instance_placement_group.go | 20 +- scaleway/resource_instance_private_nic.go | 20 +- scaleway/resource_instance_security_group.go | 22 +-- .../resource_instance_security_group_rules.go | 18 +- .../resource_instance_security_group_test.go | 4 +- scaleway/resource_instance_server.go | 31 +-- scaleway/resource_instance_server_test.go | 15 +- scaleway/resource_instance_snapshot.go | 20 +- scaleway/resource_instance_user_data.go | 20 +- scaleway/resource_instance_volume.go | 20 +- scaleway/resource_instance_volume_test.go | 4 +- scaleway/resource_iot_device.go | 20 +- scaleway/resource_iot_hub.go | 22 +-- scaleway/resource_iot_network.go | 14 +- scaleway/resource_iot_routes.go | 14 +- scaleway/resource_ipam_ip.go | 22 +-- scaleway/resource_ipam_ip_reverse_dns.go | 20 +- scaleway/resource_job_definition.go | 20 +- scaleway/resource_k8s_cluster.go | 22 +-- scaleway/resource_k8s_cluster_test.go | 8 +- scaleway/resource_k8s_pool.go | 20 +- scaleway/resource_k8s_pool_test.go | 4 +- scaleway/resource_lb.go | 20 +- scaleway/resource_lb_acl.go | 20 +- scaleway/resource_lb_backend.go | 20 +- scaleway/resource_lb_certificate.go | 20 +- scaleway/resource_lb_frontend.go | 22 +-- scaleway/resource_lb_ip.go | 20 +- scaleway/resource_lb_route.go | 20 +- scaleway/resource_mnq_nats_account.go | 20 +- scaleway/resource_mnq_nats_credentials.go | 20 +- scaleway/resource_mnq_sns.go | 14 +- scaleway/resource_mnq_sns_credentials.go | 20 +- scaleway/resource_mnq_sns_topic.go | 25 +-- .../resource_mnq_sns_topic_subscription.go | 19 +- ...esource_mnq_sns_topic_subscription_test.go | 4 +- scaleway/resource_mnq_sns_topic_test.go | 4 +- scaleway/resource_mnq_sqs.go | 14 +- scaleway/resource_mnq_sqs_credentials.go | 20 +- scaleway/resource_mnq_sqs_queue.go | 25 +-- scaleway/resource_mnq_sqs_queue_test.go | 15 +- scaleway/resource_object.go | 22 +-- scaleway/resource_object_bucket.go | 22 +-- scaleway/resource_object_bucket_acl.go | 18 +- ...source_object_bucket_lock_configuration.go | 22 +-- scaleway/resource_object_bucket_policy.go | 16 +- scaleway/resource_object_bucket_test.go | 2 +- ...rce_object_bucket_website_configuration.go | 22 +-- scaleway/resource_rdb_acl.go | 20 +- scaleway/resource_rdb_database.go | 14 +- scaleway/resource_rdb_database_backup.go | 20 +- scaleway/resource_rdb_instance.go | 22 +-- scaleway/resource_rdb_instance_test.go | 2 +- scaleway/resource_rdb_privilege.go | 18 +- scaleway/resource_rdb_read_replica.go | 22 +-- scaleway/resource_rdb_user.go | 20 +- scaleway/resource_redis_cluster.go | 20 +- scaleway/resource_redis_cluster_test.go | 2 +- scaleway/resource_registry_namespace.go | 20 +- scaleway/resource_sdb_sql_database.go | 20 +- scaleway/resource_secret.go | 20 +- scaleway/resource_secret_version.go | 20 +- scaleway/resource_tem_domain.go | 14 +- scaleway/resource_vpc.go | 20 +- scaleway/resource_vpc_gateway_network.go | 20 +- scaleway/resource_vpc_private_network.go | 23 +-- scaleway/resource_vpc_public_gateway.go | 20 +- scaleway/resource_vpc_public_gateway_dhcp.go | 20 +- ...rce_vpc_public_gateway_dhcp_reservation.go | 20 +- scaleway/resource_vpc_public_gateway_ip.go | 20 +- .../resource_vpc_public_gateway_ip_reverse.go | 20 +- .../resource_vpc_public_gateway_pat_rule.go | 20 +- scaleway/resource_webhosting.go | 20 +- scaleway/sweeper_test.go | 23 +-- 247 files changed, 1838 insertions(+), 1845 deletions(-) create mode 100644 internal/meta/errors.go create mode 100644 internal/meta/extractors.go create mode 100644 internal/meta/meta.go diff --git a/.github/workflows/tfproviderlint.yml b/.github/workflows/tfproviderlint.yml index 123639e50..0b7c8bdac 100644 --- a/.github/workflows/tfproviderlint.yml +++ b/.github/workflows/tfproviderlint.yml @@ -16,7 +16,7 @@ jobs: - name: Install tfproviderlint run: go install github.com/bflad/tfproviderlint/cmd/tfproviderlint@latest - name: Run tfproviderlint - run: tfproviderlint ./... + run: tfproviderlint -R014=false ./... tfproviderdocs: runs-on: ubuntu-latest steps: diff --git a/cmd/tftemplate/datasource.go.tmpl b/cmd/tftemplate/datasource.go.tmpl index f982ab922..6ec970109 100644 --- a/cmd/tftemplate/datasource.go.tmpl +++ b/cmd/tftemplate/datasource.go.tmpl @@ -29,8 +29,8 @@ func dataSourceScaleway{{.Resource}}() *schema.Resource { } } -func dataSourceScaleway{{.Resource}}Read(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, {{.Locality}}, err := {{.API}}APIWith{{.LocalityUpper}}(d, meta) +func dataSourceScaleway{{.Resource}}Read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, {{.Locality}}, err := {{.API}}APIWith{{.LocalityUpper}}(d, m) if err != nil { return diag.FromErr(err) } @@ -65,7 +65,7 @@ func dataSourceScaleway{{.Resource}}Read(ctx context.Context, d *schema.Resource return diag.FromErr(err) } - diags := resourceScaleway{{.Resource}}Read(ctx, d, meta) + diags := resourceScaleway{{.Resource}}Read(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read {{.ResourceCleanLow}} state")...) } diff --git a/cmd/tftemplate/helpers.go.tmpl b/cmd/tftemplate/helpers.go.tmpl index cc94ce6c8..bbdffddb1 100644 --- a/cmd/tftemplate/helpers.go.tmpl +++ b/cmd/tftemplate/helpers.go.tmpl @@ -8,10 +8,9 @@ import ( // {{.API}}APIWith{{.LocalityUpper}} returns a new {{.API}} API and the {{.Locality}} for a Create request func {{.API}}APIWith{{.LocalityUpper}}(d *schema.ResourceData, m interface{}) (*{{.API}}.API, scw.{{.LocalityUpper}}, error) { - meta := m.(*Meta) - {{.API}}API := {{.API}}.NewAPI(meta.scwClient) + {{.API}}API := {{.API}}.NewAPI(meta.ExtractScwClient(m)) - {{.Locality}}, err := extract{{.LocalityUpper}}(d, meta) + {{.Locality}}, err := extract{{.LocalityUpper}}(d, m) if err != nil { return nil, "", err } @@ -21,8 +20,7 @@ func {{.API}}APIWith{{.LocalityUpper}}(d *schema.ResourceData, m interface{}) (* // {{.API}}APIWith{{.LocalityAdjectiveUpper}}AndID returns a new {{.API }} API with {{.Locality}} and ID extracted from the state func {{.API}}APIWith{{.LocalityUpper}}AndID(m interface{}, {{.LocalityAdjective}}ID string) (*{{.API}}.API, scw.{{.LocalityUpper}}, string, error) { - meta := m.(*Meta) - {{.API}}API := {{.API}}.NewAPI(meta.scwClient) + {{.API}}API := {{.API}}.NewAPI(meta.ExtractScwClient(m)) {{.Locality}}, ID, err := parse{{.LocalityAdjectiveUpper}}ID({{.LocalityAdjective}}ID) if err != nil { diff --git a/cmd/tftemplate/resource.go.tmpl b/cmd/tftemplate/resource.go.tmpl index 8b40414b1..217ff7b15 100644 --- a/cmd/tftemplate/resource.go.tmpl +++ b/cmd/tftemplate/resource.go.tmpl @@ -33,8 +33,8 @@ func resourceScaleway{{ .Resource }}() *schema.Resource { } } -func resourceScaleway{{ .Resource }}Create(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, {{ .Locality }}, err := {{ .API }}APIWith{{ .LocalityUpper }}(d, meta) +func resourceScaleway{{ .Resource }}Create(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, {{ .Locality }}, err := {{ .API }}APIWith{{ .LocalityUpper }}(d, m) if err != nil { return diag.FromErr(err) } @@ -57,11 +57,11 @@ func resourceScaleway{{ .Resource }}Create(ctx context.Context, d *schema.Resour } {{end}} - return resourceScaleway{{ .Resource }}Read(ctx, d, meta) + return resourceScaleway{{ .Resource }}Read(ctx, d, m) } -func resourceScaleway{{ .Resource }}Read(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, {{ .Locality }}, id, err := {{ .API }}APIWith{{ .LocalityUpper }}AndID(meta, d.Id()) +func resourceScaleway{{ .Resource }}Read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, {{ .Locality }}, id, err := {{ .API }}APIWith{{ .LocalityUpper }}AndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -88,8 +88,8 @@ func resourceScaleway{{ .Resource }}Read(ctx context.Context, d *schema.Resource return nil } -func resourceScaleway{{ .Resource }}Update(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, {{ .Locality }}, id, err := {{ .API }}APIWith{{ .LocalityUpper }}AndID(meta, d.Id()) +func resourceScaleway{{ .Resource }}Update(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, {{ .Locality }}, id, err := {{ .API }}APIWith{{ .LocalityUpper }}AndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -116,11 +116,11 @@ func resourceScaleway{{ .Resource }}Update(ctx context.Context, d *schema.Resour return diag.FromErr(err) } - return resourceScaleway{{ .Resource }}Read(ctx, d, meta) + return resourceScaleway{{ .Resource }}Read(ctx, d, m) } -func resourceScaleway{{ .Resource }}Delete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, {{ .Locality }}, id, err := {{ .API }}APIWith{{ .LocalityUpper }}AndID(meta, d.Id()) +func resourceScaleway{{ .Resource }}Delete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, {{ .Locality }}, id, err := {{ .API }}APIWith{{ .LocalityUpper }}AndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/internal/meta/errors.go b/internal/meta/errors.go new file mode 100644 index 000000000..dc369d773 --- /dev/null +++ b/internal/meta/errors.go @@ -0,0 +1,6 @@ +package meta + +import "errors" + +// ErrProjectIDNotFound is returned when no region can be detected +var ErrProjectIDNotFound = errors.New("could not detect project id") diff --git a/internal/meta/extractors.go b/internal/meta/extractors.go new file mode 100644 index 000000000..59734f77e --- /dev/null +++ b/internal/meta/extractors.go @@ -0,0 +1,98 @@ +package meta + +import ( + "net/http" + + "github.com/scaleway/scaleway-sdk-go/scw" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" +) + +// terraformResourceData is an interface for *schema.ResourceData. (used for mock) +type terraformResourceData interface { + HasChange(string) bool + GetOk(string) (interface{}, bool) + Get(string) interface{} + 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) { + rawZone, exist := d.GetOk("zone") + if exist { + return scw.ParseZone(rawZone.(string)) + } + + zone, exist := m.(*Meta).ScwClient().GetDefaultZone() + if exist { + return zone, nil + } + + return "", zonal.ErrZoneNotFound +} + +// 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) { + rawRegion, exist := d.GetOk("region") + if exist { + return scw.ParseRegion(rawRegion.(string)) + } + + region, exist := m.(*Meta).ScwClient().GetDefaultRegion() + if exist { + return region, nil + } + + return "", regional.ErrRegionNotFound +} + +// ExtractRegionWithDefault will try to guess the region from the following: +// - 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) { + rawRegion, exist := d.GetOk("region") + if exist { + return scw.ParseRegion(rawRegion.(string)) + } + + if defaultRegion != "" { + return defaultRegion, nil + } + + region, exist := m.(*Meta).ScwClient().GetDefaultRegion() + if exist { + return region, nil + } + + return "", regional.ErrRegionNotFound +} + +// 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) { + rawProjectID, exist := d.GetOk("project_id") + if exist { + return rawProjectID.(string), false, nil + } + + defaultProjectID, exist := m.(*Meta).ScwClient().GetDefaultProjectID() + if exist { + return defaultProjectID, true, nil + } + + return "", false, ErrProjectIDNotFound +} + +func ExtractScwClient(m interface{}) *scw.Client { + return m.(*Meta).ScwClient() +} + +func ExtractHTTPClient(m interface{}) *http.Client { + return m.(*Meta).HTTPClient() +} diff --git a/internal/meta/meta.go b/internal/meta/meta.go new file mode 100644 index 000000000..249e792e4 --- /dev/null +++ b/internal/meta/meta.go @@ -0,0 +1,185 @@ +package meta + +import ( + "context" + "fmt" + "net/http" + "os" + + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/scaleway/scaleway-sdk-go/scw" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" + "github.com/scaleway/terraform-provider-scaleway/v2/version" +) + +const appendUserAgentEnvVar = "TF_APPEND_USER_AGENT" + +// Meta contains config and SDK clients used by resources. +// +// This meta value is passed into all resources. +type Meta struct { + // scwClient is the Scaleway SDK client. + scwClient *scw.Client + // httpClient can be either a regular http.Client used to make real HTTP requests + // or it can be a http.Client used to record and replay cassettes which is useful + // to replay recorded interactions with APIs locally + httpClient *http.Client +} + +func (m Meta) ScwClient() *scw.Client { + return m.scwClient +} + +func (m Meta) HTTPClient() *http.Client { + return m.httpClient +} + +type Config struct { + ProviderSchema *schema.ResourceData + TerraformVersion string + ForceZone scw.Zone + ForceProjectID string + ForceOrganizationID string + ForceAccessKey string + ForceSecretKey string + HTTPClient *http.Client +} + +// providerConfigure creates the Meta object containing the SDK client. +func NewMeta(ctx context.Context, config *Config) (*Meta, error) { + //// + // Load Profile + //// + profile, err := loadProfile(ctx, config.ProviderSchema) + if err != nil { + return nil, err + } + if config.ForceZone != "" { + region, err := config.ForceZone.Region() + if err != nil { + return nil, err + } + profile.DefaultRegion = scw.StringPtr(region.String()) + profile.DefaultZone = scw.StringPtr(config.ForceZone.String()) + } + if config.ForceProjectID != "" { + profile.DefaultProjectID = scw.StringPtr(config.ForceProjectID) + } + if config.ForceOrganizationID != "" { + profile.DefaultOrganizationID = scw.StringPtr(config.ForceOrganizationID) + } + if config.ForceAccessKey != "" { + profile.AccessKey = scw.StringPtr(config.ForceAccessKey) + } + if config.ForceSecretKey != "" { + profile.SecretKey = scw.StringPtr(config.ForceSecretKey) + } + + // TODO validated profile + + //// + // Create scaleway SDK client + //// + opts := []scw.ClientOption{ + scw.WithUserAgent(customizeUserAgent(version.Version, config.TerraformVersion)), + scw.WithProfile(profile), + } + + httpClient := &http.Client{Transport: transport.NewRetryableTransport(http.DefaultTransport)} + if config.HTTPClient != nil { + httpClient = config.HTTPClient + } + opts = append(opts, scw.WithHTTPClient(httpClient)) + + scwClient, err := scw.NewClient(opts...) + if err != nil { + return nil, err + } + + return &Meta{ + scwClient: scwClient, + httpClient: httpClient, + }, nil +} + +func customizeUserAgent(providerVersion string, terraformVersion string) string { + userAgent := fmt.Sprintf("terraform-provider/%s terraform/%s", providerVersion, terraformVersion) + + if appendUserAgent := os.Getenv(appendUserAgentEnvVar); appendUserAgent != "" { + userAgent += " " + appendUserAgent + } + + return userAgent +} + +//gocyclo:ignore +func loadProfile(ctx context.Context, d *schema.ResourceData) (*scw.Profile, error) { + config, err := scw.LoadConfig() + // If the config file do not exist, don't return an error as we may find config in ENV or flags. + if _, isNotFoundError := err.(*scw.ConfigFileNotFoundError); isNotFoundError { + config = &scw.Config{} + } else if err != nil { + return nil, err + } + + // By default we set default zone and region to fr-par + defaultZoneProfile := &scw.Profile{ + DefaultRegion: scw.StringPtr(scw.RegionFrPar.String()), + DefaultZone: scw.StringPtr(scw.ZoneFrPar1.String()), + } + + activeProfile, err := config.GetActiveProfile() + if err != nil { + return nil, err + } + envProfile := scw.LoadEnvProfile() + + providerProfile := &scw.Profile{} + if d != nil { + if profileName, exist := d.GetOk("profile"); exist { + profileFromConfig, err := config.GetProfile(profileName.(string)) + if err == nil { + providerProfile = profileFromConfig + } + } + if accessKey, exist := d.GetOk("access_key"); exist { + providerProfile.AccessKey = scw.StringPtr(accessKey.(string)) + } + if secretKey, exist := d.GetOk("secret_key"); exist { + providerProfile.SecretKey = scw.StringPtr(secretKey.(string)) + } + if projectID, exist := d.GetOk("project_id"); exist { + providerProfile.DefaultProjectID = scw.StringPtr(projectID.(string)) + } + if orgID, exist := d.GetOk("organization_id"); exist { + providerProfile.DefaultOrganizationID = scw.StringPtr(orgID.(string)) + } + if region, exist := d.GetOk("region"); exist { + providerProfile.DefaultRegion = scw.StringPtr(region.(string)) + } + if zone, exist := d.GetOk("zone"); exist { + providerProfile.DefaultZone = scw.StringPtr(zone.(string)) + } + if apiURL, exist := d.GetOk("api_url"); exist { + providerProfile.APIURL = scw.StringPtr(apiURL.(string)) + } + } + + profile := scw.MergeProfiles(defaultZoneProfile, activeProfile, providerProfile, envProfile) + + // If profile have a defaultZone but no defaultRegion we set the defaultRegion + // to the one of the defaultZone + if profile.DefaultZone != nil && *profile.DefaultZone != "" && + (profile.DefaultRegion == nil || *profile.DefaultRegion == "") { + zone := scw.Zone(*profile.DefaultZone) + tflog.Debug(ctx, fmt.Sprintf("guess region from %s zone", zone)) + region, err := zone.Region() + if err == nil { + profile.DefaultRegion = scw.StringPtr(region.String()) + } else { + tflog.Debug(ctx, "cannot guess region: "+err.Error()) + } + } + return profile, nil +} diff --git a/scaleway/data_source_account_project.go b/scaleway/data_source_account_project.go index bb5c55f68..900583f8e 100644 --- a/scaleway/data_source_account_project.go +++ b/scaleway/data_source_account_project.go @@ -7,6 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" accountV3 "github.com/scaleway/scaleway-sdk-go/api/account/v3" "github.com/scaleway/scaleway-sdk-go/scw" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) func dataSourceScalewayAccountProject() *schema.Resource { @@ -28,13 +29,13 @@ func dataSourceScalewayAccountProject() *schema.Resource { } } -func dataSourceScalewayAccountProjectRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - accountAPI := accountV3ProjectAPI(meta) +func dataSourceScalewayAccountProjectRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + accountAPI := accountV3ProjectAPI(m) var projectID string if name, nameExists := d.GetOk("name"); nameExists { - orgID := getOrganizationID(meta, d) + orgID := getOrganizationID(m, d) if orgID == nil { // required not in schema as we could use default return diag.Errorf("organization_id is required with name") @@ -58,7 +59,7 @@ func dataSourceScalewayAccountProjectRead(ctx context.Context, d *schema.Resourc projectID = foundProject.ID } else { - extractedProjectID, _, err := extractProjectID(d, meta.(*Meta)) + extractedProjectID, _, err := meta.ExtractProjectID(d, m) if err != nil { return diag.FromErr(err) } @@ -69,7 +70,7 @@ func dataSourceScalewayAccountProjectRead(ctx context.Context, d *schema.Resourc d.SetId(projectID) _ = d.Set("project_id", projectID) - diags := resourceScalewayAccountProjectRead(ctx, d, meta) + diags := resourceScalewayAccountProjectRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read account project")...) } diff --git a/scaleway/data_source_account_project_test.go b/scaleway/data_source_account_project_test.go index 9ca8272d0..5091a2457 100644 --- a/scaleway/data_source_account_project_test.go +++ b/scaleway/data_source_account_project_test.go @@ -10,7 +10,7 @@ import ( func TestAccScalewayDataSourceAccountProject_Basic(t *testing.T) { tt := NewTestTools(t) defer tt.Cleanup() - orgID, orgIDExists := tt.Meta.scwClient.GetDefaultOrganizationID() + orgID, orgIDExists := tt.Meta.ScwClient().GetDefaultOrganizationID() if !orgIDExists { orgID = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } @@ -49,7 +49,7 @@ func TestAccScalewayDataSourceAccountProject_Basic(t *testing.T) { func TestAccScalewayDataSourceAccountProject_Default(t *testing.T) { tt := NewTestTools(t) defer tt.Cleanup() - orgID, orgIDExists := tt.Meta.scwClient.GetDefaultOrganizationID() + orgID, orgIDExists := tt.Meta.ScwClient().GetDefaultOrganizationID() if !orgIDExists { orgID = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" } @@ -92,7 +92,7 @@ func TestAccScalewayDataSourceAccountProject_Extract(t *testing.T) { tt := NewTestTools(t) defer tt.Cleanup() - projectID, projectIDExists := tt.Meta.scwClient.GetDefaultProjectID() + projectID, projectIDExists := tt.Meta.ScwClient().GetDefaultProjectID() if !projectIDExists { t.Skip("no default project ID") } diff --git a/scaleway/data_source_baremetal_offer.go b/scaleway/data_source_baremetal_offer.go index 0c9ca4899..018ac77e0 100644 --- a/scaleway/data_source_baremetal_offer.go +++ b/scaleway/data_source_baremetal_offer.go @@ -144,8 +144,8 @@ func dataSourceScalewayBaremetalOffer() *schema.Resource { } } -func dataSourceScalewayBaremetalOfferRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - baremetalAPI, fallBackZone, err := baremetalAPIWithZone(d, meta) +func dataSourceScalewayBaremetalOfferRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + baremetalAPI, fallBackZone, err := baremetalAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_baremetal_offer_test.go b/scaleway/data_source_baremetal_offer_test.go index c9d11c57b..48d1072df 100644 --- a/scaleway/data_source_baremetal_offer_test.go +++ b/scaleway/data_source_baremetal_offer_test.go @@ -173,7 +173,7 @@ func testAccCheckScalewayBaremetalOfferExists(tt *TestTools, n string) resource. return err } - baremetalAPI := baremetal.NewAPI(tt.Meta.scwClient) + baremetalAPI := baremetal.NewAPI(tt.Meta.ScwClient()) _, err = baremetalFindOfferByID(context.Background(), baremetalAPI, zone, id) if err != nil { return err diff --git a/scaleway/data_source_baremetal_option.go b/scaleway/data_source_baremetal_option.go index d87900e68..84002de9e 100644 --- a/scaleway/data_source_baremetal_option.go +++ b/scaleway/data_source_baremetal_option.go @@ -38,8 +38,8 @@ func dataSourceScalewayBaremetalOption() *schema.Resource { } } -func dataSourceScalewayBaremetalOptionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := baremetalAPIWithZone(d, meta) +func dataSourceScalewayBaremetalOptionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := baremetalAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_baremetal_option_test.go b/scaleway/data_source_baremetal_option_test.go index 96f7b0a4b..e90d36167 100644 --- a/scaleway/data_source_baremetal_option_test.go +++ b/scaleway/data_source_baremetal_option_test.go @@ -59,7 +59,7 @@ func testAccCheckScalewayBaremetalOptionExists(tt *TestTools, n string) resource return err } - baremetalAPI := baremetal.NewAPI(tt.Meta.scwClient) + baremetalAPI := baremetal.NewAPI(tt.Meta.ScwClient()) _, err = baremetalAPI.GetOption(&baremetal.GetOptionRequest{ OptionID: ID, Zone: zone, diff --git a/scaleway/data_source_baremetal_os.go b/scaleway/data_source_baremetal_os.go index a10c64828..d15d066cc 100644 --- a/scaleway/data_source_baremetal_os.go +++ b/scaleway/data_source_baremetal_os.go @@ -39,8 +39,8 @@ func dataSourceScalewayBaremetalOs() *schema.Resource { } } -func dataSourceScalewayBaremetalOsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := baremetalAPIWithZone(d, meta) +func dataSourceScalewayBaremetalOsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := baremetalAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_baremetal_os_test.go b/scaleway/data_source_baremetal_os_test.go index 8af97d503..a58224592 100644 --- a/scaleway/data_source_baremetal_os_test.go +++ b/scaleway/data_source_baremetal_os_test.go @@ -60,7 +60,7 @@ func testAccCheckScalewayBaremetalOsExists(tt *TestTools, n string) resource.Tes return err } - baremetalAPI := baremetal.NewAPI(tt.Meta.scwClient) + baremetalAPI := baremetal.NewAPI(tt.Meta.ScwClient()) _, err = baremetalAPI.GetOS(&baremetal.GetOSRequest{ OsID: ID, Zone: zone, diff --git a/scaleway/data_source_baremetal_server.go b/scaleway/data_source_baremetal_server.go index 66fc5f904..e2beddf62 100644 --- a/scaleway/data_source_baremetal_server.go +++ b/scaleway/data_source_baremetal_server.go @@ -31,8 +31,8 @@ func dataSourceScalewayBaremetalServer() *schema.Resource { } } -func dataSourceScalewayBaremetalServerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := baremetalAPIWithZone(d, meta) +func dataSourceScalewayBaremetalServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := baremetalAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -67,7 +67,7 @@ func dataSourceScalewayBaremetalServerRead(ctx context.Context, d *schema.Resour if err != nil { return diag.FromErr(err) } - diags := resourceScalewayBaremetalServerRead(ctx, d, meta) + diags := resourceScalewayBaremetalServerRead(ctx, d, m) if diags != nil { return diags } diff --git a/scaleway/data_source_billing_consumption.go b/scaleway/data_source_billing_consumption.go index b169b69ce..36635be4c 100644 --- a/scaleway/data_source_billing_consumption.go +++ b/scaleway/data_source_billing_consumption.go @@ -68,8 +68,8 @@ func dataSourceScalewayBillingConsumptions() *schema.Resource { } } -func dataSourceScalewayBillingConsumptionsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := billingAPI(meta) +func dataSourceScalewayBillingConsumptionsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := billingAPI(m) res, err := api.ListConsumptions(&billing.ListConsumptionsRequest{ CategoryName: expandStringPtr(d.Get("category_name")), diff --git a/scaleway/data_source_billing_invoices.go b/scaleway/data_source_billing_invoices.go index baefa63b4..f41359594 100644 --- a/scaleway/data_source_billing_invoices.go +++ b/scaleway/data_source_billing_invoices.go @@ -124,8 +124,8 @@ func dataSourceScalewayBillingInvoices() *schema.Resource { } } -func dataSourceScalewayBillingInvoicesRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := billingAPI(meta) +func dataSourceScalewayBillingInvoicesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := billingAPI(m) res, err := api.ListInvoices(&billing.ListInvoicesRequest{ OrganizationID: expandStringPtr(d.Get("organization_id")), diff --git a/scaleway/data_source_block_snapshot.go b/scaleway/data_source_block_snapshot.go index b76967487..53e510c29 100644 --- a/scaleway/data_source_block_snapshot.go +++ b/scaleway/data_source_block_snapshot.go @@ -28,8 +28,8 @@ func dataSourceScalewayBlockSnapshot() *schema.Resource { } } -func dataSourceScalewayBlockSnapshotRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := blockAPIWithZone(d, meta) +func dataSourceScalewayBlockSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := blockAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -65,7 +65,7 @@ func dataSourceScalewayBlockSnapshotRead(ctx context.Context, d *schema.Resource return diag.FromErr(err) } - diags := resourceScalewayBlockSnapshotRead(ctx, d, meta) + diags := resourceScalewayBlockSnapshotRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read snapshot state")...) } diff --git a/scaleway/data_source_block_volume.go b/scaleway/data_source_block_volume.go index ff78a6b1a..913262881 100644 --- a/scaleway/data_source_block_volume.go +++ b/scaleway/data_source_block_volume.go @@ -28,8 +28,8 @@ func dataSourceScalewayBlockVolume() *schema.Resource { } } -func dataSourceScalewayBlockVolumeRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := blockAPIWithZone(d, meta) +func dataSourceScalewayBlockVolumeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := blockAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -64,7 +64,7 @@ func dataSourceScalewayBlockVolumeRead(ctx context.Context, d *schema.ResourceDa return diag.FromErr(err) } - diags := resourceScalewayBlockVolumeRead(ctx, d, meta) + diags := resourceScalewayBlockVolumeRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read volume state")...) } diff --git a/scaleway/data_source_cockpit.go b/scaleway/data_source_cockpit.go index d6b43f348..661bc67cc 100644 --- a/scaleway/data_source_cockpit.go +++ b/scaleway/data_source_cockpit.go @@ -25,8 +25,8 @@ func dataSourceScalewayCockpit() *schema.Resource { } } -func dataSourceScalewayCockpitRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, err := cockpitAPI(meta) +func dataSourceScalewayCockpitRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, err := cockpitAPI(m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_cockpit_plan.go b/scaleway/data_source_cockpit_plan.go index d57f6624f..14f177df8 100644 --- a/scaleway/data_source_cockpit_plan.go +++ b/scaleway/data_source_cockpit_plan.go @@ -22,8 +22,8 @@ func dataSourceScalewayCockpitPlan() *schema.Resource { } } -func dataSourceScalewayCockpitPlanRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, err := cockpitAPI(meta) +func dataSourceScalewayCockpitPlanRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, err := cockpitAPI(m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_container.go b/scaleway/data_source_container.go index 1feec24ca..1d089a561 100644 --- a/scaleway/data_source_container.go +++ b/scaleway/data_source_container.go @@ -43,8 +43,8 @@ func dataSourceScalewayContainer() *schema.Resource { } } -func dataSourceScalewayContainerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := containerAPIWithRegion(d, meta) +func dataSourceScalewayContainerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := containerAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -79,5 +79,5 @@ func dataSourceScalewayContainerRead(ctx context.Context, d *schema.ResourceData d.SetId(regionalID) _ = d.Set("container_id", regionalID) - return resourceScalewayContainerRead(ctx, d, meta) + return resourceScalewayContainerRead(ctx, d, m) } diff --git a/scaleway/data_source_container_namespace.go b/scaleway/data_source_container_namespace.go index d60df928f..38fbbd6fb 100644 --- a/scaleway/data_source_container_namespace.go +++ b/scaleway/data_source_container_namespace.go @@ -30,8 +30,8 @@ func dataSourceScalewayContainerNamespace() *schema.Resource { } } -func dataSourceScalewayContainerNamespaceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := containerAPIWithRegion(d, meta) +func dataSourceScalewayContainerNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := containerAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -64,5 +64,5 @@ func dataSourceScalewayContainerNamespaceRead(ctx context.Context, d *schema.Res d.SetId(regionalID) _ = d.Set("namespace_id", regionalID) - return resourceScalewayContainerNamespaceRead(ctx, d, meta) + return resourceScalewayContainerNamespaceRead(ctx, d, m) } diff --git a/scaleway/data_source_document_db_database.go b/scaleway/data_source_document_db_database.go index ed299d68a..410197e42 100644 --- a/scaleway/data_source_document_db_database.go +++ b/scaleway/data_source_document_db_database.go @@ -23,8 +23,8 @@ func dataSourceScalewayDocumentDBDatabase() *schema.Resource { } } -func dataSourceScalewayDocumentDBDatabaseRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - _, region, err := documentDBAPIWithRegion(d, meta) +func dataSourceScalewayDocumentDBDatabaseRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + _, region, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -38,7 +38,7 @@ func dataSourceScalewayDocumentDBDatabaseRead(ctx context.Context, d *schema.Res return diag.FromErr(err) } - diags := resourceScalewayDocumentDBDatabaseRead(ctx, d, meta) + diags := resourceScalewayDocumentDBDatabaseRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read database state")...) } diff --git a/scaleway/data_source_document_db_instance.go b/scaleway/data_source_document_db_instance.go index 5274ebb29..aabc2c300 100644 --- a/scaleway/data_source_document_db_instance.go +++ b/scaleway/data_source_document_db_instance.go @@ -28,8 +28,8 @@ func dataSourceScalewayDocumentDBInstance() *schema.Resource { } } -func dataSourceScalewayDocumentDBInstanceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := documentDBAPIWithRegion(d, meta) +func dataSourceScalewayDocumentDBInstanceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -65,7 +65,7 @@ func dataSourceScalewayDocumentDBInstanceRead(ctx context.Context, d *schema.Res return diag.FromErr(err) } - diags := resourceScalewayDocumentDBInstanceRead(ctx, d, meta) + diags := resourceScalewayDocumentDBInstanceRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read instance state")...) } diff --git a/scaleway/data_source_document_db_load_balancer_endpoint.go b/scaleway/data_source_document_db_load_balancer_endpoint.go index 500793754..cad9df81c 100644 --- a/scaleway/data_source_document_db_load_balancer_endpoint.go +++ b/scaleway/data_source_document_db_load_balancer_endpoint.go @@ -56,8 +56,8 @@ func dataSourceScalewayDocumentDBEndpointLoadBalancer() *schema.Resource { } } -func dataSourceScalewayDocumentDBLoadBalancerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := documentDBAPIWithRegion(d, meta) +func dataSourceScalewayDocumentDBLoadBalancerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_domain_record.go b/scaleway/data_source_domain_record.go index 2798fdebb..0c28a81e8 100644 --- a/scaleway/data_source_domain_record.go +++ b/scaleway/data_source_domain_record.go @@ -34,8 +34,8 @@ func dataSourceScalewayDomainRecord() *schema.Resource { } } -func dataSourceScalewayDomainRecordRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - domainAPI := newDomainAPI(meta) +func dataSourceScalewayDomainRecordRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + domainAPI := newDomainAPI(m) recordID, ok := d.GetOk("record_id") if !ok { // Get Record by dns_zone, name, type and data. @@ -67,5 +67,5 @@ func dataSourceScalewayDomainRecordRead(ctx context.Context, d *schema.ResourceD } d.SetId(fmt.Sprintf("%s/%s", d.Get("dns_zone"), recordID.(string))) - return resourceScalewayDomainRecordRead(ctx, d, meta) + return resourceScalewayDomainRecordRead(ctx, d, m) } diff --git a/scaleway/data_source_domain_zone.go b/scaleway/data_source_domain_zone.go index ca5758677..b051177d3 100644 --- a/scaleway/data_source_domain_zone.go +++ b/scaleway/data_source_domain_zone.go @@ -20,8 +20,8 @@ func dataSourceScalewayDomainZone() *schema.Resource { } } -func dataSourceScalewayDomainZoneRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func dataSourceScalewayDomainZoneRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { d.SetId(fmt.Sprintf("%s.%s", d.Get("subdomain").(string), d.Get("domain").(string))) - return resourceScalewayDomainZoneRead(ctx, d, meta) + return resourceScalewayDomainZoneRead(ctx, d, m) } diff --git a/scaleway/data_source_flexible_ip.go b/scaleway/data_source_flexible_ip.go index ea85f86eb..47c0e3275 100644 --- a/scaleway/data_source_flexible_ip.go +++ b/scaleway/data_source_flexible_ip.go @@ -41,8 +41,8 @@ func dataSourceScalewayFlexibleIP() *schema.Resource { } } -func dataSourceScalewayFlexibleIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - fipAPI, zone, err := fipAPIWithZone(d, meta) +func dataSourceScalewayFlexibleIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -78,7 +78,7 @@ func dataSourceScalewayFlexibleIPRead(ctx context.Context, d *schema.ResourceDat return diag.FromErr(err) } - diags := resourceScalewayFlexibleIPRead(ctx, d, meta) + diags := resourceScalewayFlexibleIPRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read flexible ip state")...) } diff --git a/scaleway/data_source_flexible_ips.go b/scaleway/data_source_flexible_ips.go index 2a6c1cdc7..79d6ca71d 100644 --- a/scaleway/data_source_flexible_ips.go +++ b/scaleway/data_source_flexible_ips.go @@ -123,8 +123,8 @@ func dataSourceScalewayFlexibleIPs() *schema.Resource { } } -func dataSourceScalewayFlexibleIPsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - fipAPI, zone, err := fipAPIWithZone(d, meta) +func dataSourceScalewayFlexibleIPsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_function.go b/scaleway/data_source_function.go index 238ba4b71..f896951af 100644 --- a/scaleway/data_source_function.go +++ b/scaleway/data_source_function.go @@ -29,8 +29,8 @@ func dataSourceScalewayFunction() *schema.Resource { } } -func dataSourceScalewayFunctionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := functionAPIWithRegion(d, meta) +func dataSourceScalewayFunctionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -64,5 +64,5 @@ func dataSourceScalewayFunctionRead(ctx context.Context, d *schema.ResourceData, d.SetId(regionalID) _ = d.Set("function_id", regionalID) - return resourceScalewayFunctionRead(ctx, d, meta) + return resourceScalewayFunctionRead(ctx, d, m) } diff --git a/scaleway/data_source_function_namespace.go b/scaleway/data_source_function_namespace.go index f285c3f5b..c46aeacc5 100644 --- a/scaleway/data_source_function_namespace.go +++ b/scaleway/data_source_function_namespace.go @@ -30,8 +30,8 @@ func dataSourceScalewayFunctionNamespace() *schema.Resource { } } -func dataSourceScalewayFunctionNamespaceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := functionAPIWithRegion(d, meta) +func dataSourceScalewayFunctionNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -64,5 +64,5 @@ func dataSourceScalewayFunctionNamespaceRead(ctx context.Context, d *schema.Reso d.SetId(regionalID) _ = d.Set("namespace_id", regionalID) - return resourceScalewayFunctionNamespaceRead(ctx, d, meta) + return resourceScalewayFunctionNamespaceRead(ctx, d, m) } diff --git a/scaleway/data_source_iam_application.go b/scaleway/data_source_iam_application.go index 6df54d2a6..8f92cbb2f 100644 --- a/scaleway/data_source_iam_application.go +++ b/scaleway/data_source_iam_application.go @@ -35,15 +35,15 @@ func dataSourceScalewayIamApplication() *schema.Resource { } } -func dataSourceScalewayIamApplicationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func dataSourceScalewayIamApplicationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) appID, appIDExists := d.GetOk("application_id") if !appIDExists { applicationName := d.Get("name").(string) res, err := api.ListApplications(&iam.ListApplicationsRequest{ - OrganizationID: flattenStringPtr(getOrganizationID(meta, d)).(string), + OrganizationID: flattenStringPtr(getOrganizationID(m, d)).(string), Name: expandStringPtr(applicationName), }, scw.WithContext(ctx)) if err != nil { @@ -68,7 +68,7 @@ func dataSourceScalewayIamApplicationRead(ctx context.Context, d *schema.Resourc return diag.FromErr(err) } - diags := resourceScalewayIamApplicationRead(ctx, d, meta) + diags := resourceScalewayIamApplicationRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read iam application state")...) } diff --git a/scaleway/data_source_iam_group.go b/scaleway/data_source_iam_group.go index ba7c916ca..bdd03cc7d 100644 --- a/scaleway/data_source_iam_group.go +++ b/scaleway/data_source_iam_group.go @@ -35,14 +35,14 @@ func dataSourceScalewayIamGroup() *schema.Resource { } } -func dataSourceScalewayIamGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func dataSourceScalewayIamGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) groupID, groupIDExists := d.GetOk("group_id") if !groupIDExists { groupName := d.Get("name").(string) req := &iam.ListGroupsRequest{ - OrganizationID: flattenStringPtr(getOrganizationID(meta, d)).(string), + OrganizationID: flattenStringPtr(getOrganizationID(m, d)).(string), Name: expandStringPtr(groupName), } @@ -69,7 +69,7 @@ func dataSourceScalewayIamGroupRead(ctx context.Context, d *schema.ResourceData, return diag.FromErr(err) } - diags := resourceScalewayIamGroupRead(ctx, d, meta) + diags := resourceScalewayIamGroupRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read iam group state")...) } diff --git a/scaleway/data_source_iam_ssh_key.go b/scaleway/data_source_iam_ssh_key.go index 17d8eefcd..cd563c2d3 100644 --- a/scaleway/data_source_iam_ssh_key.go +++ b/scaleway/data_source_iam_ssh_key.go @@ -28,8 +28,8 @@ func dataSourceScalewayIamSSHKey() *schema.Resource { } } -func dataSourceScalewayIamSSHKeyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iamAPI := iamAPI(meta) +func dataSourceScalewayIamSSHKeyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iamAPI := iamAPI(m) sshKeyID, sshKeyIDExists := d.GetOk("ssh_key_id") if !sshKeyIDExists { @@ -61,7 +61,7 @@ func dataSourceScalewayIamSSHKeyRead(ctx context.Context, d *schema.ResourceData return diag.FromErr(err) } - diags := resourceScalewayIamSSHKeyRead(ctx, d, meta) + diags := resourceScalewayIamSSHKeyRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read iam ssh key state")...) } diff --git a/scaleway/data_source_iam_user.go b/scaleway/data_source_iam_user.go index 2e7964b6e..6a1c9bbe4 100644 --- a/scaleway/data_source_iam_user.go +++ b/scaleway/data_source_iam_user.go @@ -38,8 +38,8 @@ func dataSourceScalewayIamUser() *schema.Resource { } } -func dataSourceScalewayIamUserRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iamAPI := iamAPI(meta) +func dataSourceScalewayIamUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iamAPI := iamAPI(m) var email, organizationID string userID, ok := d.GetOk("user_id") @@ -55,7 +55,7 @@ func dataSourceScalewayIamUserRead(ctx context.Context, d *schema.ResourceData, organizationID = res.OrganizationID } else { res, err := iamAPI.ListUsers(&iam.ListUsersRequest{ - OrganizationID: getOrganizationID(meta, d), + OrganizationID: getOrganizationID(m, d), }, scw.WithAllPages(), scw.WithContext(ctx)) if err != nil { return diag.FromErr(err) diff --git a/scaleway/data_source_instance_image.go b/scaleway/data_source_instance_image.go index 5af384389..7e644b4f8 100644 --- a/scaleway/data_source_instance_image.go +++ b/scaleway/data_source_instance_image.go @@ -94,8 +94,8 @@ func dataSourceScalewayInstanceImage() *schema.Resource { } } -func dataSourceScalewayInstanceImageRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func dataSourceScalewayInstanceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_instance_ip.go b/scaleway/data_source_instance_ip.go index 671fd7d2a..9f2fcc417 100644 --- a/scaleway/data_source_instance_ip.go +++ b/scaleway/data_source_instance_ip.go @@ -38,8 +38,8 @@ func dataSourceScalewayInstanceIP() *schema.Resource { } } -func dataSourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func dataSourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -65,5 +65,5 @@ func dataSourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceDat } d.SetId(zonal.NewIDString(zone, ID)) - return resourceScalewayInstanceIPRead(ctx, d, meta) + return resourceScalewayInstanceIPRead(ctx, d, m) } diff --git a/scaleway/data_source_instance_placement_group.go b/scaleway/data_source_instance_placement_group.go index 5725fcd40..74acd502b 100644 --- a/scaleway/data_source_instance_placement_group.go +++ b/scaleway/data_source_instance_placement_group.go @@ -29,8 +29,8 @@ func dataSourceScalewayInstancePlacementGroup() *schema.Resource { } } -func dataSourceScalewayInstancePlacementGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := instanceAPIWithZone(d, meta) +func dataSourceScalewayInstancePlacementGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -66,7 +66,7 @@ func dataSourceScalewayInstancePlacementGroupRead(ctx context.Context, d *schema return diag.FromErr(err) } - diags := resourceScalewayInstancePlacementGroupRead(ctx, d, meta) + diags := resourceScalewayInstancePlacementGroupRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read placement group state")...) } diff --git a/scaleway/data_source_instance_private_nic.go b/scaleway/data_source_instance_private_nic.go index 6fc7b9b31..ba1fa4f38 100644 --- a/scaleway/data_source_instance_private_nic.go +++ b/scaleway/data_source_instance_private_nic.go @@ -36,8 +36,8 @@ func dataSourceScalewayInstancePrivateNIC() *schema.Resource { } } -func dataSourceScalewayInstancePrivateNICRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func dataSourceScalewayInstancePrivateNICRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -77,7 +77,7 @@ func dataSourceScalewayInstancePrivateNICRead(ctx context.Context, d *schema.Res return diag.FromErr(err) } - diags := resourceScalewayInstancePrivateNICRead(ctx, d, meta) + diags := resourceScalewayInstancePrivateNICRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read private nic state")...) } diff --git a/scaleway/data_source_instance_security_group.go b/scaleway/data_source_instance_security_group.go index 2ba30668c..b86c35a9a 100644 --- a/scaleway/data_source_instance_security_group.go +++ b/scaleway/data_source_instance_security_group.go @@ -32,8 +32,8 @@ func dataSourceScalewayInstanceSecurityGroup() *schema.Resource { } } -func dataSourceScalewayInstanceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func dataSourceScalewayInstanceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -65,5 +65,5 @@ func dataSourceScalewayInstanceSecurityGroupRead(ctx context.Context, d *schema. zonedID := datasourceNewZonedID(securityGroupID, zone) d.SetId(zonedID) _ = d.Set("security_group_id", zonedID) - return resourceScalewayInstanceSecurityGroupRead(ctx, d, meta) + return resourceScalewayInstanceSecurityGroupRead(ctx, d, m) } diff --git a/scaleway/data_source_instance_server.go b/scaleway/data_source_instance_server.go index c64a110df..23e6bdccc 100644 --- a/scaleway/data_source_instance_server.go +++ b/scaleway/data_source_instance_server.go @@ -32,8 +32,8 @@ func dataSourceScalewayInstanceServer() *schema.Resource { } } -func dataSourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func dataSourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -65,5 +65,5 @@ func dataSourceScalewayInstanceServerRead(ctx context.Context, d *schema.Resourc zonedID := datasourceNewZonedID(serverID, zone) d.SetId(zonedID) _ = d.Set("server_id", zonedID) - return resourceScalewayInstanceServerRead(ctx, d, meta) + return resourceScalewayInstanceServerRead(ctx, d, m) } diff --git a/scaleway/data_source_instance_servers.go b/scaleway/data_source_instance_servers.go index dd13feca6..61c747d7e 100644 --- a/scaleway/data_source_instance_servers.go +++ b/scaleway/data_source_instance_servers.go @@ -142,8 +142,8 @@ func dataSourceScalewayInstanceServers() *schema.Resource { } } -func dataSourceScalewayInstanceServersRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func dataSourceScalewayInstanceServersRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_instance_snapshot.go b/scaleway/data_source_instance_snapshot.go index bdc64e7fb..4552d180e 100644 --- a/scaleway/data_source_instance_snapshot.go +++ b/scaleway/data_source_instance_snapshot.go @@ -31,8 +31,8 @@ func dataSourceScalewayInstanceSnapshot() *schema.Resource { } } -func dataSourceScalewayInstanceSnapshotRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func dataSourceScalewayInstanceSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -69,7 +69,7 @@ func dataSourceScalewayInstanceSnapshotRead(ctx context.Context, d *schema.Resou if err != nil { return diag.FromErr(err) } - diags := resourceScalewayInstanceSnapshotRead(ctx, d, meta) + diags := resourceScalewayInstanceSnapshotRead(ctx, d, m) if len(diags) > 0 { return diags } diff --git a/scaleway/data_source_instance_volume.go b/scaleway/data_source_instance_volume.go index 4cffc0974..926282e58 100644 --- a/scaleway/data_source_instance_volume.go +++ b/scaleway/data_source_instance_volume.go @@ -31,8 +31,8 @@ func dataSourceScalewayInstanceVolume() *schema.Resource { } } -func dataSourceScalewayInstanceVolumeRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func dataSourceScalewayInstanceVolumeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -67,5 +67,5 @@ func dataSourceScalewayInstanceVolumeRead(ctx context.Context, d *schema.Resourc if err != nil { return diag.FromErr(err) } - return resourceScalewayInstanceVolumeRead(ctx, d, meta) + return resourceScalewayInstanceVolumeRead(ctx, d, m) } diff --git a/scaleway/data_source_iot_device.go b/scaleway/data_source_iot_device.go index 6aa1ff8d9..e3acf9f5d 100644 --- a/scaleway/data_source_iot_device.go +++ b/scaleway/data_source_iot_device.go @@ -30,8 +30,8 @@ func dataSourceScalewayIotDevice() *schema.Resource { } } -func dataSourceScalewayIotDeviceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := iotAPIWithRegion(d, meta) +func dataSourceScalewayIotDeviceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := iotAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -73,7 +73,7 @@ func dataSourceScalewayIotDeviceRead(ctx context.Context, d *schema.ResourceData if err != nil { return diag.FromErr(err) } - diags := resourceScalewayIotDeviceRead(ctx, d, meta) + diags := resourceScalewayIotDeviceRead(ctx, d, m) if diags != nil { return diags } diff --git a/scaleway/data_source_iot_hub.go b/scaleway/data_source_iot_hub.go index ec2533cbf..86dfefccc 100644 --- a/scaleway/data_source_iot_hub.go +++ b/scaleway/data_source_iot_hub.go @@ -29,8 +29,8 @@ func dataSourceScalewayIotHub() *schema.Resource { } } -func dataSourceScalewayIotHubRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := iotAPIWithRegion(d, meta) +func dataSourceScalewayIotHubRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := iotAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -65,7 +65,7 @@ func dataSourceScalewayIotHubRead(ctx context.Context, d *schema.ResourceData, m if err != nil { return diag.FromErr(err) } - diags := resourceScalewayIotHubRead(ctx, d, meta) + diags := resourceScalewayIotHubRead(ctx, d, m) if diags != nil { return diags } diff --git a/scaleway/data_source_ipam_ip.go b/scaleway/data_source_ipam_ip.go index 82732996c..b46f911e3 100644 --- a/scaleway/data_source_ipam_ip.go +++ b/scaleway/data_source_ipam_ip.go @@ -119,8 +119,8 @@ func dataSourceScalewayIPAMIP() *schema.Resource { } } -func dataSourceScalewayIPAMIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := ipamAPIWithRegion(d, meta) +func dataSourceScalewayIPAMIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := ipamAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_ipam_ips.go b/scaleway/data_source_ipam_ips.go index c2c4bb83d..20323f9d9 100644 --- a/scaleway/data_source_ipam_ips.go +++ b/scaleway/data_source_ipam_ips.go @@ -136,8 +136,8 @@ func dataSourceScalewayIPAMIPs() *schema.Resource { } } -func dataSourceScalewayIPAMIPsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := ipamAPIWithRegion(d, meta) +func dataSourceScalewayIPAMIPsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := ipamAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_k8s_cluster.go b/scaleway/data_source_k8s_cluster.go index 6dd011af4..fda03fc31 100644 --- a/scaleway/data_source_k8s_cluster.go +++ b/scaleway/data_source_k8s_cluster.go @@ -33,8 +33,8 @@ func dataSourceScalewayK8SCluster() *schema.Resource { } } -func dataSourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - k8sAPI, region, err := k8sAPIWithRegion(d, meta) +func dataSourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + k8sAPI, region, err := k8sAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -66,5 +66,5 @@ func dataSourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceDat regionalizedID := datasourceNewRegionalID(clusterID, region) d.SetId(regionalizedID) _ = d.Set("cluster_id", regionalizedID) - return resourceScalewayK8SClusterRead(ctx, d, meta) + return resourceScalewayK8SClusterRead(ctx, d, m) } diff --git a/scaleway/data_source_k8s_pool.go b/scaleway/data_source_k8s_pool.go index 68f869258..636194cdc 100644 --- a/scaleway/data_source_k8s_pool.go +++ b/scaleway/data_source_k8s_pool.go @@ -35,8 +35,8 @@ func dataSourceScalewayK8SPool() *schema.Resource { } } -func dataSourceScalewayK8SPoolRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - k8sAPI, region, err := k8sAPIWithRegion(d, meta) +func dataSourceScalewayK8SPoolRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + k8sAPI, region, err := k8sAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -69,5 +69,5 @@ func dataSourceScalewayK8SPoolRead(ctx context.Context, d *schema.ResourceData, regionalizedID := datasourceNewRegionalID(poolID, region) d.SetId(regionalizedID) _ = d.Set("pool_id", regionalizedID) - return resourceScalewayK8SPoolRead(ctx, d, meta) + return resourceScalewayK8SPoolRead(ctx, d, m) } diff --git a/scaleway/data_source_k8s_version.go b/scaleway/data_source_k8s_version.go index 0911f3b17..49747ea30 100644 --- a/scaleway/data_source_k8s_version.go +++ b/scaleway/data_source_k8s_version.go @@ -50,8 +50,8 @@ func dataSourceScalewayK8SVersion() *schema.Resource { } } -func dataSourceScalewayK8SVersionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - k8sAPI, region, err := k8sAPIWithRegion(d, meta) +func dataSourceScalewayK8SVersionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + k8sAPI, region, err := k8sAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_k8s_version_test.go b/scaleway/data_source_k8s_version_test.go index 4f7f474c4..f99c781a7 100644 --- a/scaleway/data_source_k8s_version_test.go +++ b/scaleway/data_source_k8s_version_test.go @@ -84,7 +84,7 @@ func testAccCheckScalewayK8SVersionExists(tt *TestTools, n string) resource.Test return err } - k8sAPI := k8s.NewAPI(tt.Meta.scwClient) + k8sAPI := k8s.NewAPI(tt.Meta.ScwClient()) _, err = k8sAPI.GetVersion(&k8s.GetVersionRequest{ Region: region, VersionName: name, diff --git a/scaleway/data_source_lb.go b/scaleway/data_source_lb.go index f0d4f9f2a..75805002a 100644 --- a/scaleway/data_source_lb.go +++ b/scaleway/data_source_lb.go @@ -37,8 +37,8 @@ func dataSourceScalewayLb() *schema.Resource { } } -func dataSourceScalewayLbRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := lbAPIWithZone(d, meta) +func dataSourceScalewayLbRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -77,5 +77,5 @@ func dataSourceScalewayLbRead(ctx context.Context, d *schema.ResourceData, meta if err != nil { return diag.FromErr(err) } - return resourceScalewayLbRead(ctx, d, meta) + return resourceScalewayLbRead(ctx, d, m) } diff --git a/scaleway/data_source_lb_acls.go b/scaleway/data_source_lb_acls.go index 2b6c5eda8..dd95f10b4 100644 --- a/scaleway/data_source_lb_acls.go +++ b/scaleway/data_source_lb_acls.go @@ -133,8 +133,8 @@ func dataSourceScalewayLbACLs() *schema.Resource { } } -func dataSourceScalewayLbACLsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, err := lbAPIWithZone(d, meta) +func dataSourceScalewayLbACLsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_lb_backend.go b/scaleway/data_source_lb_backend.go index d34cab3c4..38af3ac3f 100644 --- a/scaleway/data_source_lb_backend.go +++ b/scaleway/data_source_lb_backend.go @@ -32,8 +32,8 @@ func dataSourceScalewayLbBackend() *schema.Resource { } } -func dataSourceScalewayLbBackendRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := lbAPIWithZone(d, meta) +func dataSourceScalewayLbBackendRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -67,5 +67,5 @@ func dataSourceScalewayLbBackendRead(ctx context.Context, d *schema.ResourceData if err != nil { return diag.FromErr(err) } - return resourceScalewayLbBackendRead(ctx, d, meta) + return resourceScalewayLbBackendRead(ctx, d, m) } diff --git a/scaleway/data_source_lb_backends.go b/scaleway/data_source_lb_backends.go index 04e6ed78a..1503a9b60 100644 --- a/scaleway/data_source_lb_backends.go +++ b/scaleway/data_source_lb_backends.go @@ -193,8 +193,8 @@ func dataSourceScalewayLbBackends() *schema.Resource { } } -func dataSourceScalewayLbBackendsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, err := lbAPIWithZone(d, meta) +func dataSourceScalewayLbBackendsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_lb_certificate.go b/scaleway/data_source_lb_certificate.go index 68e4eb373..c5afff11d 100644 --- a/scaleway/data_source_lb_certificate.go +++ b/scaleway/data_source_lb_certificate.go @@ -32,8 +32,8 @@ func dataSourceScalewayLbCertificate() *schema.Resource { } } -func dataSourceScalewayLbCertificateRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := lbAPIWithZone(d, meta) +func dataSourceScalewayLbCertificateRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -67,5 +67,5 @@ func dataSourceScalewayLbCertificateRead(ctx context.Context, d *schema.Resource if err != nil { return diag.FromErr(err) } - return resourceScalewayLbCertificateRead(ctx, d, meta) + return resourceScalewayLbCertificateRead(ctx, d, m) } diff --git a/scaleway/data_source_lb_frontend.go b/scaleway/data_source_lb_frontend.go index cdcfed011..ca941ba2c 100644 --- a/scaleway/data_source_lb_frontend.go +++ b/scaleway/data_source_lb_frontend.go @@ -32,8 +32,8 @@ func dataSourceScalewayLbFrontend() *schema.Resource { } } -func dataSourceScalewayLbFrontendRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := lbAPIWithZone(d, meta) +func dataSourceScalewayLbFrontendRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -67,5 +67,5 @@ func dataSourceScalewayLbFrontendRead(ctx context.Context, d *schema.ResourceDat if err != nil { return diag.FromErr(err) } - return resourceScalewayLbFrontendRead(ctx, d, meta) + return resourceScalewayLbFrontendRead(ctx, d, m) } diff --git a/scaleway/data_source_lb_frontends.go b/scaleway/data_source_lb_frontends.go index 13a3e17ca..7dc826f4c 100644 --- a/scaleway/data_source_lb_frontends.go +++ b/scaleway/data_source_lb_frontends.go @@ -82,8 +82,8 @@ func dataSourceScalewayLbFrontends() *schema.Resource { } } -func dataSourceScalewayLbFrontendsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, err := lbAPIWithZone(d, meta) +func dataSourceScalewayLbFrontendsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_lb_ip.go b/scaleway/data_source_lb_ip.go index b52f66a0a..825cc7f83 100644 --- a/scaleway/data_source_lb_ip.go +++ b/scaleway/data_source_lb_ip.go @@ -39,8 +39,8 @@ func dataSourceScalewayLbIP() *schema.Resource { } } -func dataSourceScalewayLbIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := lbAPIWithZone(d, meta) +func dataSourceScalewayLbIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -70,5 +70,5 @@ func dataSourceScalewayLbIPRead(ctx context.Context, d *schema.ResourceData, met if err != nil { return diag.FromErr(err) } - return resourceScalewayLbIPRead(ctx, d, meta) + return resourceScalewayLbIPRead(ctx, d, m) } diff --git a/scaleway/data_source_lb_ips.go b/scaleway/data_source_lb_ips.go index 7ea63fcc9..571c5f734 100644 --- a/scaleway/data_source_lb_ips.go +++ b/scaleway/data_source_lb_ips.go @@ -55,8 +55,8 @@ func dataSourceScalewayLbIPs() *schema.Resource { } } -func dataSourceScalewayLbIPsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, err := lbAPIWithZone(d, meta) +func dataSourceScalewayLbIPsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_lb_route.go b/scaleway/data_source_lb_route.go index bdc3dca07..707e7ce63 100644 --- a/scaleway/data_source_lb_route.go +++ b/scaleway/data_source_lb_route.go @@ -24,8 +24,8 @@ func dataSourceScalewayLbRoute() *schema.Resource { } } -func dataSourceScalewayLbRouteRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - _, zone, err := lbAPIWithZone(d, meta) +func dataSourceScalewayLbRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + _, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -38,5 +38,5 @@ func dataSourceScalewayLbRouteRead(ctx context.Context, d *schema.ResourceData, if err != nil { return diag.FromErr(err) } - return resourceScalewayLbRouteRead(ctx, d, meta) + return resourceScalewayLbRouteRead(ctx, d, m) } diff --git a/scaleway/data_source_lb_routes.go b/scaleway/data_source_lb_routes.go index 9a6d3356c..0623a1ebc 100644 --- a/scaleway/data_source_lb_routes.go +++ b/scaleway/data_source_lb_routes.go @@ -62,8 +62,8 @@ func dataSourceScalewayLbRoutes() *schema.Resource { } } -func dataSourceScalewayLbRoutesRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, err := lbAPIWithZone(d, meta) +func dataSourceScalewayLbRoutesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_lbs.go b/scaleway/data_source_lbs.go index 2a9ca1dc9..831842b18 100644 --- a/scaleway/data_source_lbs.go +++ b/scaleway/data_source_lbs.go @@ -152,8 +152,8 @@ func dataSourceScalewayLbs() *schema.Resource { } } -func dataSourceScalewayLbsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, err := lbAPIWithZone(d, meta) +func dataSourceScalewayLbsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_marketplace_image.go b/scaleway/data_source_marketplace_image.go index 5fd93504e..0380868cf 100644 --- a/scaleway/data_source_marketplace_image.go +++ b/scaleway/data_source_marketplace_image.go @@ -30,8 +30,8 @@ func dataSourceScalewayMarketplaceImage() *schema.Resource { } } -func dataSourceScalewayMarketplaceImageRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - marketplaceAPI, zone, err := marketplaceAPIWithZone(d, meta) +func dataSourceScalewayMarketplaceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + marketplaceAPI, zone, err := marketplaceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_mnq_sqs.go b/scaleway/data_source_mnq_sqs.go index 849441de0..6e8ef6efb 100644 --- a/scaleway/data_source_mnq_sqs.go +++ b/scaleway/data_source_mnq_sqs.go @@ -21,8 +21,8 @@ func dataSourceScalewayMNQSQS() *schema.Resource { } } -func dataSourceScalewayMNQSQSRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := newMNQSQSAPI(d, meta) +func dataSourceScalewayMNQSQSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := newMNQSQSAPI(d, m) if err != nil { return diag.FromErr(err) } @@ -42,7 +42,7 @@ func dataSourceScalewayMNQSQSRead(ctx context.Context, d *schema.ResourceData, m regionID := datasourceNewRegionalID(sqs.ProjectID, region) d.SetId(regionID) - diags := resourceScalewayMNQSQSRead(ctx, d, meta) + diags := resourceScalewayMNQSQSRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read sqs state")...) } diff --git a/scaleway/data_source_object_bucket.go b/scaleway/data_source_object_bucket.go index 2a2cdec78..236c97e6f 100644 --- a/scaleway/data_source_object_bucket.go +++ b/scaleway/data_source_object_bucket.go @@ -25,8 +25,8 @@ func dataSourceScalewayObjectBucket() *schema.Resource { } } -func dataSourceScalewayObjectStorageRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - s3Client, region, err := s3ClientWithRegion(d, meta) +func dataSourceScalewayObjectStorageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + s3Client, region, err := s3ClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -36,7 +36,7 @@ func dataSourceScalewayObjectStorageRead(ctx context.Context, d *schema.Resource bucketRegion := regionalID.Region if bucketRegion != "" && bucketRegion != region { - s3Client, err = s3ClientForceRegion(d, meta, bucketRegion.String()) + s3Client, err = s3ClientForceRegion(d, m, bucketRegion.String()) if err != nil { return diag.FromErr(err) } @@ -63,5 +63,5 @@ func dataSourceScalewayObjectStorageRead(ctx context.Context, d *schema.Resource bucketRegionalID := regional.NewIDString(region, bucket) d.SetId(bucketRegionalID) - return resourceScalewayObjectBucketRead(ctx, d, meta) + return resourceScalewayObjectBucketRead(ctx, d, m) } diff --git a/scaleway/data_source_object_bucket_policy.go b/scaleway/data_source_object_bucket_policy.go index fbba00bc7..362d0a5eb 100644 --- a/scaleway/data_source_object_bucket_policy.go +++ b/scaleway/data_source_object_bucket_policy.go @@ -27,8 +27,8 @@ func dataSourceScalewayObjectBucketPolicy() *schema.Resource { } } -func dataSourceScalewayObjectBucketPolicyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - s3Client, region, err := s3ClientWithRegion(d, meta) +func dataSourceScalewayObjectBucketPolicyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + s3Client, region, err := s3ClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -39,7 +39,7 @@ func dataSourceScalewayObjectBucketPolicyRead(ctx context.Context, d *schema.Res tflog.Debug(ctx, "bucket name: "+bucket) if bucketRegion != "" && bucketRegion != region { - s3Client, err = s3ClientForceRegion(d, meta, bucketRegion.String()) + s3Client, err = s3ClientForceRegion(d, m, bucketRegion.String()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_object_bucket_test.go b/scaleway/data_source_object_bucket_test.go index b2f84677e..44a5cd9a5 100644 --- a/scaleway/data_source_object_bucket_test.go +++ b/scaleway/data_source_object_bucket_test.go @@ -16,7 +16,7 @@ func TestAccScalewayDataSourceObjectBucket_Basic(t *testing.T) { tt := NewTestTools(t) defer tt.Cleanup() bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket") - objectBucketTestDefaultRegion, _ := tt.Meta.scwClient.GetDefaultRegion() + objectBucketTestDefaultRegion, _ := tt.Meta.ScwClient().GetDefaultRegion() resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/scaleway/data_source_rdb_acl.go b/scaleway/data_source_rdb_acl.go index edf1642b9..35b4b2a9c 100644 --- a/scaleway/data_source_rdb_acl.go +++ b/scaleway/data_source_rdb_acl.go @@ -23,8 +23,8 @@ func dataSourceScalewayRDBACL() *schema.Resource { } } -func dataSourceScalewayRDBACLRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - _, region, err := rdbAPIWithRegion(d, meta) +func dataSourceScalewayRDBACLRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + _, region, err := rdbAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -41,5 +41,5 @@ func dataSourceScalewayRDBACLRead(ctx context.Context, d *schema.ResourceData, m if err != nil { return diag.FromErr(err) } - return resourceScalewayRdbACLRead(ctx, d, meta) + return resourceScalewayRdbACLRead(ctx, d, m) } diff --git a/scaleway/data_source_rdb_database.go b/scaleway/data_source_rdb_database.go index d175ca435..e26e3bd22 100644 --- a/scaleway/data_source_rdb_database.go +++ b/scaleway/data_source_rdb_database.go @@ -23,8 +23,8 @@ func dataSourceScalewayRDBDatabase() *schema.Resource { } } -func dataSourceScalewayRDBDatabaseRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - _, region, err := rdbAPIWithRegion(d, meta) +func dataSourceScalewayRDBDatabaseRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + _, region, err := rdbAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -41,5 +41,5 @@ func dataSourceScalewayRDBDatabaseRead(ctx context.Context, d *schema.ResourceDa if err != nil { return diag.FromErr(err) } - return resourceScalewayRdbDatabaseRead(ctx, d, meta) + return resourceScalewayRdbDatabaseRead(ctx, d, m) } diff --git a/scaleway/data_source_rdb_database_backup.go b/scaleway/data_source_rdb_database_backup.go index 6cfaa6acc..db1ef011d 100644 --- a/scaleway/data_source_rdb_database_backup.go +++ b/scaleway/data_source_rdb_database_backup.go @@ -36,8 +36,8 @@ func dataSourceScalewayRDBDatabaseBackup() *schema.Resource { } } -func dataSourceScalewayRDBDatabaseBackupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := rdbAPIWithRegion(d, meta) +func dataSourceScalewayRDBDatabaseBackupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := rdbAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -74,7 +74,7 @@ func dataSourceScalewayRDBDatabaseBackupRead(ctx context.Context, d *schema.Reso return diag.FromErr(err) } - diags := resourceScalewayRdbDatabaseBackupRead(ctx, d, meta) + diags := resourceScalewayRdbDatabaseBackupRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read database backup state")...) } diff --git a/scaleway/data_source_rdb_instance.go b/scaleway/data_source_rdb_instance.go index 09438d85d..f2c9315f8 100644 --- a/scaleway/data_source_rdb_instance.go +++ b/scaleway/data_source_rdb_instance.go @@ -30,8 +30,8 @@ func dataSourceScalewayRDBInstance() *schema.Resource { } } -func dataSourceScalewayRDBInstanceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := rdbAPIWithRegion(d, meta) +func dataSourceScalewayRDBInstanceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := rdbAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -66,5 +66,5 @@ func dataSourceScalewayRDBInstanceRead(ctx context.Context, d *schema.ResourceDa if err != nil { return diag.FromErr(err) } - return resourceScalewayRdbInstanceRead(ctx, d, meta) + return resourceScalewayRdbInstanceRead(ctx, d, m) } diff --git a/scaleway/data_source_rdb_privilege.go b/scaleway/data_source_rdb_privilege.go index 115e3c930..f8b11e97d 100644 --- a/scaleway/data_source_rdb_privilege.go +++ b/scaleway/data_source_rdb_privilege.go @@ -23,8 +23,8 @@ func dataSourceScalewayRDBPrivilege() *schema.Resource { } // dataSourceScalewayRDBPrivilegeRead -func dataSourceScalewayRDBPrivilegeRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - _, region, err := rdbAPIWithRegion(d, meta) +func dataSourceScalewayRDBPrivilegeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + _, region, err := rdbAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -34,5 +34,5 @@ func dataSourceScalewayRDBPrivilegeRead(ctx context.Context, d *schema.ResourceD databaseName, _ := d.Get("database_name").(string) d.SetId(resourceScalewayRdbUserPrivilegeID(region, instanceID, databaseName, userName)) - return resourceScalewayRdbPrivilegeRead(ctx, d, meta) + return resourceScalewayRdbPrivilegeRead(ctx, d, m) } diff --git a/scaleway/data_source_redis_cluster.go b/scaleway/data_source_redis_cluster.go index 3901d2420..e7b20712d 100644 --- a/scaleway/data_source_redis_cluster.go +++ b/scaleway/data_source_redis_cluster.go @@ -32,8 +32,8 @@ func dataSourceScalewayRedisCluster() *schema.Resource { } } -func dataSourceScalewayRedisClusterRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := redisAPIWithZone(d, meta) +func dataSourceScalewayRedisClusterRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := redisAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -80,5 +80,5 @@ func dataSourceScalewayRedisClusterRead(ctx context.Context, d *schema.ResourceD return diag.FromErr(fmt.Errorf("no clusters found with the id %s", clusterID)) } - return resourceScalewayRedisClusterRead(ctx, d, meta) + return resourceScalewayRedisClusterRead(ctx, d, m) } diff --git a/scaleway/data_source_registry_image.go b/scaleway/data_source_registry_image.go index 2bc8330a3..9b47f44d0 100644 --- a/scaleway/data_source_registry_image.go +++ b/scaleway/data_source_registry_image.go @@ -62,8 +62,8 @@ func dataSourceScalewayRegistryImage() *schema.Resource { } } -func dataSourceScalewayRegistryImageRead(d *schema.ResourceData, meta interface{}) error { - api, region, err := registryAPIWithRegion(d, meta) +func dataSourceScalewayRegistryImageRead(d *schema.ResourceData, m interface{}) error { + api, region, err := registryAPIWithRegion(d, m) if err != nil { return err } diff --git a/scaleway/data_source_registry_namespace.go b/scaleway/data_source_registry_namespace.go index de8abd623..22ff64388 100644 --- a/scaleway/data_source_registry_namespace.go +++ b/scaleway/data_source_registry_namespace.go @@ -31,8 +31,8 @@ func dataSourceScalewayRegistryNamespace() *schema.Resource { } } -func dataSourceScalewayRegistryNamespaceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := registryAPIWithRegion(d, meta) +func dataSourceScalewayRegistryNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := registryAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -65,5 +65,5 @@ func dataSourceScalewayRegistryNamespaceRead(ctx context.Context, d *schema.Reso d.SetId(regionalID) _ = d.Set("namespace_id", regionalID) - return resourceScalewayRegistryNamespaceRead(ctx, d, meta) + return resourceScalewayRegistryNamespaceRead(ctx, d, m) } diff --git a/scaleway/data_source_secret.go b/scaleway/data_source_secret.go index 80b320e38..1b8d33e91 100644 --- a/scaleway/data_source_secret.go +++ b/scaleway/data_source_secret.go @@ -39,8 +39,8 @@ func dataSourceScalewaySecret() *schema.Resource { } } -func dataSourceScalewaySecretRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, projectID, err := secretAPIWithRegionAndProjectID(d, meta) +func dataSourceScalewaySecretRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, projectID, err := secretAPIWithRegionAndProjectID(d, m) if err != nil { return diag.FromErr(err) } @@ -80,7 +80,7 @@ func dataSourceScalewaySecretRead(ctx context.Context, d *schema.ResourceData, m return diag.FromErr(err) } - diags := resourceScalewaySecretRead(ctx, d, meta) + diags := resourceScalewaySecretRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read secret")...) } diff --git a/scaleway/data_source_secret_version.go b/scaleway/data_source_secret_version.go index aa7cdfb61..ad1bdc35f 100644 --- a/scaleway/data_source_secret_version.go +++ b/scaleway/data_source_secret_version.go @@ -51,9 +51,9 @@ func dataSourceScalewaySecretVersion() *schema.Resource { } } -func datasourceSchemaFromResourceVersionSchema(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func datasourceSchemaFromResourceVersionSchema(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { secretID, existSecretID := d.GetOk("secret_id") - api, region, err := secretAPIWithRegionAndDefault(d, meta, regional.ExpandID(secretID).Region) + api, region, err := secretAPIWithRegionAndDefault(d, m, regional.ExpandID(secretID).Region) if err != nil { return diag.FromErr(err) } @@ -115,7 +115,7 @@ func datasourceSchemaFromResourceVersionSchema(ctx context.Context, d *schema.Re return diag.FromErr(err) } - diags := resourceScalewaySecretVersionRead(ctx, d, meta) + diags := resourceScalewaySecretVersionRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read secret version")...) } diff --git a/scaleway/data_source_tem_domain.go b/scaleway/data_source_tem_domain.go index b64e8e13c..ada138a38 100644 --- a/scaleway/data_source_tem_domain.go +++ b/scaleway/data_source_tem_domain.go @@ -33,8 +33,8 @@ func dataSourceScalewayTemDomain() *schema.Resource { } } -func dataSourceScalewayTemDomainRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := temAPIWithRegion(d, meta) +func dataSourceScalewayTemDomainRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := temAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -76,7 +76,7 @@ func dataSourceScalewayTemDomainRead(ctx context.Context, d *schema.ResourceData return diag.FromErr(err) } - diags := resourceScalewayTemDomainRead(ctx, d, meta) + diags := resourceScalewayTemDomainRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read tem domain state")...) } diff --git a/scaleway/data_source_vpc.go b/scaleway/data_source_vpc.go index bb477d65f..4dced0217 100644 --- a/scaleway/data_source_vpc.go +++ b/scaleway/data_source_vpc.go @@ -37,8 +37,8 @@ func dataSourceScalewayVPC() *schema.Resource { } } -func dataSourceScalewayVPCRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcAPI, region, err := vpcAPIWithRegion(d, meta) +func dataSourceScalewayVPCRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcAPI, region, err := vpcAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -95,7 +95,7 @@ func dataSourceScalewayVPCRead(ctx context.Context, d *schema.ResourceData, meta return diag.FromErr(err) } - diags := resourceScalewayVPCRead(ctx, d, meta) + diags := resourceScalewayVPCRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read VPC")...) } diff --git a/scaleway/data_source_vpc_gateway_network.go b/scaleway/data_source_vpc_gateway_network.go index 3d0b5eecd..090264ae7 100644 --- a/scaleway/data_source_vpc_gateway_network.go +++ b/scaleway/data_source_vpc_gateway_network.go @@ -39,8 +39,8 @@ func dataSourceScalewayVPCGatewayNetwork() *schema.Resource { } } -func dataSourceScalewayVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcAPI, zone, err := vpcgwAPIWithZone(d, meta) +func dataSourceScalewayVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcAPI, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -71,7 +71,7 @@ func dataSourceScalewayVPCGatewayNetworkRead(ctx context.Context, d *schema.Reso _ = d.Set("gateway_network_id", zonedID) - diags := resourceScalewayVPCGatewayNetworkRead(ctx, d, meta) + diags := resourceScalewayVPCGatewayNetworkRead(ctx, d, m) if len(diags) > 0 { return append(diags, diag.Errorf("failed to read gateway network state")...) } diff --git a/scaleway/data_source_vpc_private_network.go b/scaleway/data_source_vpc_private_network.go index 0897d1138..2b50521c5 100644 --- a/scaleway/data_source_vpc_private_network.go +++ b/scaleway/data_source_vpc_private_network.go @@ -39,8 +39,8 @@ func dataSourceScalewayVPCPrivateNetwork() *schema.Resource { } } -func dataSourceScalewayVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcAPI, region, err := vpcAPIWithRegion(d, meta) +func dataSourceScalewayVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcAPI, region, err := vpcAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -74,7 +74,7 @@ func dataSourceScalewayVPCPrivateNetworkRead(ctx context.Context, d *schema.Reso regionalID := datasourceNewRegionalID(privateNetworkID, region) d.SetId(regionalID) _ = d.Set("private_network_id", regionalID) - diags := resourceScalewayVPCPrivateNetworkRead(ctx, d, meta) + diags := resourceScalewayVPCPrivateNetworkRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read private network state")...) } diff --git a/scaleway/data_source_vpc_public_gateway.go b/scaleway/data_source_vpc_public_gateway.go index f334991e0..38db4c35d 100644 --- a/scaleway/data_source_vpc_public_gateway.go +++ b/scaleway/data_source_vpc_public_gateway.go @@ -31,8 +31,8 @@ func dataSourceScalewayVPCPublicGateway() *schema.Resource { } } -func dataSourceScalewayVPCPublicGatewayRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, err := vpcgwAPIWithZone(d, meta) +func dataSourceScalewayVPCPublicGatewayRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -69,5 +69,5 @@ func dataSourceScalewayVPCPublicGatewayRead(ctx context.Context, d *schema.Resou zonedID := datasourceNewZonedID(publicGatewayID, zone) d.SetId(zonedID) _ = d.Set("public_gateway_id", zonedID) - return resourceScalewayVPCPublicGatewayRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayRead(ctx, d, m) } diff --git a/scaleway/data_source_vpc_public_gateway_dhcp.go b/scaleway/data_source_vpc_public_gateway_dhcp.go index 4fb14c2e9..40afb624b 100644 --- a/scaleway/data_source_vpc_public_gateway_dhcp.go +++ b/scaleway/data_source_vpc_public_gateway_dhcp.go @@ -24,8 +24,8 @@ func dataSourceScalewayVPCPublicGatewayDHCP() *schema.Resource { } } -func dataSourceScalewayVPCPublicGatewayDHCPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - _, zone, err := vpcgwAPIWithZone(d, meta) +func dataSourceScalewayVPCPublicGatewayDHCPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + _, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -35,5 +35,5 @@ func dataSourceScalewayVPCPublicGatewayDHCPRead(ctx context.Context, d *schema.R zonedID := datasourceNewZonedID(dhcpID, zone) d.SetId(zonedID) _ = d.Set("dhcp_id", zonedID) - return resourceScalewayVPCPublicGatewayDHCPRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayDHCPRead(ctx, d, m) } diff --git a/scaleway/data_source_vpc_public_gateway_dhcp_reservation.go b/scaleway/data_source_vpc_public_gateway_dhcp_reservation.go index 599ee33b7..d71bfc542 100644 --- a/scaleway/data_source_vpc_public_gateway_dhcp_reservation.go +++ b/scaleway/data_source_vpc_public_gateway_dhcp_reservation.go @@ -43,8 +43,8 @@ func dataSourceScalewayVPCPublicGatewayDHCPReservation() *schema.Resource { } } -func dataSourceScalewayVPCPublicGatewayDHCPReservationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, err := vpcgwAPIWithZone(d, meta) +func dataSourceScalewayVPCPublicGatewayDHCPReservationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -92,7 +92,7 @@ func dataSourceScalewayVPCPublicGatewayDHCPReservationRead(ctx context.Context, d.SetId(zonedID) _ = d.Set("reservation_id", zonedID) - diags := resourceScalewayVPCPublicGatewayDHCPReservationRead(ctx, d, meta) + diags := resourceScalewayVPCPublicGatewayDHCPReservationRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read DHCP Entries")...) } diff --git a/scaleway/data_source_vpc_public_gateway_ip.go b/scaleway/data_source_vpc_public_gateway_ip.go index 2906e1f37..b5e2f274a 100644 --- a/scaleway/data_source_vpc_public_gateway_ip.go +++ b/scaleway/data_source_vpc_public_gateway_ip.go @@ -24,8 +24,8 @@ func dataSourceScalewayVPCPublicGatewayIP() *schema.Resource { } } -func dataSourceScalewayVPCPublicGatewayIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - _, zone, err := vpcgwAPIWithZone(d, meta) +func dataSourceScalewayVPCPublicGatewayIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + _, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -35,5 +35,5 @@ func dataSourceScalewayVPCPublicGatewayIPRead(ctx context.Context, d *schema.Res zonedID := datasourceNewZonedID(ipID, zone) d.SetId(zonedID) _ = d.Set("ip_id", zonedID) - return resourceScalewayVPCPublicGatewayIPRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayIPRead(ctx, d, m) } diff --git a/scaleway/data_source_vpc_public_gateway_pat_rule.go b/scaleway/data_source_vpc_public_gateway_pat_rule.go index 177d9e180..c85a15b2e 100644 --- a/scaleway/data_source_vpc_public_gateway_pat_rule.go +++ b/scaleway/data_source_vpc_public_gateway_pat_rule.go @@ -30,8 +30,8 @@ func dataSourceScalewayVPCPublicGatewayPATRule() *schema.Resource { } } -func dataSourceScalewayVPCPublicGatewayPATRuleRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, err := vpcgwAPIWithZone(d, meta) +func dataSourceScalewayVPCPublicGatewayPATRuleRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -51,5 +51,5 @@ func dataSourceScalewayVPCPublicGatewayPATRuleRead(ctx context.Context, d *schem return diag.FromErr(err) } - return resourceScalewayVPCPublicGatewayPATRuleRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayPATRuleRead(ctx, d, m) } diff --git a/scaleway/data_source_vpcs.go b/scaleway/data_source_vpcs.go index 2c83c2c93..f9a2c758e 100644 --- a/scaleway/data_source_vpcs.go +++ b/scaleway/data_source_vpcs.go @@ -72,8 +72,8 @@ func dataSourceScalewayVPCs() *schema.Resource { } } -func dataSourceScalewayVPCsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcAPI, region, err := vpcAPIWithRegion(d, meta) +func dataSourceScalewayVPCsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcAPI, region, err := vpcAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/data_source_webhosting.go b/scaleway/data_source_webhosting.go index 6bfd7fcba..07d2d6331 100644 --- a/scaleway/data_source_webhosting.go +++ b/scaleway/data_source_webhosting.go @@ -36,8 +36,8 @@ func dataSourceScalewayWebhosting() *schema.Resource { } } -func dataSourceScalewayWebhostingRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := webhostingAPIWithRegion(d, meta) +func dataSourceScalewayWebhostingRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := webhostingAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -74,7 +74,7 @@ func dataSourceScalewayWebhostingRead(ctx context.Context, d *schema.ResourceDat return diag.FromErr(err) } - diags := resourceScalewayWebhostingRead(ctx, d, meta) + diags := resourceScalewayWebhostingRead(ctx, d, m) if diags != nil { return append(diags, diag.Errorf("failed to read hosting")...) } diff --git a/scaleway/data_source_webhosting_offer.go b/scaleway/data_source_webhosting_offer.go index 5aff365a0..42bad2aaf 100644 --- a/scaleway/data_source_webhosting_offer.go +++ b/scaleway/data_source_webhosting_offer.go @@ -84,8 +84,8 @@ func dataSourceScalewayWebhostingOffer() *schema.Resource { } } -func dataSourceScalewayWebhostingOfferRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - webhostingAPI, region, err := webhostingAPIWithRegion(d, meta) +func dataSourceScalewayWebhostingOfferRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + webhostingAPI, region, err := webhostingAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/helpers.go b/scaleway/helpers.go index 81c76c6a3..4e6523486 100644 --- a/scaleway/helpers.go +++ b/scaleway/helpers.go @@ -23,8 +23,8 @@ import ( "github.com/scaleway/scaleway-sdk-go/namegenerator" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" - "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) // Service information constants @@ -33,90 +33,6 @@ const ( EndpointsID = ServiceName // ID to look up a service endpoint with. ) -// terraformResourceData is an interface for *schema.ResourceData. (used for mock) -type terraformResourceData interface { - HasChange(string) bool - GetOk(string) (interface{}, bool) - Get(string) interface{} - 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, meta *Meta) (scw.Zone, error) { - rawZone, exist := d.GetOk("zone") - if exist { - return scw.ParseZone(rawZone.(string)) - } - - zone, exist := meta.scwClient.GetDefaultZone() - if exist { - return zone, nil - } - - return "", zonal.ErrZoneNotFound -} - -// extractRegion will try to guess the region from the following: -// - region field of the resource data -// - default region from config -func extractRegion(d terraformResourceData, meta *Meta) (scw.Region, error) { - rawRegion, exist := d.GetOk("region") - if exist { - return scw.ParseRegion(rawRegion.(string)) - } - - region, exist := meta.scwClient.GetDefaultRegion() - if exist { - return region, nil - } - - return "", regional.ErrRegionNotFound -} - -// extractRegion will try to guess the region from the following: -// - region field of the resource data -// - default region given in argument -// - default region from config -func extractRegionWithDefault(d terraformResourceData, meta *Meta, defaultRegion scw.Region) (scw.Region, error) { - rawRegion, exist := d.GetOk("region") - if exist { - return scw.ParseRegion(rawRegion.(string)) - } - - if defaultRegion != "" { - return defaultRegion, nil - } - - region, exist := meta.scwClient.GetDefaultRegion() - if exist { - return region, nil - } - - return "", regional.ErrRegionNotFound -} - -// ErrProjectIDNotFound is returned when no region can be detected -var ErrProjectIDNotFound = errors.New("could not detect project id") - -// 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, meta *Meta) (projectID string, isDefault bool, err error) { - rawProjectID, exist := d.GetOk("project_id") - if exist { - return rawProjectID.(string), false, nil - } - - defaultProjectID, exist := meta.scwClient.GetDefaultProjectID() - if exist { - return defaultProjectID, true, nil - } - - return "", false, ErrProjectIDNotFound -} - // isHTTPCodeError returns true if err is an http error with code statusCode func isHTTPCodeError(err error, statusCode int) bool { if err == nil { @@ -725,19 +641,19 @@ 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, meta *Meta) string { - var locality string +func getLocality(diff *schema.ResourceDiff, m interface{}) string { + var loc string rawStateType := diff.GetRawState().Type() if rawStateType.HasAttribute("zone") { - zone, _ := extractZone(diff, meta) - locality = zone.String() + zone, _ := meta.ExtractZone(diff, m) + loc = zone.String() } else if rawStateType.HasAttribute("region") { - region, _ := extractRegion(diff, meta) - locality = region.String() + region, _ := meta.ExtractRegion(diff, m) + loc = region.String() } - return locality + return loc } // CustomizeDiffLocalityCheck create a function that will validate locality IDs stored in given keys @@ -746,8 +662,8 @@ func getLocality(diff *schema.ResourceDiff, meta *Meta) 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 CustomizeDiffLocalityCheck(keys ...string) schema.CustomizeDiffFunc { - return func(_ context.Context, diff *schema.ResourceDiff, i interface{}) error { - l := getLocality(diff, i.(*Meta)) + return func(_ context.Context, diff *schema.ResourceDiff, m interface{}) error { + l := getLocality(diff, m) if l == "" { return errors.New("missing locality zone or region to check IDs") diff --git a/scaleway/helpers_account.go b/scaleway/helpers_account.go index cb2c64eaa..824ce0d71 100644 --- a/scaleway/helpers_account.go +++ b/scaleway/helpers_account.go @@ -2,9 +2,9 @@ package scaleway import ( accountV3 "github.com/scaleway/scaleway-sdk-go/api/account/v3" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) func accountV3ProjectAPI(m interface{}) *accountV3.ProjectAPI { - meta := m.(*Meta) - return accountV3.NewProjectAPI(meta.scwClient) + return accountV3.NewProjectAPI(meta.ExtractScwClient(m)) } diff --git a/scaleway/helpers_apple_silicon.go b/scaleway/helpers_apple_silicon.go index 5d4958aeb..61595979c 100644 --- a/scaleway/helpers_apple_silicon.go +++ b/scaleway/helpers_apple_silicon.go @@ -8,6 +8,7 @@ import ( applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -18,10 +19,9 @@ const ( // asAPIWithZone returns a new apple silicon API and the zone func asAPIWithZone(d *schema.ResourceData, m interface{}) (*applesilicon.API, scw.Zone, error) { - meta := m.(*Meta) - asAPI := applesilicon.NewAPI(meta.scwClient) + asAPI := applesilicon.NewAPI(meta.ExtractScwClient(m)) - zone, err := extractZone(d, meta) + zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err } @@ -30,8 +30,7 @@ func asAPIWithZone(d *schema.ResourceData, m interface{}) (*applesilicon.API, sc // asAPIWithZoneAndID returns an apple silicon API with zone and ID extracted from the state func asAPIWithZoneAndID(m interface{}, id string) (*applesilicon.API, scw.Zone, string, error) { - meta := m.(*Meta) - asAPI := applesilicon.NewAPI(meta.scwClient) + asAPI := applesilicon.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) if err != nil { diff --git a/scaleway/helpers_baremetal.go b/scaleway/helpers_baremetal.go index d4796f340..f1faf8833 100644 --- a/scaleway/helpers_baremetal.go +++ b/scaleway/helpers_baremetal.go @@ -13,6 +13,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -25,10 +26,9 @@ const ( // instanceAPIWithZone returns a new baremetal API and the zone for a Create request func baremetalAPIWithZone(d *schema.ResourceData, m interface{}) (*baremetal.API, scw.Zone, error) { - meta := m.(*Meta) - baremetalAPI := baremetal.NewAPI(meta.scwClient) + baremetalAPI := baremetal.NewAPI(meta.ExtractScwClient(m)) - zone, err := extractZone(d, meta) + zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err } @@ -37,8 +37,7 @@ func baremetalAPIWithZone(d *schema.ResourceData, m interface{}) (*baremetal.API // instanceAPIWithZoneAndID returns an baremetal API with zone and ID extracted from the state func baremetalAPIWithZoneAndID(m interface{}, id string) (*baremetal.API, zonal.ID, error) { - meta := m.(*Meta) - baremetalAPI := baremetal.NewAPI(meta.scwClient) + baremetalAPI := baremetal.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) if err != nil { @@ -49,10 +48,9 @@ func baremetalAPIWithZoneAndID(m interface{}, id string) (*baremetal.API, zonal. // returns a new baremetal private network API and the zone for a Create request func baremetalPrivateNetworkAPIWithZone(d *schema.ResourceData, m interface{}) (*baremetal.PrivateNetworkAPI, scw.Zone, error) { - meta := m.(*Meta) - baremetalPrivateNetworkAPI := baremetal.NewPrivateNetworkAPI(meta.scwClient) + baremetalPrivateNetworkAPI := baremetal.NewPrivateNetworkAPI(meta.ExtractScwClient(m)) - zone, err := extractZone(d, meta) + zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err } @@ -61,8 +59,7 @@ func baremetalPrivateNetworkAPIWithZone(d *schema.ResourceData, m interface{}) ( // baremetalPrivateNetworkAPIWithZoneAndID returns a baremetal private network API with zone and ID extracted from the state func baremetalPrivateNetworkAPIWithZoneAndID(m interface{}, id string) (*baremetal.PrivateNetworkAPI, zonal.ID, error) { - meta := m.(*Meta) - baremetalPrivateNetworkAPI := baremetal.NewPrivateNetworkAPI(meta.scwClient) + baremetalPrivateNetworkAPI := baremetal.NewPrivateNetworkAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) if err != nil { diff --git a/scaleway/helpers_billing.go b/scaleway/helpers_billing.go index 6207d8e71..20db0ab56 100644 --- a/scaleway/helpers_billing.go +++ b/scaleway/helpers_billing.go @@ -2,10 +2,10 @@ package scaleway import ( billing "github.com/scaleway/scaleway-sdk-go/api/billing/v2beta1" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) // billingAPI returns a new billing API. func billingAPI(m interface{}) *billing.API { - meta := m.(*Meta) - return billing.NewAPI(meta.scwClient) + return billing.NewAPI(meta.ExtractScwClient(m)) } diff --git a/scaleway/helpers_block.go b/scaleway/helpers_block.go index b42d384af..5adacdc75 100644 --- a/scaleway/helpers_block.go +++ b/scaleway/helpers_block.go @@ -10,6 +10,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -20,10 +21,9 @@ 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) { - meta := m.(*Meta) - blockAPI := block.NewAPI(meta.scwClient) + blockAPI := block.NewAPI(meta.ExtractScwClient(m)) - zone, err := extractZone(d, meta) + zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err } @@ -33,8 +33,7 @@ func blockAPIWithZone(d *schema.ResourceData, m interface{}) (*block.API, scw.Zo // blockAPIWithZonedAndID returns a new block API with zone and ID extracted from the state func blockAPIWithZoneAndID(m interface{}, zonedID string) (*block.API, scw.Zone, string, error) { - meta := m.(*Meta) - blockAPI := block.NewAPI(meta.scwClient) + blockAPI := block.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(zonedID) if err != nil { diff --git a/scaleway/helpers_cockpit.go b/scaleway/helpers_cockpit.go index f7192e210..25084cd67 100644 --- a/scaleway/helpers_cockpit.go +++ b/scaleway/helpers_cockpit.go @@ -9,6 +9,7 @@ import ( cockpit "github.com/scaleway/scaleway-sdk-go/api/cockpit/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -20,8 +21,7 @@ const ( // cockpitAPI returns a new cockpit API. func cockpitAPI(m interface{}) (*cockpit.API, error) { - meta := m.(*Meta) - api := cockpit.NewAPI(meta.scwClient) + api := cockpit.NewAPI(meta.ExtractScwClient(m)) return api, nil } diff --git a/scaleway/helpers_container.go b/scaleway/helpers_container.go index 08ecedfe5..d5ed494cb 100644 --- a/scaleway/helpers_container.go +++ b/scaleway/helpers_container.go @@ -11,6 +11,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -24,10 +25,9 @@ const ( // containerAPIWithRegion returns a new container API and the region. func containerAPIWithRegion(d *schema.ResourceData, m interface{}) (*container.API, scw.Region, error) { - meta := m.(*Meta) - api := container.NewAPI(meta.scwClient) + api := container.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -36,8 +36,7 @@ func containerAPIWithRegion(d *schema.ResourceData, m interface{}) (*container.A // containerAPIWithRegionAndID returns a new container API, region and ID. func containerAPIWithRegionAndID(m interface{}, id string) (*container.API, scw.Region, string, error) { - meta := m.(*Meta) - api := container.NewAPI(meta.scwClient) + api := container.NewAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) if err != nil { diff --git a/scaleway/helpers_container_triggers.go b/scaleway/helpers_container_triggers.go index c33f0f331..4455f47e3 100644 --- a/scaleway/helpers_container_triggers.go +++ b/scaleway/helpers_container_triggers.go @@ -8,6 +8,7 @@ import ( container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -56,17 +57,17 @@ func expandContainerTriggerMnqNatsCreationConfig(i interface{}) *container.Creat } } -func completeContainerTriggerMnqCreationConfig(i interface{}, d *schema.ResourceData, meta interface{}, region scw.Region) error { - m := i.(map[string]interface{}) +func completeContainerTriggerMnqCreationConfig(i interface{}, d *schema.ResourceData, m interface{}, region scw.Region) error { + configMap := i.(map[string]interface{}) - if sqsRegion, exists := m["region"]; !exists || sqsRegion == "" { - m["region"] = region.String() + if sqsRegion, exists := configMap["region"]; !exists || sqsRegion == "" { + configMap["region"] = region.String() } - if projectID, exists := m["project_id"]; !exists || projectID == "" { - projectID, _, err := extractProjectID(d, meta.(*Meta)) + if projectID, exists := configMap["project_id"]; !exists || projectID == "" { + projectID, _, err := meta.ExtractProjectID(d, m) if err == nil { - m["project_id"] = projectID + configMap["project_id"] = projectID } } diff --git a/scaleway/helpers_document_db.go b/scaleway/helpers_document_db.go index a01057b4f..e5a885209 100644 --- a/scaleway/helpers_document_db.go +++ b/scaleway/helpers_document_db.go @@ -10,6 +10,7 @@ import ( documentdb "github.com/scaleway/scaleway-sdk-go/api/documentdb/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -21,10 +22,9 @@ const ( // documentDBAPIWithRegion returns a new documentdb API and the region for a Create request func documentDBAPIWithRegion(d *schema.ResourceData, m interface{}) (*documentdb.API, scw.Region, error) { - meta := m.(*Meta) - api := documentdb.NewAPI(meta.scwClient) + api := documentdb.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -34,8 +34,7 @@ func documentDBAPIWithRegion(d *schema.ResourceData, m interface{}) (*documentdb // documentDBAPIWithRegionalAndID returns a new documentdb API with region and ID extracted from the state func documentDBAPIWithRegionAndID(m interface{}, regionalID string) (*documentdb.API, scw.Region, string, error) { - meta := m.(*Meta) - api := documentdb.NewAPI(meta.scwClient) + api := documentdb.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionalID) if err != nil { diff --git a/scaleway/helpers_domain.go b/scaleway/helpers_domain.go index 5e07488e3..8b3e031fa 100644 --- a/scaleway/helpers_domain.go +++ b/scaleway/helpers_domain.go @@ -10,6 +10,7 @@ import ( domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1" "github.com/scaleway/scaleway-sdk-go/scw" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -21,9 +22,7 @@ const ( // domainAPI returns a new domain API. func newDomainAPI(m interface{}) *domain.API { - meta := m.(*Meta) - - return domain.NewAPI(meta.scwClient) + return domain.NewAPI(meta.ExtractScwClient(m)) } func flattenDomainData(data string, recordType domain.RecordType) interface{} { diff --git a/scaleway/helpers_flexible_ip.go b/scaleway/helpers_flexible_ip.go index c801bfd6f..ceb428fe6 100644 --- a/scaleway/helpers_flexible_ip.go +++ b/scaleway/helpers_flexible_ip.go @@ -9,6 +9,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -19,10 +20,9 @@ const ( // fipAPIWithZone returns an lb API WITH zone for a Create request func fipAPIWithZone(d *schema.ResourceData, m interface{}) (*flexibleip.API, scw.Zone, error) { - meta := m.(*Meta) - flexibleipAPI := flexibleip.NewAPI(meta.scwClient) + flexibleipAPI := flexibleip.NewAPI(meta.ExtractScwClient(m)) - zone, err := extractZone(d, meta) + zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err } @@ -31,8 +31,7 @@ func fipAPIWithZone(d *schema.ResourceData, m interface{}) (*flexibleip.API, scw // fipAPIWithZoneAndID returns an flexibleip API with zone and ID extracted from the state func fipAPIWithZoneAndID(m interface{}, id string) (*flexibleip.API, scw.Zone, string, error) { - meta := m.(*Meta) - fipAPI := flexibleip.NewAPI(meta.scwClient) + fipAPI := flexibleip.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) if err != nil { diff --git a/scaleway/helpers_function.go b/scaleway/helpers_function.go index cd293d4ff..f3bd86b6b 100644 --- a/scaleway/helpers_function.go +++ b/scaleway/helpers_function.go @@ -15,6 +15,7 @@ import ( function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -28,10 +29,9 @@ const ( // functionAPIWithRegion returns a new container registry API and the region. func functionAPIWithRegion(d *schema.ResourceData, m interface{}) (*function.API, scw.Region, error) { - meta := m.(*Meta) - api := function.NewAPI(meta.scwClient) + api := function.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -40,8 +40,7 @@ func functionAPIWithRegion(d *schema.ResourceData, m interface{}) (*function.API // functionAPIWithRegionAndID returns a new container registry API, region and ID. func functionAPIWithRegionAndID(m interface{}, id string) (*function.API, scw.Region, string, error) { - meta := m.(*Meta) - api := function.NewAPI(meta.scwClient) + api := function.NewAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) if err != nil { @@ -129,7 +128,6 @@ func waitForFunctionTrigger(ctx context.Context, functionAPI *function.API, regi } func functionUpload(ctx context.Context, m interface{}, functionAPI *function.API, region scw.Region, functionID string, zipFile string) error { - meta := m.(*Meta) zipStat, err := os.Stat(zipFile) if err != nil { return fmt.Errorf("failed to stat zip file: %w", err) @@ -163,10 +161,10 @@ func functionUpload(ctx context.Context, m interface{}, functionAPI *function.AP } } - secretKey, _ := meta.scwClient.GetSecretKey() + secretKey, _ := meta.ExtractScwClient(m).GetSecretKey() req.Header.Add("X-Auth-Token", secretKey) - resp, err := meta.httpClient.Do(req) + resp, err := meta.ExtractHTTPClient(m).Do(req) if err != nil { return fmt.Errorf("failed to send request: %w", err) } diff --git a/scaleway/helpers_function_triggers.go b/scaleway/helpers_function_triggers.go index 18c36b875..627fd2356 100644 --- a/scaleway/helpers_function_triggers.go +++ b/scaleway/helpers_function_triggers.go @@ -5,6 +5,7 @@ import ( function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) func expandFunctionTriggerMnqSqsCreationConfig(i interface{}) *function.CreateTriggerRequestMnqSqsClientConfig { @@ -36,17 +37,17 @@ func expandFunctionTriggerMnqNatsCreationConfig(i interface{}) *function.CreateT } } -func completeFunctionTriggerMnqCreationConfig(i interface{}, d *schema.ResourceData, meta interface{}, region scw.Region) error { - m := i.(map[string]interface{}) +func completeFunctionTriggerMnqCreationConfig(i interface{}, d *schema.ResourceData, m interface{}, region scw.Region) error { + configMap := i.(map[string]interface{}) - if sqsRegion, exists := m["region"]; !exists || sqsRegion == "" { - m["region"] = region.String() + if sqsRegion, exists := configMap["region"]; !exists || sqsRegion == "" { + configMap["region"] = region.String() } - if projectID, exists := m["project_id"]; !exists || projectID == "" { - projectID, _, err := extractProjectID(d, meta.(*Meta)) + if projectID, exists := configMap["project_id"]; !exists || projectID == "" { + projectID, _, err := meta.ExtractProjectID(d, m) if err == nil { - m["project_id"] = projectID + configMap["project_id"] = projectID } } diff --git a/scaleway/helpers_iam.go b/scaleway/helpers_iam.go index bf3ab9d38..10fbc18bd 100644 --- a/scaleway/helpers_iam.go +++ b/scaleway/helpers_iam.go @@ -4,24 +4,22 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) // instanceAPIWithZone returns a new iam API for a Create request func iamAPI(m interface{}) *iam.API { - meta := m.(*Meta) - return iam.NewAPI(meta.scwClient) + return iam.NewAPI(meta.ExtractScwClient(m)) } func getOrganizationID(m interface{}, d *schema.ResourceData) *string { - meta := m.(*Meta) - orgID, orgIDExist := d.GetOk("organization_id") if orgIDExist { return expandStringPtr(orgID) } - defaultOrgID, defaultOrgIDExists := meta.scwClient.GetDefaultOrganizationID() + defaultOrgID, defaultOrgIDExists := meta.ExtractScwClient(m).GetDefaultOrganizationID() if defaultOrgIDExists { return expandStringPtr(defaultOrgID) } diff --git a/scaleway/helpers_instance.go b/scaleway/helpers_instance.go index cb3285d29..1b51edcca 100644 --- a/scaleway/helpers_instance.go +++ b/scaleway/helpers_instance.go @@ -18,6 +18,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -49,10 +50,9 @@ const ( // instanceAPIWithZone returns a new instance API and the zone for a Create request func instanceAPIWithZone(d *schema.ResourceData, m interface{}) (*instance.API, scw.Zone, error) { - meta := m.(*Meta) - instanceAPI := instance.NewAPI(meta.scwClient) + instanceAPI := instance.NewAPI(meta.ExtractScwClient(m)) - zone, err := extractZone(d, meta) + zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err } @@ -61,8 +61,7 @@ func instanceAPIWithZone(d *schema.ResourceData, m interface{}) (*instance.API, // instanceAPIWithZoneAndID returns an instance API with zone and ID extracted from the state func instanceAPIWithZoneAndID(m interface{}, zonedID string) (*instance.API, scw.Zone, string, error) { - meta := m.(*Meta) - instanceAPI := instance.NewAPI(meta.scwClient) + instanceAPI := instance.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(zonedID) if err != nil { @@ -73,8 +72,7 @@ func instanceAPIWithZoneAndID(m interface{}, zonedID string) (*instance.API, scw // instanceAPIWithZoneAndNestedID returns an instance API with zone and inner/outer ID extracted from the state func instanceAPIWithZoneAndNestedID(m interface{}, zonedNestedID string) (*instance.API, scw.Zone, string, string, error) { - meta := m.(*Meta) - instanceAPI := instance.NewAPI(meta.scwClient) + instanceAPI := instance.NewAPI(meta.ExtractScwClient(m)) zone, innerID, outerID, err := zonal.ParseNestedID(zonedNestedID) if err != nil { diff --git a/scaleway/helpers_instance_block.go b/scaleway/helpers_instance_block.go index e33f5cdc6..93b757d1c 100644 --- a/scaleway/helpers_instance_block.go +++ b/scaleway/helpers_instance_block.go @@ -6,6 +6,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) type InstanceBlockAPI struct { @@ -15,11 +16,10 @@ type InstanceBlockAPI struct { // instanceAPIWithZone returns a new instance API and the zone for a Create request func instanceAndBlockAPIWithZone(d *schema.ResourceData, m interface{}) (*InstanceBlockAPI, scw.Zone, error) { - meta := m.(*Meta) - instanceAPI := instance.NewAPI(meta.scwClient) - blockAPI := block.NewAPI(meta.scwClient) + instanceAPI := instance.NewAPI(meta.ExtractScwClient(m)) + blockAPI := block.NewAPI(meta.ExtractScwClient(m)) - zone, err := extractZone(d, meta) + zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err } @@ -32,9 +32,8 @@ func instanceAndBlockAPIWithZone(d *schema.ResourceData, m interface{}) (*Instan // instanceAPIWithZoneAndID returns an instance API with zone and ID extracted from the state func instanceAndBlockAPIWithZoneAndID(m interface{}, zonedID string) (*InstanceBlockAPI, scw.Zone, string, error) { - meta := m.(*Meta) - instanceAPI := instance.NewAPI(meta.scwClient) - blockAPI := block.NewAPI(meta.scwClient) + instanceAPI := instance.NewAPI(meta.ExtractScwClient(m)) + blockAPI := block.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(zonedID) if err != nil { diff --git a/scaleway/helpers_iot.go b/scaleway/helpers_iot.go index 967e0b8b1..1db69f4bf 100644 --- a/scaleway/helpers_iot.go +++ b/scaleway/helpers_iot.go @@ -10,6 +10,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/api/iot/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -21,17 +22,15 @@ const ( ) func iotAPIWithRegion(d *schema.ResourceData, m interface{}) (*iot.API, scw.Region, error) { - meta := m.(*Meta) - iotAPI := iot.NewAPI(meta.scwClient) + iotAPI := iot.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) return iotAPI, region, err } func iotAPIWithRegionAndID(m interface{}, id string) (*iot.API, scw.Region, string, error) { - meta := m.(*Meta) - iotAPI := iot.NewAPI(meta.scwClient) + iotAPI := iot.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(id) return iotAPI, region, ID, err @@ -72,13 +71,12 @@ func computeIotHubCaURL(productPlan iot.HubProductPlan, region scw.Region) strin } func computeIotHubMQTTCa(ctx context.Context, mqttCaURL string, m interface{}) (string, error) { - meta := m.(*Meta) if mqttCaURL == "" { return "", nil } var mqttCa *http.Response req, _ := http.NewRequestWithContext(ctx, "GET", mqttCaURL, nil) - mqttCa, err := meta.httpClient.Do(req) + mqttCa, err := meta.ExtractHTTPClient(m).Do(req) if err != nil { return "", err } diff --git a/scaleway/helpers_ipam.go b/scaleway/helpers_ipam.go index d28346738..c52b3bab6 100644 --- a/scaleway/helpers_ipam.go +++ b/scaleway/helpers_ipam.go @@ -12,6 +12,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/validation" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) const ( @@ -21,10 +22,9 @@ const ( // ipamAPIWithRegion returns a new ipam API and the region func ipamAPIWithRegion(d *schema.ResourceData, m interface{}) (*ipam.API, scw.Region, error) { - meta := m.(*Meta) - ipamAPI := ipam.NewAPI(meta.scwClient) + ipamAPI := ipam.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -34,8 +34,7 @@ func ipamAPIWithRegion(d *schema.ResourceData, m interface{}) (*ipam.API, scw.Re // ipamAPIWithRegionAndID returns a new ipam API with locality and ID extracted from the state func ipamAPIWithRegionAndID(m interface{}, id string) (*ipam.API, scw.Region, string, error) { - meta := m.(*Meta) - ipamAPI := ipam.NewAPI(meta.scwClient) + ipamAPI := ipam.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(id) if err != nil { diff --git a/scaleway/helpers_jobs.go b/scaleway/helpers_jobs.go index b25b72006..ff69ab0d2 100644 --- a/scaleway/helpers_jobs.go +++ b/scaleway/helpers_jobs.go @@ -5,14 +5,14 @@ import ( jobs "github.com/scaleway/scaleway-sdk-go/api/jobs/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) // jobsAPIWithRegion returns a new jobs API and the region for a Create request func jobsAPIWithRegion(d *schema.ResourceData, m interface{}) (*jobs.API, scw.Region, error) { - meta := m.(*Meta) - jobsAPI := jobs.NewAPI(meta.scwClient) + jobsAPI := jobs.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -22,8 +22,7 @@ func jobsAPIWithRegion(d *schema.ResourceData, m interface{}) (*jobs.API, scw.Re // jobsAPIWithRegionalAndID returns a new jobs API with region and ID extracted from the state func jobsAPIWithRegionAndID(m interface{}, regionalID string) (*jobs.API, scw.Region, string, error) { - meta := m.(*Meta) - jobsAPI := jobs.NewAPI(meta.scwClient) + jobsAPI := jobs.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionalID) if err != nil { diff --git a/scaleway/helpers_k8s.go b/scaleway/helpers_k8s.go index 5072e25d7..a43f69654 100644 --- a/scaleway/helpers_k8s.go +++ b/scaleway/helpers_k8s.go @@ -12,6 +12,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/api/k8s/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -22,10 +23,9 @@ const ( ) func k8sAPIWithRegion(d *schema.ResourceData, m interface{}) (*k8s.API, scw.Region, error) { - meta := m.(*Meta) - k8sAPI := k8s.NewAPI(meta.scwClient) + k8sAPI := k8s.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -33,8 +33,7 @@ func k8sAPIWithRegion(d *schema.ResourceData, m interface{}) (*k8s.API, scw.Regi } func k8sAPIWithRegionAndID(m interface{}, id string) (*k8s.API, scw.Region, string, error) { - meta := m.(*Meta) - k8sAPI := k8s.NewAPI(meta.scwClient) + k8sAPI := k8s.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(id) if err != nil { diff --git a/scaleway/helpers_lb.go b/scaleway/helpers_lb.go index 740b5d835..5b3c4c9cd 100644 --- a/scaleway/helpers_lb.go +++ b/scaleway/helpers_lb.go @@ -20,6 +20,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -30,10 +31,9 @@ const ( // lbAPIWithZone returns an lb API WITH zone for a Create request func lbAPIWithZone(d *schema.ResourceData, m interface{}) (*lbSDK.ZonedAPI, scw.Zone, error) { - meta := m.(*Meta) - lbAPI := lbSDK.NewZonedAPI(meta.scwClient) + lbAPI := lbSDK.NewZonedAPI(meta.ExtractScwClient(m)) - zone, err := extractZone(d, meta) + zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err } @@ -42,8 +42,7 @@ func lbAPIWithZone(d *schema.ResourceData, m interface{}) (*lbSDK.ZonedAPI, scw. // lbAPIWithZoneAndID returns an lb API with zone and ID extracted from the state func lbAPIWithZoneAndID(m interface{}, id string) (*lbSDK.ZonedAPI, scw.Zone, string, error) { - meta := m.(*Meta) - lbAPI := lbSDK.NewZonedAPI(meta.scwClient) + lbAPI := lbSDK.NewZonedAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) if err != nil { diff --git a/scaleway/helpers_marketplace.go b/scaleway/helpers_marketplace.go index f1079a26d..e37afa619 100644 --- a/scaleway/helpers_marketplace.go +++ b/scaleway/helpers_marketplace.go @@ -4,14 +4,14 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/scaleway/scaleway-sdk-go/api/marketplace/v2" "github.com/scaleway/scaleway-sdk-go/scw" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) // 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) { - meta := m.(*Meta) - marketplaceAPI := marketplace.NewAPI(meta.scwClient) + marketplaceAPI := marketplace.NewAPI(meta.ExtractScwClient(m)) - zone, err := extractZone(d, meta) + zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err } diff --git a/scaleway/helpers_mnq.go b/scaleway/helpers_mnq.go index a02ed908c..fa6b84089 100644 --- a/scaleway/helpers_mnq.go +++ b/scaleway/helpers_mnq.go @@ -10,12 +10,12 @@ import ( mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) func newMNQNatsAPI(d *schema.ResourceData, m interface{}) (*mnq.NatsAPI, scw.Region, error) { - meta := m.(*Meta) - api := mnq.NewNatsAPI(meta.scwClient) - region, err := extractRegion(d, meta) + api := mnq.NewNatsAPI(meta.ExtractScwClient(m)) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -24,8 +24,7 @@ func newMNQNatsAPI(d *schema.ResourceData, m interface{}) (*mnq.NatsAPI, scw.Reg } func mnqNatsAPIWithRegionAndID(m interface{}, regionalID string) (*mnq.NatsAPI, scw.Region, string, error) { - meta := m.(*Meta) - api := mnq.NewNatsAPI(meta.scwClient) + api := mnq.NewNatsAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionalID) if err != nil { @@ -36,10 +35,9 @@ func mnqNatsAPIWithRegionAndID(m interface{}, regionalID string) (*mnq.NatsAPI, } func newMNQSQSAPI(d *schema.ResourceData, m any) (*mnq.SqsAPI, scw.Region, error) { - meta := m.(*Meta) - api := mnq.NewSqsAPI(meta.scwClient) + api := mnq.NewSqsAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -48,8 +46,7 @@ func newMNQSQSAPI(d *schema.ResourceData, m any) (*mnq.SqsAPI, scw.Region, error } func mnqSQSAPIWithRegionAndID(m interface{}, regionalID string) (*mnq.SqsAPI, scw.Region, string, error) { - meta := m.(*Meta) - api := mnq.NewSqsAPI(meta.scwClient) + api := mnq.NewSqsAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionalID) if err != nil { @@ -60,10 +57,9 @@ func mnqSQSAPIWithRegionAndID(m interface{}, regionalID string) (*mnq.SqsAPI, sc } func newMNQSNSAPI(d *schema.ResourceData, m any) (*mnq.SnsAPI, scw.Region, error) { - meta := m.(*Meta) - api := mnq.NewSnsAPI(meta.scwClient) + api := mnq.NewSnsAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -72,8 +68,7 @@ func newMNQSNSAPI(d *schema.ResourceData, m any) (*mnq.SnsAPI, scw.Region, error } func mnqSNSAPIWithRegionAndID(m interface{}, regionalID string) (*mnq.SnsAPI, scw.Region, string, error) { - meta := m.(*Meta) - api := mnq.NewSnsAPI(meta.scwClient) + api := mnq.NewSnsAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionalID) if err != nil { diff --git a/scaleway/helpers_mnq_queue.go b/scaleway/helpers_mnq_queue.go index cfe6ac106..117070e5d 100644 --- a/scaleway/helpers_mnq_queue.go +++ b/scaleway/helpers_mnq_queue.go @@ -19,6 +19,7 @@ import ( natsjwt "github.com/nats-io/jwt/v2" "github.com/nats-io/nats.go" "github.com/scaleway/scaleway-sdk-go/scw" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) const ( @@ -32,8 +33,7 @@ const ( ) func SQSClientWithRegion(d *schema.ResourceData, m interface{}) (*sqs.SQS, scw.Region, error) { - meta := m.(*Meta) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -42,7 +42,7 @@ func SQSClientWithRegion(d *schema.ResourceData, m interface{}) (*sqs.SQS, scw.R accessKey := d.Get("access_key").(string) secretKey := d.Get("secret_key").(string) - sqsClient, err := newSQSClient(meta.httpClient, region.String(), endpoint, accessKey, secretKey) + sqsClient, err := newSQSClient(meta.ExtractHTTPClient(m), region.String(), endpoint, accessKey, secretKey) if err != nil { return nil, "", err } @@ -68,8 +68,7 @@ func newSQSClient(httpClient *http.Client, region string, endpoint string, acces } func NATSClientWithRegion(d *schema.ResourceData, m interface{}) (nats.JetStreamContext, scw.Region, error) { //nolint:ireturn - meta := m.(*Meta) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } diff --git a/scaleway/helpers_mnq_sns.go b/scaleway/helpers_mnq_sns.go index 4747db602..8c0bc758c 100644 --- a/scaleway/helpers_mnq_sns.go +++ b/scaleway/helpers_mnq_sns.go @@ -16,11 +16,11 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/scaleway/scaleway-sdk-go/scw" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) func SNSClientWithRegion(d *schema.ResourceData, m interface{}) (*sns.SNS, scw.Region, error) { - meta := m.(*Meta) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -29,7 +29,7 @@ func SNSClientWithRegion(d *schema.ResourceData, m interface{}) (*sns.SNS, scw.R accessKey := d.Get("access_key").(string) secretKey := d.Get("secret_key").(string) - snsClient, err := newSNSClient(meta.httpClient, region.String(), endpoint, accessKey, secretKey) + snsClient, err := newSNSClient(meta.ExtractHTTPClient(m), region.String(), endpoint, accessKey, secretKey) if err != nil { return nil, "", err } @@ -38,8 +38,6 @@ func SNSClientWithRegion(d *schema.ResourceData, m interface{}) (*sns.SNS, scw.R } func SNSClientWithRegionFromID(d *schema.ResourceData, m interface{}, regionalID string) (*sns.SNS, scw.Region, error) { - meta := m.(*Meta) - tab := strings.SplitN(regionalID, "/", 2) if len(tab) != 2 { return nil, "", errors.New("invalid ID format, expected parts separated by slashes") @@ -53,7 +51,7 @@ func SNSClientWithRegionFromID(d *schema.ResourceData, m interface{}, regionalID accessKey := d.Get("access_key").(string) secretKey := d.Get("secret_key").(string) - snsClient, err := newSNSClient(meta.httpClient, region.String(), endpoint, accessKey, secretKey) + snsClient, err := newSNSClient(meta.ExtractHTTPClient(m), region.String(), endpoint, accessKey, secretKey) if err != nil { return nil, "", err } diff --git a/scaleway/helpers_object.go b/scaleway/helpers_object.go index 9d242762e..7978f2ef2 100644 --- a/scaleway/helpers_object.go +++ b/scaleway/helpers_object.go @@ -27,6 +27,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/workerpool" ) @@ -62,37 +63,36 @@ func newS3Client(httpClient *http.Client, region, accessKey, secretKey string) ( return s3.New(s), nil } -func newS3ClientFromMeta(meta *Meta, region string) (*s3.S3, error) { - accessKey, _ := meta.scwClient.GetAccessKey() - secretKey, _ := meta.scwClient.GetSecretKey() +func newS3ClientFromMeta(meta *meta.Meta, region string) (*s3.S3, error) { + accessKey, _ := meta.ScwClient().GetAccessKey() + secretKey, _ := meta.ScwClient().GetSecretKey() - projectID, _ := meta.scwClient.GetDefaultProjectID() + projectID, _ := meta.ScwClient().GetDefaultProjectID() if projectID != "" { accessKey = accessKeyWithProjectID(accessKey, projectID) } if region == "" { - defaultRegion, _ := meta.scwClient.GetDefaultRegion() + defaultRegion, _ := meta.ScwClient().GetDefaultRegion() region = defaultRegion.String() } - return newS3Client(meta.httpClient, region, accessKey, secretKey) + return newS3Client(meta.HTTPClient(), region, accessKey, secretKey) } func s3ClientWithRegion(d *schema.ResourceData, m interface{}) (*s3.S3, scw.Region, error) { - meta := m.(*Meta) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } - accessKey, _ := meta.scwClient.GetAccessKey() - if projectID, _, err := extractProjectID(d, meta); err == nil { + accessKey, _ := meta.ExtractScwClient(m).GetAccessKey() + if projectID, _, err := meta.ExtractProjectID(d, m); err == nil { accessKey = accessKeyWithProjectID(accessKey, projectID) } - secretKey, _ := meta.scwClient.GetSecretKey() + secretKey, _ := meta.ExtractScwClient(m).GetSecretKey() - s3Client, err := newS3Client(meta.httpClient, region.String(), accessKey, secretKey) + s3Client, err := newS3Client(meta.ExtractHTTPClient(m), region.String(), accessKey, secretKey) if err != nil { return nil, "", err } @@ -101,7 +101,6 @@ func s3ClientWithRegion(d *schema.ResourceData, m interface{}) (*s3.S3, scw.Regi } func s3ClientWithRegionAndName(d *schema.ResourceData, m interface{}, id string) (*s3.S3, scw.Region, string, error) { - meta := m.(*Meta) region, name, err := regional.ParseID(id) if err != nil { return nil, "", "", err @@ -115,19 +114,19 @@ func s3ClientWithRegionAndName(d *schema.ResourceData, m interface{}, id string) d.SetId(fmt.Sprintf("%s/%s", region, name)) - accessKey, _ := meta.scwClient.GetAccessKey() - secretKey, _ := meta.scwClient.GetSecretKey() + accessKey, _ := meta.ExtractScwClient(m).GetAccessKey() + secretKey, _ := meta.ExtractScwClient(m).GetSecretKey() if len(parts) == 2 { accessKey = accessKeyWithProjectID(accessKey, parts[1]) } else { - projectID, _, err := extractProjectID(d, meta) + projectID, _, err := meta.ExtractProjectID(d, m) if err == nil { accessKey = accessKeyWithProjectID(accessKey, projectID) } } - s3Client, err := newS3Client(meta.httpClient, region.String(), accessKey, secretKey) + s3Client, err := newS3Client(meta.ExtractHTTPClient(m), region.String(), accessKey, secretKey) if err != nil { return nil, "", "", err } @@ -136,19 +135,18 @@ func s3ClientWithRegionAndName(d *schema.ResourceData, m interface{}, id string) } func s3ClientWithRegionAndNestedName(d *schema.ResourceData, m interface{}, name string) (*s3.S3, scw.Region, string, string, error) { - meta := m.(*Meta) region, outerID, innerID, err := regional.ParseNestedID(name) if err != nil { return nil, "", "", "", err } - accessKey, _ := meta.scwClient.GetAccessKey() - if projectID, _, err := extractProjectID(d, meta); err == nil { + accessKey, _ := meta.ExtractScwClient(m).GetAccessKey() + if projectID, _, err := meta.ExtractProjectID(d, m); err == nil { accessKey = accessKeyWithProjectID(accessKey, projectID) } - secretKey, _ := meta.scwClient.GetSecretKey() + secretKey, _ := meta.ExtractScwClient(m).GetSecretKey() - s3Client, err := newS3Client(meta.httpClient, region.String(), accessKey, secretKey) + s3Client, err := newS3Client(meta.ExtractHTTPClient(m), region.String(), accessKey, secretKey) if err != nil { return nil, "", "", "", err } @@ -157,19 +155,18 @@ func s3ClientWithRegionAndNestedName(d *schema.ResourceData, m interface{}, name } func s3ClientWithRegionWithNameACL(d *schema.ResourceData, m interface{}, name string) (*s3.S3, scw.Region, string, string, error) { - meta := m.(*Meta) region, name, outerID, err := locality.ParseLocalizedNestedOwnerID(name) if err != nil { return nil, "", name, "", err } - accessKey, _ := meta.scwClient.GetAccessKey() - if projectID, _, err := extractProjectID(d, meta); err == nil { + accessKey, _ := meta.ExtractScwClient(m).GetAccessKey() + if projectID, _, err := meta.ExtractProjectID(d, m); err == nil { accessKey = accessKeyWithProjectID(accessKey, projectID) } - secretKey, _ := meta.scwClient.GetSecretKey() + secretKey, _ := meta.ExtractScwClient(m).GetSecretKey() - s3Client, err := newS3Client(meta.httpClient, region, accessKey, secretKey) + s3Client, err := newS3Client(meta.ExtractHTTPClient(m), region, accessKey, secretKey) if err != nil { return nil, "", "", "", err } @@ -177,15 +174,13 @@ func s3ClientWithRegionWithNameACL(d *schema.ResourceData, m interface{}, name s } func s3ClientForceRegion(d *schema.ResourceData, m interface{}, region string) (*s3.S3, error) { - meta := m.(*Meta) - - accessKey, _ := meta.scwClient.GetAccessKey() - if projectID, _, err := extractProjectID(d, meta); err == nil { + accessKey, _ := meta.ExtractScwClient(m).GetAccessKey() + if projectID, _, err := meta.ExtractProjectID(d, m); err == nil { accessKey = accessKeyWithProjectID(accessKey, projectID) } - secretKey, _ := meta.scwClient.GetSecretKey() + secretKey, _ := meta.ExtractScwClient(m).GetSecretKey() - s3Client, err := newS3Client(meta.httpClient, region, accessKey, secretKey) + s3Client, err := newS3Client(meta.ExtractHTTPClient(m), region, accessKey, secretKey) if err != nil { return nil, err } diff --git a/scaleway/helpers_rdb.go b/scaleway/helpers_rdb.go index 06d81e278..f57257e1c 100644 --- a/scaleway/helpers_rdb.go +++ b/scaleway/helpers_rdb.go @@ -15,6 +15,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -25,15 +26,12 @@ const ( // newRdbAPI returns a new RDB API func newRdbAPI(m interface{}) *rdb.API { - meta := m.(*Meta) - return rdb.NewAPI(meta.scwClient) + return rdb.NewAPI(meta.ExtractScwClient(m)) } // rdbAPIWithRegion returns a new lb API and the region for a Create request func rdbAPIWithRegion(d *schema.ResourceData, m interface{}) (*rdb.API, scw.Region, error) { - meta := m.(*Meta) - - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -322,8 +320,7 @@ func rdbPrivilegeV1SchemaUpgradeFunc(_ context.Context, rawState map[string]inte region, idStr, err := regional.ParseID(idRaw.(string)) if err != nil { // force the default region - meta := m.(*Meta) - defaultRegion, exist := meta.scwClient.GetDefaultRegion() + defaultRegion, exist := meta.ExtractScwClient(m).GetDefaultRegion() if exist { region = defaultRegion } @@ -374,8 +371,8 @@ func getIPConfigUpdate(d *schema.ResourceData, ipFieldName string) (ipamConfig * return ipamConfig, staticConfig } -func getIPAMConfigRead(resource interface{}, meta interface{}) (bool, error) { - ipamAPI := ipam.NewAPI(meta.(*Meta).scwClient) +func getIPAMConfigRead(resource interface{}, m interface{}) (bool, error) { + ipamAPI := ipam.NewAPI(meta.ExtractScwClient(m)) request := &ipam.ListIPsRequest{ ResourceType: "rdb_instance", IsIPv6: scw.BoolPtr(false), diff --git a/scaleway/helpers_redis.go b/scaleway/helpers_redis.go index 1279fbd08..f1bbd1aa4 100644 --- a/scaleway/helpers_redis.go +++ b/scaleway/helpers_redis.go @@ -14,6 +14,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -24,15 +25,12 @@ const ( // newRedisApi returns a new Redis API func newRedisAPI(m interface{}) *redis.API { - meta := m.(*Meta) - return redis.NewAPI(meta.scwClient) + return redis.NewAPI(meta.ExtractScwClient(m)) } // redisAPIWithZone returns a new Redis API and the zone for a Create request func redisAPIWithZone(d *schema.ResourceData, m interface{}) (*redis.API, scw.Zone, error) { - meta := m.(*Meta) - - zone, err := extractZone(d, meta) + zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err } diff --git a/scaleway/helpers_registry.go b/scaleway/helpers_registry.go index 563154e0f..136d4859c 100644 --- a/scaleway/helpers_registry.go +++ b/scaleway/helpers_registry.go @@ -9,6 +9,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/api/registry/v1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -23,10 +24,9 @@ type ErrorRegistryMessage struct { // registryAPIWithRegion returns a new container registry API and the region. func registryAPIWithRegion(d *schema.ResourceData, m interface{}) (*registry.API, scw.Region, error) { - meta := m.(*Meta) - api := registry.NewAPI(meta.scwClient) + api := registry.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -35,8 +35,7 @@ func registryAPIWithRegion(d *schema.ResourceData, m interface{}) (*registry.API // registryAPIWithRegionAndID returns a new container registry API, region and ID. func registryAPIWithRegionAndID(m interface{}, id string) (*registry.API, scw.Region, string, error) { - meta := m.(*Meta) - api := registry.NewAPI(meta.scwClient) + api := registry.NewAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) if err != nil { diff --git a/scaleway/helpers_sdb_sql.go b/scaleway/helpers_sdb_sql.go index da6c39a87..c4eb6b228 100644 --- a/scaleway/helpers_sdb_sql.go +++ b/scaleway/helpers_sdb_sql.go @@ -8,6 +8,7 @@ import ( serverless_sqldb "github.com/scaleway/scaleway-sdk-go/api/serverless_sqldb/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -17,10 +18,9 @@ const ( // serverlessSQLdbAPIWithRegion returns a new serverless_sqldb API and the region for a Create request func serverlessSQLdbAPIWithRegion(d *schema.ResourceData, m interface{}) (*serverless_sqldb.API, scw.Region, error) { - meta := m.(*Meta) - sdbAPI := serverless_sqldb.NewAPI(meta.scwClient) + sdbAPI := serverless_sqldb.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -30,8 +30,7 @@ func serverlessSQLdbAPIWithRegion(d *schema.ResourceData, m interface{}) (*serve // serverlessSQLdbAPIWithRegionalAndID returns a new serverless_sqldb API with region and ID extracted from the state func serverlessSQLdbAPIWithRegionAndID(m interface{}, regionalID string) (*serverless_sqldb.API, scw.Region, string, error) { - meta := m.(*Meta) - sdbAPI := serverless_sqldb.NewAPI(meta.scwClient) + sdbAPI := serverless_sqldb.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(regionalID) if err != nil { diff --git a/scaleway/helpers_secret.go b/scaleway/helpers_secret.go index 82121cfa8..9c8548f1c 100644 --- a/scaleway/helpers_secret.go +++ b/scaleway/helpers_secret.go @@ -9,6 +9,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) const ( @@ -17,10 +18,9 @@ const ( // secretAPIWithRegion returns a new Secret API and the region for a Create request func secretAPIWithRegion(d *schema.ResourceData, m interface{}) (*secret.API, scw.Region, error) { - meta := m.(*Meta) - api := secret.NewAPI(meta.scwClient) + api := secret.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -29,10 +29,9 @@ func secretAPIWithRegion(d *schema.ResourceData, m interface{}) (*secret.API, sc // secretAPIWithRegionAndDefault returns a new Secret API and the region for a Create request func secretAPIWithRegionAndDefault(d *schema.ResourceData, m interface{}, defaultRegion scw.Region) (*secret.API, scw.Region, error) { - meta := m.(*Meta) - api := secret.NewAPI(meta.scwClient) + api := secret.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegionWithDefault(d, meta, defaultRegion) + region, err := meta.ExtractRegionWithDefault(d, m, defaultRegion) if err != nil { return nil, "", err } @@ -41,15 +40,14 @@ func secretAPIWithRegionAndDefault(d *schema.ResourceData, m interface{}, defaul // secretAPIWithRegionAndProjectID returns a new Secret API, with region and projectID func secretAPIWithRegionAndProjectID(d *schema.ResourceData, m interface{}) (*secret.API, scw.Region, string, error) { - meta := m.(*Meta) - api := secret.NewAPI(meta.scwClient) + api := secret.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", "", err } - projectID, _, err := extractProjectID(d, meta) + projectID, _, err := meta.ExtractProjectID(d, m) if err != nil { return nil, "", "", err } @@ -59,8 +57,7 @@ func secretAPIWithRegionAndProjectID(d *schema.ResourceData, m interface{}) (*se // secretAPIWithRegionAndID returns a Secret API with locality and ID extracted from the state func secretAPIWithRegionAndID(m interface{}, id string) (*secret.API, scw.Region, string, error) { - meta := m.(*Meta) - api := secret.NewAPI(meta.scwClient) + api := secret.NewAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) if err != nil { @@ -71,14 +68,11 @@ func secretAPIWithRegionAndID(m interface{}, id string) (*secret.API, scw.Region // secretVersionAPIWithRegionAndID returns a Secret API with locality and Nested ID extracted from the state func secretVersionAPIWithRegionAndID(m interface{}, id string) (*secret.API, scw.Region, string, string, error) { - meta := m.(*Meta) - region, id, revision, err := locality.ParseLocalizedNestedID(id) if err != nil { return nil, "", "", "", err } - - api := secret.NewAPI(meta.scwClient) + api := secret.NewAPI(meta.ExtractScwClient(m)) return api, scw.Region(region), id, revision, nil } diff --git a/scaleway/helpers_tem.go b/scaleway/helpers_tem.go index aebd5ee6e..4d2c563c8 100644 --- a/scaleway/helpers_tem.go +++ b/scaleway/helpers_tem.go @@ -8,6 +8,7 @@ import ( tem "github.com/scaleway/scaleway-sdk-go/api/tem/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -18,10 +19,9 @@ 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) { - meta := m.(*Meta) - api := tem.NewAPI(meta.scwClient) + api := tem.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -30,8 +30,7 @@ func temAPIWithRegion(d *schema.ResourceData, m interface{}) (*tem.API, scw.Regi // temAPIWithRegionAndID returns a Tem API with zone and ID extracted from the state func temAPIWithRegionAndID(m interface{}, id string) (*tem.API, scw.Region, string, error) { - meta := m.(*Meta) - api := tem.NewAPI(meta.scwClient) + api := tem.NewAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) if err != nil { diff --git a/scaleway/helpers_vpc.go b/scaleway/helpers_vpc.go index 0030d244c..f797e5381 100644 --- a/scaleway/helpers_vpc.go +++ b/scaleway/helpers_vpc.go @@ -16,16 +16,16 @@ import ( validator "github.com/scaleway/scaleway-sdk-go/validation" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) 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) { - meta := m.(*Meta) - vpcAPI := vpc.NewAPI(meta.scwClient) + vpcAPI := vpc.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -34,8 +34,7 @@ func vpcAPIWithRegion(d *schema.ResourceData, m interface{}) (*vpc.API, scw.Regi // vpcAPIWithRegionAndID returns a new VPC API with locality and ID extracted from the state func vpcAPIWithRegionAndID(m interface{}, id string) (*vpc.API, scw.Region, string, error) { - meta := m.(*Meta) - vpcAPI := vpc.NewAPI(meta.scwClient) + vpcAPI := vpc.NewAPI(meta.ExtractScwClient(m)) region, ID, err := regional.ParseID(id) if err != nil { @@ -45,12 +44,7 @@ func vpcAPIWithRegionAndID(m interface{}, id string) (*vpc.API, scw.Region, stri } func vpcAPI(m interface{}) (*vpc.API, error) { - meta, ok := m.(*Meta) - if !ok { - return nil, fmt.Errorf("wrong type: %T", m) - } - - return vpc.NewAPI(meta.scwClient), nil + return vpc.NewAPI(meta.ExtractScwClient(m)), nil } func expandSubnets(d *schema.ResourceData) (ipv4Subnets []scw.IPNet, ipv6Subnets []scw.IPNet, err error) { diff --git a/scaleway/helpers_vpcgw.go b/scaleway/helpers_vpcgw.go index 780885749..b1fccd34c 100644 --- a/scaleway/helpers_vpcgw.go +++ b/scaleway/helpers_vpcgw.go @@ -9,6 +9,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -20,10 +21,9 @@ const ( // vpcgwAPIWithZone returns a new VPC API and the zone for a Create request func vpcgwAPIWithZone(d *schema.ResourceData, m interface{}) (*vpcgw.API, scw.Zone, error) { - meta := m.(*Meta) - vpcgwAPI := vpcgw.NewAPI(meta.scwClient) + vpcgwAPI := vpcgw.NewAPI(meta.ExtractScwClient(m)) - zone, err := extractZone(d, meta) + zone, err := meta.ExtractZone(d, m) if err != nil { return nil, "", err } @@ -32,8 +32,7 @@ func vpcgwAPIWithZone(d *schema.ResourceData, m interface{}) (*vpcgw.API, scw.Zo // vpcgwAPIWithZoneAndID func vpcgwAPIWithZoneAndID(m interface{}, id string) (*vpcgw.API, scw.Zone, string, error) { - meta := m.(*Meta) - vpcgwAPI := vpcgw.NewAPI(meta.scwClient) + vpcgwAPI := vpcgw.NewAPI(meta.ExtractScwClient(m)) zone, ID, err := zonal.ParseID(id) if err != nil { diff --git a/scaleway/helpers_webhosting.go b/scaleway/helpers_webhosting.go index 0d2f9e153..95b237382 100644 --- a/scaleway/helpers_webhosting.go +++ b/scaleway/helpers_webhosting.go @@ -8,6 +8,7 @@ import ( webhosting "github.com/scaleway/scaleway-sdk-go/api/webhosting/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -18,10 +19,9 @@ const ( // webhostingAPIWithRegion returns a new Webhosting API and the region for a Create request func webhostingAPIWithRegion(d *schema.ResourceData, m interface{}) (*webhosting.API, scw.Region, error) { - meta := m.(*Meta) - api := webhosting.NewAPI(meta.scwClient) + api := webhosting.NewAPI(meta.ExtractScwClient(m)) - region, err := extractRegion(d, meta) + region, err := meta.ExtractRegion(d, m) if err != nil { return nil, "", err } @@ -30,8 +30,7 @@ func webhostingAPIWithRegion(d *schema.ResourceData, m interface{}) (*webhosting // webhostingAPIWithRegionAndID returns a Webhosting API with region and ID extracted from the state func webhostingAPIWithRegionAndID(m interface{}, id string) (*webhosting.API, scw.Region, string, error) { - meta := m.(*Meta) - api := webhosting.NewAPI(meta.scwClient) + api := webhosting.NewAPI(meta.ExtractScwClient(m)) region, id, err := regional.ParseID(id) if err != nil { diff --git a/scaleway/provider.go b/scaleway/provider.go index 4397c48c8..0023a8f87 100644 --- a/scaleway/provider.go +++ b/scaleway/provider.go @@ -2,30 +2,24 @@ package scaleway import ( "context" - "fmt" - "net/http" "os" - "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/plugin" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" - "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" - "github.com/scaleway/terraform-provider-scaleway/v2/version" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) -const appendUserAgentEnvVar = "TF_APPEND_USER_AGENT" - var terraformBetaEnabled = os.Getenv(scw.ScwEnableBeta) != "" // ProviderConfig config can be used to provide additional config when creating provider. type ProviderConfig struct { // Meta can be used to override Meta that will be used by the provider. // This is useful for tests. - Meta *Meta + Meta *meta.Meta } // DefaultProviderConfig return default ProviderConfig struct @@ -291,177 +285,18 @@ func Provider(config *ProviderConfig) plugin.ProviderFunc { return config.Meta, nil } - meta, err := buildMeta(ctx, &metaConfig{ - providerSchema: data, - terraformVersion: terraformVersion, + m, err := meta.NewMeta(ctx, &meta.Config{ + ProviderSchema: data, + TerraformVersion: terraformVersion, }) if err != nil { return nil, diag.FromErr(err) } - return meta, nil + return m, nil } return p } } -// Meta contains config and SDK clients used by resources. -// -// This meta value is passed into all resources. -type Meta struct { - // scwClient is the Scaleway SDK client. - scwClient *scw.Client - // httpClient can be either a regular http.Client used to make real HTTP requests - // or it can be a http.Client used to record and replay cassettes which is useful - // to replay recorded interactions with APIs locally - httpClient *http.Client -} - -type metaConfig struct { - providerSchema *schema.ResourceData - terraformVersion string - forceZone scw.Zone - forceProjectID string - forceOrganizationID string - forceAccessKey string - forceSecretKey string - httpClient *http.Client -} - -// providerConfigure creates the Meta object containing the SDK client. -func buildMeta(ctx context.Context, config *metaConfig) (*Meta, error) { - //// - // Load Profile - //// - profile, err := loadProfile(ctx, config.providerSchema) - if err != nil { - return nil, err - } - if config.forceZone != "" { - region, err := config.forceZone.Region() - if err != nil { - return nil, err - } - profile.DefaultRegion = scw.StringPtr(region.String()) - profile.DefaultZone = scw.StringPtr(config.forceZone.String()) - } - if config.forceProjectID != "" { - profile.DefaultProjectID = scw.StringPtr(config.forceProjectID) - } - if config.forceOrganizationID != "" { - profile.DefaultOrganizationID = scw.StringPtr(config.forceOrganizationID) - } - if config.forceAccessKey != "" { - profile.AccessKey = scw.StringPtr(config.forceAccessKey) - } - if config.forceSecretKey != "" { - profile.SecretKey = scw.StringPtr(config.forceSecretKey) - } - - // TODO validated profile - - //// - // Create scaleway SDK client - //// - opts := []scw.ClientOption{ - scw.WithUserAgent(customizeUserAgent(version.Version, config.terraformVersion)), - scw.WithProfile(profile), - } - - httpClient := &http.Client{Transport: transport.NewRetryableTransport(http.DefaultTransport)} - if config.httpClient != nil { - httpClient = config.httpClient - } - opts = append(opts, scw.WithHTTPClient(httpClient)) - - scwClient, err := scw.NewClient(opts...) - if err != nil { - return nil, err - } - - return &Meta{ - scwClient: scwClient, - httpClient: httpClient, - }, nil -} - -func customizeUserAgent(providerVersion string, terraformVersion string) string { - userAgent := fmt.Sprintf("terraform-provider/%s terraform/%s", providerVersion, terraformVersion) - - if appendUserAgent := os.Getenv(appendUserAgentEnvVar); appendUserAgent != "" { - userAgent += " " + appendUserAgent - } - - return userAgent -} - //gocyclo:ignore -func loadProfile(ctx context.Context, d *schema.ResourceData) (*scw.Profile, error) { - config, err := scw.LoadConfig() - // If the config file do not exist, don't return an error as we may find config in ENV or flags. - if _, isNotFoundError := err.(*scw.ConfigFileNotFoundError); isNotFoundError { - config = &scw.Config{} - } else if err != nil { - return nil, err - } - - // By default we set default zone and region to fr-par - defaultZoneProfile := &scw.Profile{ - DefaultRegion: scw.StringPtr(scw.RegionFrPar.String()), - DefaultZone: scw.StringPtr(scw.ZoneFrPar1.String()), - } - - activeProfile, err := config.GetActiveProfile() - if err != nil { - return nil, err - } - envProfile := scw.LoadEnvProfile() - - providerProfile := &scw.Profile{} - if d != nil { - if profileName, exist := d.GetOk("profile"); exist { - profileFromConfig, err := config.GetProfile(profileName.(string)) - if err == nil { - providerProfile = profileFromConfig - } - } - if accessKey, exist := d.GetOk("access_key"); exist { - providerProfile.AccessKey = scw.StringPtr(accessKey.(string)) - } - if secretKey, exist := d.GetOk("secret_key"); exist { - providerProfile.SecretKey = scw.StringPtr(secretKey.(string)) - } - if projectID, exist := d.GetOk("project_id"); exist { - providerProfile.DefaultProjectID = scw.StringPtr(projectID.(string)) - } - if orgID, exist := d.GetOk("organization_id"); exist { - providerProfile.DefaultOrganizationID = scw.StringPtr(orgID.(string)) - } - if region, exist := d.GetOk("region"); exist { - providerProfile.DefaultRegion = scw.StringPtr(region.(string)) - } - if zone, exist := d.GetOk("zone"); exist { - providerProfile.DefaultZone = scw.StringPtr(zone.(string)) - } - if apiURL, exist := d.GetOk("api_url"); exist { - providerProfile.APIURL = scw.StringPtr(apiURL.(string)) - } - } - - profile := scw.MergeProfiles(defaultZoneProfile, activeProfile, providerProfile, envProfile) - - // If profile have a defaultZone but no defaultRegion we set the defaultRegion - // to the one of the defaultZone - if profile.DefaultZone != nil && *profile.DefaultZone != "" && - (profile.DefaultRegion == nil || *profile.DefaultRegion == "") { - zone := scw.Zone(*profile.DefaultZone) - tflog.Debug(ctx, fmt.Sprintf("guess region from %s zone", zone)) - region, err := zone.Region() - if err == nil { - profile.DefaultRegion = scw.StringPtr(region.String()) - } else { - tflog.Debug(ctx, "cannot guess region: "+err.Error()) - } - } - return profile, nil -} diff --git a/scaleway/provider_test.go b/scaleway/provider_test.go index 38178be91..f0b6ac6d3 100644 --- a/scaleway/provider_test.go +++ b/scaleway/provider_test.go @@ -25,6 +25,7 @@ import ( iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/scaleway-sdk-go/strcase" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" "github.com/stretchr/testify/require" ) @@ -350,7 +351,7 @@ func createFakeSideProject(tt *TestTools) (*accountV3.Project, *iam.APIKey, Fake iamApplicationName := sdkacctest.RandomWithPrefix("test-acc-scaleway-iam-app") iamPolicyName := sdkacctest.RandomWithPrefix("test-acc-scaleway-iam-policy") - projectAPI := accountV3.NewProjectAPI(tt.Meta.scwClient) + projectAPI := accountV3.NewProjectAPI(tt.Meta.ScwClient()) project, err := projectAPI.CreateProject(&accountV3.ProjectAPICreateProjectRequest{ Name: projectName, }) @@ -367,7 +368,7 @@ func createFakeSideProject(tt *TestTools) (*accountV3.Project, *iam.APIKey, Fake }) }) - iamAPI := iam.NewAPI(tt.Meta.scwClient) + iamAPI := iam.NewAPI(tt.Meta.ScwClient()) iamApplication, err := iamAPI.CreateApplication(&iam.CreateApplicationRequest{ Name: iamApplicationName, }) @@ -447,7 +448,7 @@ func createFakeIAMManager(tt *TestTools) (*accountV3.Project, *iam.APIKey, FakeS iamApplicationName := sdkacctest.RandomWithPrefix("test-acc-scaleway-iam-app") iamPolicyName := sdkacctest.RandomWithPrefix("test-acc-scaleway-iam-policy") - projectAPI := accountV3.NewProjectAPI(tt.Meta.scwClient) + projectAPI := accountV3.NewProjectAPI(tt.Meta.ScwClient()) project, err := projectAPI.CreateProject(&accountV3.ProjectAPICreateProjectRequest{ Name: projectName, }) @@ -464,7 +465,7 @@ func createFakeIAMManager(tt *TestTools) (*accountV3.Project, *iam.APIKey, FakeS }) }) - iamAPI := iam.NewAPI(tt.Meta.scwClient) + iamAPI := iam.NewAPI(tt.Meta.ScwClient()) iamApplication, err := iamAPI.CreateApplication(&iam.CreateApplicationRequest{ Name: iamApplicationName, }) @@ -524,20 +525,20 @@ func createFakeIAMManager(tt *TestTools) (*accountV3.Project, *iam.APIKey, FakeS return project, iamAPIKey, terminate, nil } -// fakeSideProjectProviders creates a new provider alias "side" with a new metaConfig that will use the +// fakeSideProjectProviders creates a new provider alias "side" with a new Config that will use the // given project and API key as default profile configuration. // // This is useful to test resources that need to create resources in another project. func fakeSideProjectProviders(ctx context.Context, tt *TestTools, project *accountV3.Project, iamAPIKey *iam.APIKey) map[string]func() (*schema.Provider, error) { t := tt.T - metaSide, err := buildMeta(ctx, &metaConfig{ - terraformVersion: "terraform-tests", - httpClient: tt.Meta.httpClient, - forceProjectID: project.ID, - forceOrganizationID: project.OrganizationID, - forceAccessKey: iamAPIKey.AccessKey, - forceSecretKey: *iamAPIKey.SecretKey, + metaSide, err := meta.NewMeta(ctx, &meta.Config{ + TerraformVersion: "terraform-tests", + HTTPClient: tt.Meta.HTTPClient(), + ForceProjectID: project.ID, + ForceOrganizationID: project.OrganizationID, + ForceAccessKey: iamAPIKey.AccessKey, + ForceSecretKey: *iamAPIKey.SecretKey, }) require.NoError(t, err) @@ -556,7 +557,7 @@ func fakeSideProjectProviders(ctx context.Context, tt *TestTools, project *accou type TestTools struct { T *testing.T - Meta *Meta + Meta *meta.Meta ProviderFactories map[string]func() (*schema.Provider, error) Cleanup func() } @@ -569,10 +570,10 @@ func NewTestTools(t *testing.T) *TestTools { require.NoError(t, err) // Create meta that will be passed in the provider config - meta, err := buildMeta(ctx, &metaConfig{ - providerSchema: nil, - terraformVersion: "terraform-tests", - httpClient: httpClient, + meta, err := meta.NewMeta(ctx, &meta.Config{ + ProviderSchema: nil, + TerraformVersion: "terraform-tests", + HTTPClient: httpClient, }) require.NoError(t, err) @@ -605,15 +606,15 @@ func TestAccScalewayProvider_SSHKeys(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProviderFactories: func() map[string]func() (*schema.Provider, error) { - metaProd, err := buildMeta(ctx, &metaConfig{ - terraformVersion: "terraform-tests", - httpClient: tt.Meta.httpClient, + metaProd, err := meta.NewMeta(ctx, &meta.Config{ + TerraformVersion: "terraform-tests", + HTTPClient: tt.Meta.HTTPClient(), }) require.NoError(t, err) - metaDev, err := buildMeta(ctx, &metaConfig{ - terraformVersion: "terraform-tests", - httpClient: tt.Meta.httpClient, + metaDev, err := meta.NewMeta(ctx, &meta.Config{ + TerraformVersion: "terraform-tests", + HTTPClient: tt.Meta.HTTPClient(), }) require.NoError(t, err) @@ -660,17 +661,17 @@ func TestAccScalewayProvider_InstanceIPZones(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProviderFactories: func() map[string]func() (*schema.Provider, error) { - metaProd, err := buildMeta(ctx, &metaConfig{ - terraformVersion: "terraform-tests", - forceZone: scw.ZoneFrPar2, - httpClient: tt.Meta.httpClient, + metaProd, err := meta.NewMeta(ctx, &meta.Config{ + TerraformVersion: "terraform-tests", + ForceZone: scw.ZoneFrPar2, + HTTPClient: tt.Meta.HTTPClient(), }) require.NoError(t, err) - metaDev, err := buildMeta(ctx, &metaConfig{ - terraformVersion: "terraform-tests", - forceZone: scw.ZoneFrPar1, - httpClient: tt.Meta.httpClient, + metaDev, err := meta.NewMeta(ctx, &meta.Config{ + TerraformVersion: "terraform-tests", + ForceZone: scw.ZoneFrPar1, + HTTPClient: tt.Meta.HTTPClient(), }) require.NoError(t, err) diff --git a/scaleway/resource_account_project.go b/scaleway/resource_account_project.go index 95ca7262c..60bea67d1 100644 --- a/scaleway/resource_account_project.go +++ b/scaleway/resource_account_project.go @@ -53,8 +53,8 @@ func resourceScalewayAccountProject() *schema.Resource { } } -func resourceScalewayAccountProjectCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - accountAPI := accountV3ProjectAPI(meta) +func resourceScalewayAccountProjectCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + accountAPI := accountV3ProjectAPI(m) request := &accountV3.ProjectAPICreateProjectRequest{ Name: expandOrGenerateString(d.Get("name"), "project"), @@ -72,11 +72,11 @@ func resourceScalewayAccountProjectCreate(ctx context.Context, d *schema.Resourc d.SetId(res.ID) - return resourceScalewayAccountProjectRead(ctx, d, meta) + return resourceScalewayAccountProjectRead(ctx, d, m) } -func resourceScalewayAccountProjectRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - accountAPI := accountV3ProjectAPI(meta) +func resourceScalewayAccountProjectRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + accountAPI := accountV3ProjectAPI(m) res, err := accountAPI.GetProject(&accountV3.ProjectAPIGetProjectRequest{ ProjectID: d.Id(), }, scw.WithContext(ctx)) @@ -97,8 +97,8 @@ func resourceScalewayAccountProjectRead(ctx context.Context, d *schema.ResourceD return nil } -func resourceScalewayAccountProjectUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - accountAPI := accountV3ProjectAPI(meta) +func resourceScalewayAccountProjectUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + accountAPI := accountV3ProjectAPI(m) req := &accountV3.ProjectAPIUpdateProjectRequest{ ProjectID: d.Id(), @@ -122,11 +122,11 @@ func resourceScalewayAccountProjectUpdate(ctx context.Context, d *schema.Resourc } } - return resourceScalewayAccountProjectRead(ctx, d, meta) + return resourceScalewayAccountProjectRead(ctx, d, m) } -func resourceScalewayAccountProjectDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - accountAPI := accountV3ProjectAPI(meta) +func resourceScalewayAccountProjectDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + accountAPI := accountV3ProjectAPI(m) err := accountAPI.DeleteProject(&accountV3.ProjectAPIDeleteProjectRequest{ ProjectID: d.Id(), diff --git a/scaleway/resource_apple_silicon_server.go b/scaleway/resource_apple_silicon_server.go index 8a1f21252..ba34388d1 100644 --- a/scaleway/resource_apple_silicon_server.go +++ b/scaleway/resource_apple_silicon_server.go @@ -78,8 +78,8 @@ func resourceScalewayAppleSiliconServer() *schema.Resource { } } -func resourceScalewayAppleSiliconServerCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - asAPI, zone, err := asAPIWithZone(d, meta) +func resourceScalewayAppleSiliconServerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + asAPI, zone, err := asAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -102,11 +102,11 @@ func resourceScalewayAppleSiliconServerCreate(ctx context.Context, d *schema.Res return diag.FromErr(err) } - return resourceScalewayAppleSiliconServerRead(ctx, d, meta) + return resourceScalewayAppleSiliconServerRead(ctx, d, m) } -func resourceScalewayAppleSiliconServerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - asAPI, zone, ID, err := asAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayAppleSiliconServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + asAPI, zone, ID, err := asAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -139,8 +139,8 @@ func resourceScalewayAppleSiliconServerRead(ctx context.Context, d *schema.Resou return nil } -func resourceScalewayAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - asAPI, zone, ID, err := asAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + asAPI, zone, ID, err := asAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -159,11 +159,11 @@ func resourceScalewayAppleSiliconServerUpdate(ctx context.Context, d *schema.Res return diag.FromErr(err) } - return resourceScalewayAppleSiliconServerRead(ctx, d, meta) + return resourceScalewayAppleSiliconServerRead(ctx, d, m) } -func resourceScalewayAppleSiliconServerDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - asAPI, zone, ID, err := asAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayAppleSiliconServerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + asAPI, zone, ID, err := asAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_baremetal_server.go b/scaleway/resource_baremetal_server.go index 78f2fdf03..59af7b73e 100644 --- a/scaleway/resource_baremetal_server.go +++ b/scaleway/resource_baremetal_server.go @@ -273,13 +273,13 @@ func resourceScalewayBaremetalServerIP() *schema.Resource { } } -func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - baremetalAPI, zone, err := baremetalAPIWithZone(d, meta) +func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + baremetalAPI, zone, err := baremetalAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } - baremetalPrivateNetworkAPI, _, err := baremetalPrivateNetworkAPIWithZone(d, meta) + baremetalPrivateNetworkAPI, _, err := baremetalPrivateNetworkAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -297,7 +297,7 @@ func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.Resour } if !d.Get("install_config_afterward").(bool) { - if diags := validateInstallConfig(ctx, d, meta); len(diags) > 0 { + if diags := validateInstallConfig(ctx, d, m); len(diags) > 0 { return diags } } @@ -384,16 +384,16 @@ func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.Resour } } - return resourceScalewayBaremetalServerRead(ctx, d, meta) + return resourceScalewayBaremetalServerRead(ctx, d, m) } -func resourceScalewayBaremetalServerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayBaremetalServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } - baremetalPrivateNetworkAPI, _, err := baremetalPrivateNetworkAPIWithZone(d, meta) + baremetalPrivateNetworkAPI, _, err := baremetalPrivateNetworkAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -468,13 +468,13 @@ func resourceScalewayBaremetalServerRead(ctx context.Context, d *schema.Resource } //gocyclo:ignore -func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } - baremetalPrivateNetworkAPI, zone, err := baremetalPrivateNetworkAPIWithZone(d, meta) + baremetalPrivateNetworkAPI, zone, err := baremetalPrivateNetworkAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -590,7 +590,7 @@ func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.Resour } if d.HasChange("os") { - if diags := validateInstallConfig(ctx, d, meta); len(diags) > 0 { + if diags := validateInstallConfig(ctx, d, m); len(diags) > 0 { return diags } err = baremetalInstallServer(ctx, d, baremetalAPI, installReq) @@ -615,7 +615,7 @@ func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.Resour "If this behaviour is wanted, please set 'reinstall_on_config_changes' argument to true", }) } else { - if diags := validateInstallConfig(ctx, d, meta); len(diags) > 0 { + if diags := validateInstallConfig(ctx, d, m); len(diags) > 0 { return diags } err = baremetalInstallServer(ctx, d, baremetalAPI, installReq) @@ -630,16 +630,16 @@ func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.Resour } } - return append(diags, resourceScalewayBaremetalServerRead(ctx, d, meta)...) + return append(diags, resourceScalewayBaremetalServerRead(ctx, d, m)...) } -func resourceScalewayBaremetalServerDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayBaremetalServerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + baremetalAPI, zonedID, err := baremetalAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } - err = detachAllPrivateNetworkFromBaremetal(ctx, d, meta, zonedID.ID) + err = detachAllPrivateNetworkFromBaremetal(ctx, d, m, zonedID.ID) if err != nil { return diag.FromErr(err) } @@ -673,8 +673,8 @@ func baremetalInstallAttributeMissing(field *baremetal.OSOSField, d *schema.Reso } // validateInstallConfig validates that schema contains attribute required for OS install -func validateInstallConfig(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - baremetalAPI, zone, err := baremetalAPIWithZone(d, meta) +func validateInstallConfig(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + baremetalAPI, zone, err := baremetalAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_block_snapshot.go b/scaleway/resource_block_snapshot.go index 8f4f89ff1..2ec3196f6 100644 --- a/scaleway/resource_block_snapshot.go +++ b/scaleway/resource_block_snapshot.go @@ -55,8 +55,8 @@ func resourceScalewayBlockSnapshot() *schema.Resource { } } -func resourceScalewayBlockSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := blockAPIWithZone(d, meta) +func resourceScalewayBlockSnapshotCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := blockAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -79,11 +79,11 @@ func resourceScalewayBlockSnapshotCreate(ctx context.Context, d *schema.Resource return diag.FromErr(err) } - return resourceScalewayBlockSnapshotRead(ctx, d, meta) + return resourceScalewayBlockSnapshotRead(ctx, d, m) } -func resourceScalewayBlockSnapshotRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, id, err := blockAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayBlockSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, id, err := blockAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -110,8 +110,8 @@ func resourceScalewayBlockSnapshotRead(ctx context.Context, d *schema.ResourceDa return nil } -func resourceScalewayBlockSnapshotUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, id, err := blockAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayBlockSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, id, err := blockAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -142,11 +142,11 @@ func resourceScalewayBlockSnapshotUpdate(ctx context.Context, d *schema.Resource return diag.FromErr(err) } - return resourceScalewayBlockSnapshotRead(ctx, d, meta) + return resourceScalewayBlockSnapshotRead(ctx, d, m) } -func resourceScalewayBlockSnapshotDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, id, err := blockAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayBlockSnapshotDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, id, err := blockAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_block_volume.go b/scaleway/resource_block_volume.go index b0aed8d23..411d9458e 100644 --- a/scaleway/resource_block_volume.go +++ b/scaleway/resource_block_volume.go @@ -73,8 +73,8 @@ func resourceScalewayBlockVolume() *schema.Resource { } } -func resourceScalewayBlockVolumeCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := blockAPIWithZone(d, meta) +func resourceScalewayBlockVolumeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := blockAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -116,11 +116,11 @@ func resourceScalewayBlockVolumeCreate(ctx context.Context, d *schema.ResourceDa return diag.FromErr(err) } - return resourceScalewayBlockVolumeRead(ctx, d, meta) + return resourceScalewayBlockVolumeRead(ctx, d, m) } -func resourceScalewayBlockVolumeRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, id, err := blockAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayBlockVolumeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, id, err := blockAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -153,8 +153,8 @@ func resourceScalewayBlockVolumeRead(ctx context.Context, d *schema.ResourceData return nil } -func resourceScalewayBlockVolumeUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, id, err := blockAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayBlockVolumeUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, id, err := blockAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -190,11 +190,11 @@ func resourceScalewayBlockVolumeUpdate(ctx context.Context, d *schema.ResourceDa return diag.FromErr(err) } - return resourceScalewayBlockVolumeRead(ctx, d, meta) + return resourceScalewayBlockVolumeRead(ctx, d, m) } -func resourceScalewayBlockVolumeDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, id, err := blockAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayBlockVolumeDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, id, err := blockAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_cockpit.go b/scaleway/resource_cockpit.go index 5105fec49..4c8f082b4 100644 --- a/scaleway/resource_cockpit.go +++ b/scaleway/resource_cockpit.go @@ -93,8 +93,8 @@ func resourceScalewayCockpit() *schema.Resource { } } -func resourceScalewayCockpitCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, err := cockpitAPI(meta) +func resourceScalewayCockpitCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, err := cockpitAPI(m) if err != nil { return diag.FromErr(err) } @@ -138,11 +138,11 @@ func resourceScalewayCockpitCreate(ctx context.Context, d *schema.ResourceData, } d.SetId(res.ProjectID) - return resourceScalewayCockpitRead(ctx, d, meta) + return resourceScalewayCockpitRead(ctx, d, m) } -func resourceScalewayCockpitRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, err := cockpitAPI(meta) +func resourceScalewayCockpitRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, err := cockpitAPI(m) if err != nil { return diag.FromErr(err) } @@ -164,8 +164,8 @@ func resourceScalewayCockpitRead(ctx context.Context, d *schema.ResourceData, me return nil } -func resourceScalewayCockpitUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, err := cockpitAPI(meta) +func resourceScalewayCockpitUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, err := cockpitAPI(m) if err != nil { return diag.FromErr(err) } @@ -208,11 +208,11 @@ func resourceScalewayCockpitUpdate(ctx context.Context, d *schema.ResourceData, } } - return resourceScalewayCockpitRead(ctx, d, meta) + return resourceScalewayCockpitRead(ctx, d, m) } -func resourceScalewayCockpitDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, err := cockpitAPI(meta) +func resourceScalewayCockpitDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, err := cockpitAPI(m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_cockpit_grafana_user.go b/scaleway/resource_cockpit_grafana_user.go index 21e1623a1..2426a3a79 100644 --- a/scaleway/resource_cockpit_grafana_user.go +++ b/scaleway/resource_cockpit_grafana_user.go @@ -55,8 +55,8 @@ func resourceScalewayCockpitGrafanaUser() *schema.Resource { } } -func resourceScalewayCockpitGrafanaUserCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, err := cockpitAPI(meta) +func resourceScalewayCockpitGrafanaUserCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, err := cockpitAPI(m) if err != nil { return diag.FromErr(err) } @@ -83,11 +83,11 @@ func resourceScalewayCockpitGrafanaUserCreate(ctx context.Context, d *schema.Res _ = d.Set("password", grafanaUser.Password) d.SetId(cockpitIDWithProjectID(projectID, strconv.FormatUint(uint64(grafanaUser.ID), 10))) - return resourceScalewayCockpitGrafanaUserRead(ctx, d, meta) + return resourceScalewayCockpitGrafanaUserRead(ctx, d, m) } -func resourceScalewayCockpitGrafanaUserRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, projectID, grafanaUserID, err := cockpitAPIGrafanaUserID(meta, d.Id()) +func resourceScalewayCockpitGrafanaUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, projectID, grafanaUserID, err := cockpitAPIGrafanaUserID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -134,8 +134,8 @@ func resourceScalewayCockpitGrafanaUserRead(ctx context.Context, d *schema.Resou return nil } -func resourceScalewayCockpitGrafanaUserDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, projectID, grafanaUserID, err := cockpitAPIGrafanaUserID(meta, d.Id()) +func resourceScalewayCockpitGrafanaUserDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, projectID, grafanaUserID, err := cockpitAPIGrafanaUserID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_cockpit_token.go b/scaleway/resource_cockpit_token.go index ea2219947..400ebb139 100644 --- a/scaleway/resource_cockpit_token.go +++ b/scaleway/resource_cockpit_token.go @@ -121,8 +121,8 @@ func resourceScalewayCockpitTokenScopes() *schema.Resource { } } -func resourceScalewayCockpitTokenCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, err := cockpitAPI(meta) +func resourceScalewayCockpitTokenCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, err := cockpitAPI(m) if err != nil { return diag.FromErr(err) } @@ -159,11 +159,11 @@ func resourceScalewayCockpitTokenCreate(ctx context.Context, d *schema.ResourceD _ = d.Set("secret_key", res.SecretKey) d.SetId(res.ID) - return resourceScalewayCockpitTokenRead(ctx, d, meta) + return resourceScalewayCockpitTokenRead(ctx, d, m) } -func resourceScalewayCockpitTokenRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, err := cockpitAPI(meta) +func resourceScalewayCockpitTokenRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, err := cockpitAPI(m) if err != nil { return diag.FromErr(err) } @@ -186,8 +186,8 @@ func resourceScalewayCockpitTokenRead(ctx context.Context, d *schema.ResourceDat return nil } -func resourceScalewayCockpitTokenDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, err := cockpitAPI(meta) +func resourceScalewayCockpitTokenDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, err := cockpitAPI(m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_container.go b/scaleway/resource_container.go index 09f79f2a7..d8e72b2b9 100644 --- a/scaleway/resource_container.go +++ b/scaleway/resource_container.go @@ -191,8 +191,8 @@ func resourceScalewayContainer() *schema.Resource { } } -func resourceScalewayContainerCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := containerAPIWithRegion(d, meta) +func resourceScalewayContainerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := containerAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -240,11 +240,11 @@ func resourceScalewayContainerCreate(ctx context.Context, d *schema.ResourceData d.SetId(regional.NewIDString(region, res.ID)) - return resourceScalewayContainerRead(ctx, d, meta) + return resourceScalewayContainerRead(ctx, d, m) } -func resourceScalewayContainerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, containerID, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, containerID, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -283,8 +283,8 @@ func resourceScalewayContainerRead(ctx context.Context, d *schema.ResourceData, return nil } -func resourceScalewayContainerUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, containerID, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, containerID, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -384,11 +384,11 @@ func resourceScalewayContainerUpdate(ctx context.Context, d *schema.ResourceData return diag.FromErr(err) } - return resourceScalewayContainerRead(ctx, d, meta) + return resourceScalewayContainerRead(ctx, d, m) } -func resourceScalewayContainerDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, containerID, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, containerID, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_container_cron.go b/scaleway/resource_container_cron.go index df135124d..bd00cf4b2 100644 --- a/scaleway/resource_container_cron.go +++ b/scaleway/resource_container_cron.go @@ -64,8 +64,8 @@ func resourceScalewayContainerCron() *schema.Resource { } } -func resourceScalewayContainerCronCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := containerAPIWithRegion(d, meta) +func resourceScalewayContainerCronCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := containerAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -99,11 +99,11 @@ func resourceScalewayContainerCronCreate(ctx context.Context, d *schema.Resource d.SetId(regional.NewIDString(region, res.ID)) - return resourceScalewayContainerCronRead(ctx, d, meta) + return resourceScalewayContainerCronRead(ctx, d, m) } -func resourceScalewayContainerCronRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, containerCronID, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerCronRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, containerCronID, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -131,8 +131,8 @@ func resourceScalewayContainerCronRead(ctx context.Context, d *schema.ResourceDa return nil } -func resourceScalewayContainerCronUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, containerCronID, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerCronUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, containerCronID, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -177,11 +177,11 @@ func resourceScalewayContainerCronUpdate(ctx context.Context, d *schema.Resource } tflog.Info(ctx, "[INFO] cron job ready") - return resourceScalewayContainerCronRead(ctx, d, meta) + return resourceScalewayContainerCronRead(ctx, d, m) } -func resourceScalewayContainerCronDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, containerCronID, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerCronDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, containerCronID, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_container_domain.go b/scaleway/resource_container_domain.go index 13e39afd3..b17c65a49 100644 --- a/scaleway/resource_container_domain.go +++ b/scaleway/resource_container_domain.go @@ -53,8 +53,8 @@ func resourceScalewayContainerDomain() *schema.Resource { } } -func resourceScalewayContainerDomainCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := containerAPIWithRegion(d, meta) +func resourceScalewayContainerDomainCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := containerAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -85,11 +85,11 @@ func resourceScalewayContainerDomainCreate(ctx context.Context, d *schema.Resour d.SetId(regional.NewIDString(region, domain.ID)) - return resourceScalewayContainerDomainRead(ctx, d, meta) + return resourceScalewayContainerDomainRead(ctx, d, m) } -func resourceScalewayContainerDomainRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, domainID, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerDomainRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, domainID, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -111,8 +111,8 @@ func resourceScalewayContainerDomainRead(ctx context.Context, d *schema.Resource return nil } -func resourceScalewayContainerDomainDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, domainID, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerDomainDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, domainID, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_container_namespace.go b/scaleway/resource_container_namespace.go index 7b77065f9..e32a6eb68 100644 --- a/scaleway/resource_container_namespace.go +++ b/scaleway/resource_container_namespace.go @@ -87,8 +87,8 @@ func resourceScalewayContainerNamespace() *schema.Resource { } } -func resourceScalewayContainerNamespaceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := containerAPIWithRegion(d, meta) +func resourceScalewayContainerNamespaceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := containerAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -112,11 +112,11 @@ func resourceScalewayContainerNamespaceCreate(ctx context.Context, d *schema.Res return diag.FromErr(err) } - return resourceScalewayContainerNamespaceRead(ctx, d, meta) + return resourceScalewayContainerNamespaceRead(ctx, d, m) } -func resourceScalewayContainerNamespaceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -142,8 +142,8 @@ func resourceScalewayContainerNamespaceRead(ctx context.Context, d *schema.Resou return nil } -func resourceScalewayContainerNamespaceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerNamespaceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -174,11 +174,11 @@ func resourceScalewayContainerNamespaceUpdate(ctx context.Context, d *schema.Res return diag.FromErr(err) } - return resourceScalewayContainerNamespaceRead(ctx, d, meta) + return resourceScalewayContainerNamespaceRead(ctx, d, m) } -func resourceScalewayContainerNamespaceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerNamespaceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -208,7 +208,7 @@ func resourceScalewayContainerNamespaceDelete(ctx context.Context, d *schema.Res d.SetId("") if destroy := d.Get("destroy_registry"); destroy != nil && destroy == true { - registryAPI, region, err := registryAPIWithRegion(d, meta) + registryAPI, region, err := registryAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_container_test.go b/scaleway/resource_container_test.go index c5b84255a..4d32a5a68 100644 --- a/scaleway/resource_container_test.go +++ b/scaleway/resource_container_test.go @@ -455,8 +455,8 @@ func testConfigContainerNamespace(tt *TestTools, n string) resource.TestCheckFun meta := tt.Meta var errorMessage ErrorRegistryMessage - accessKey, _ := meta.scwClient.GetAccessKey() - secretKey, _ := meta.scwClient.GetSecretKey() + accessKey, _ := meta.ScwClient().GetAccessKey() + secretKey, _ := meta.ScwClient().GetSecretKey() authConfig := registry.AuthConfig{ ServerAddress: ns.RegistryEndpoint, Username: accessKey, diff --git a/scaleway/resource_container_token.go b/scaleway/resource_container_token.go index 7b3e0feb6..8bb08d339 100644 --- a/scaleway/resource_container_token.go +++ b/scaleway/resource_container_token.go @@ -59,8 +59,8 @@ func resourceScalewayContainerToken() *schema.Resource { } } -func resourceScalewayContainerTokenCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := containerAPIWithRegion(d, meta) +func resourceScalewayContainerTokenCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := containerAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -80,11 +80,11 @@ func resourceScalewayContainerTokenCreate(ctx context.Context, d *schema.Resourc _ = d.Set("token", token.Token) - return resourceScalewayContainerTokenRead(ctx, d, meta) + return resourceScalewayContainerTokenRead(ctx, d, m) } -func resourceScalewayContainerTokenRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, ID, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerTokenRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, ID, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -108,8 +108,8 @@ func resourceScalewayContainerTokenRead(ctx context.Context, d *schema.ResourceD return nil } -func resourceScalewayContainerTokenDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, ID, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerTokenDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, ID, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_container_trigger.go b/scaleway/resource_container_trigger.go index 423ea434f..4b71da85a 100644 --- a/scaleway/resource_container_trigger.go +++ b/scaleway/resource_container_trigger.go @@ -131,8 +131,8 @@ func resourceScalewayContainerTrigger() *schema.Resource { } } -func resourceScalewayContainerTriggerCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := containerAPIWithRegion(d, meta) +func resourceScalewayContainerTriggerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := containerAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -145,7 +145,7 @@ func resourceScalewayContainerTriggerCreate(ctx context.Context, d *schema.Resou } if scwSqs, isScwSqs := d.GetOk("sqs.0"); isScwSqs { - err := completeContainerTriggerMnqCreationConfig(scwSqs, d, meta, region) + err := completeContainerTriggerMnqCreationConfig(scwSqs, d, m, region) if err != nil { return diag.FromErr(fmt.Errorf("failed to complete sqs config: %w", err)) } @@ -155,7 +155,7 @@ func resourceScalewayContainerTriggerCreate(ctx context.Context, d *schema.Resou } if scwNats, isScwNats := d.GetOk("nats.0"); isScwNats { - err := completeContainerTriggerMnqCreationConfig(scwNats, d, meta, region) + err := completeContainerTriggerMnqCreationConfig(scwNats, d, m, region) if err != nil { return diag.FromErr(fmt.Errorf("failed to complete nats config: %w", err)) } @@ -176,11 +176,11 @@ func resourceScalewayContainerTriggerCreate(ctx context.Context, d *schema.Resou return diag.FromErr(err) } - return resourceScalewayContainerTriggerRead(ctx, d, meta) + return resourceScalewayContainerTriggerRead(ctx, d, m) } -func resourceScalewayContainerTriggerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerTriggerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -214,8 +214,8 @@ func resourceScalewayContainerTriggerRead(ctx context.Context, d *schema.Resourc return diags } -func resourceScalewayContainerTriggerUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerTriggerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -246,11 +246,11 @@ func resourceScalewayContainerTriggerUpdate(ctx context.Context, d *schema.Resou return diag.FromErr(err) } - return resourceScalewayContainerTriggerRead(ctx, d, meta) + return resourceScalewayContainerTriggerRead(ctx, d, m) } -func resourceScalewayContainerTriggerDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayContainerTriggerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_document_db_database.go b/scaleway/resource_document_db_database.go index 0adb08ac7..7ddc5732f 100644 --- a/scaleway/resource_document_db_database.go +++ b/scaleway/resource_document_db_database.go @@ -62,8 +62,8 @@ func resourceScalewayDocumentDBDatabase() *schema.Resource { } } -func resourceScalewayDocumentDBDatabaseCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := documentDBAPIWithRegion(d, meta) +func resourceScalewayDocumentDBDatabaseCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -91,7 +91,7 @@ func resourceScalewayDocumentDBDatabaseCreate(ctx context.Context, d *schema.Res return diag.FromErr(err) } - return resourceScalewayDocumentDBDatabaseRead(ctx, d, meta) + return resourceScalewayDocumentDBDatabaseRead(ctx, d, m) } func getDocumentDBDatabase(ctx context.Context, api *documentdb.API, region scw.Region, instanceID string, dbName string) (*documentdb.Database, error) { @@ -111,12 +111,12 @@ func getDocumentDBDatabase(ctx context.Context, api *documentdb.API, region scw. return res.Databases[0], nil } -func resourceScalewayDocumentDBDatabaseRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceScalewayDocumentDBDatabaseRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { instanceLocalizedID, databaseName, err := resourceScalewayDocumentDBDatabaseName(d.Id()) if err != nil { return diag.FromErr(err) } - api, region, instanceID, err := documentDBAPIWithRegionAndID(meta, instanceLocalizedID) + api, region, instanceID, err := documentDBAPIWithRegionAndID(m, instanceLocalizedID) if err != nil { return diag.FromErr(err) } @@ -145,12 +145,12 @@ func resourceScalewayDocumentDBDatabaseRead(ctx context.Context, d *schema.Resou return nil } -func resourceScalewayDocumentDBDatabaseDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceScalewayDocumentDBDatabaseDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { instanceLocalizedID, databaseName, err := resourceScalewayDocumentDBDatabaseName(d.Id()) if err != nil { return diag.FromErr(err) } - api, region, instanceID, err := documentDBAPIWithRegionAndID(meta, instanceLocalizedID) + api, region, instanceID, err := documentDBAPIWithRegionAndID(m, instanceLocalizedID) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_document_db_instance.go b/scaleway/resource_document_db_instance.go index df3327682..6e01ee823 100644 --- a/scaleway/resource_document_db_instance.go +++ b/scaleway/resource_document_db_instance.go @@ -103,8 +103,8 @@ func resourceScalewayDocumentDBInstance() *schema.Resource { } } -func resourceScalewayDocumentDBInstanceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := documentDBAPIWithRegion(d, meta) +func resourceScalewayDocumentDBInstanceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -148,11 +148,11 @@ func resourceScalewayDocumentDBInstanceCreate(ctx context.Context, d *schema.Res return diag.FromErr(err) } - return resourceScalewayDocumentDBInstanceRead(ctx, d, meta) + return resourceScalewayDocumentDBInstanceRead(ctx, d, m) } -func resourceScalewayDocumentDBInstanceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := documentDBAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayDocumentDBInstanceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := documentDBAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -194,8 +194,8 @@ func setInitSettings(d *schema.ResourceData, settings []*documentdb.InstanceSett return nil } -func resourceScalewayDocumentDBInstanceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := documentDBAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayDocumentDBInstanceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := documentDBAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -316,11 +316,11 @@ func resourceScalewayDocumentDBInstanceUpdate(ctx context.Context, d *schema.Res } } - return resourceScalewayDocumentDBInstanceRead(ctx, d, meta) + return resourceScalewayDocumentDBInstanceRead(ctx, d, m) } -func resourceScalewayDocumentDBInstanceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := documentDBAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayDocumentDBInstanceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := documentDBAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_document_db_private_network_endpoint.go b/scaleway/resource_document_db_private_network_endpoint.go index ff637d901..f3e245f7f 100644 --- a/scaleway/resource_document_db_private_network_endpoint.go +++ b/scaleway/resource_document_db_private_network_endpoint.go @@ -77,8 +77,8 @@ func resourceScalewayDocumentDBInstancePrivateNetworkEndpoint() *schema.Resource } } -func resourceScalewayDocumentDBInstanceEndpointCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := documentDBAPIWithRegion(d, meta) +func resourceScalewayDocumentDBInstanceEndpointCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -129,11 +129,11 @@ func resourceScalewayDocumentDBInstanceEndpointCreate(ctx context.Context, d *sc d.SetId(regional.NewIDString(region, endpoint.ID)) - return resourceScalewayDocumentDBInstanceEndpointRead(ctx, d, meta) + return resourceScalewayDocumentDBInstanceEndpointRead(ctx, d, m) } -func resourceScalewayDocumentDBInstanceEndpointRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := documentDBAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayDocumentDBInstanceEndpointRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := documentDBAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -168,8 +168,8 @@ func resourceScalewayDocumentDBInstanceEndpointRead(ctx context.Context, d *sche return nil } -func resourceScalewayDocumentDBInstanceEndpointUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := documentDBAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayDocumentDBInstanceEndpointUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := documentDBAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -192,11 +192,11 @@ func resourceScalewayDocumentDBInstanceEndpointUpdate(ctx context.Context, d *sc } } - return resourceScalewayDocumentDBInstanceEndpointRead(ctx, d, meta) + return resourceScalewayDocumentDBInstanceEndpointRead(ctx, d, m) } -func resourceScalewayDocumentDBInstanceEndpointDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := documentDBAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayDocumentDBInstanceEndpointDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := documentDBAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_document_db_privilege.go b/scaleway/resource_document_db_privilege.go index 2dae10cc9..525a6aa22 100644 --- a/scaleway/resource_document_db_privilege.go +++ b/scaleway/resource_document_db_privilege.go @@ -69,8 +69,8 @@ func resourceScalewayDocumentDBPrivilege() *schema.Resource { } } -func resourceScalewayDocumentDBPrivilegeCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := documentDBAPIWithRegion(d, meta) +func resourceScalewayDocumentDBPrivilegeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -117,11 +117,11 @@ func resourceScalewayDocumentDBPrivilegeCreate(ctx context.Context, d *schema.Re d.SetId(resourceScalewayDocumentDBUserPrivilegeID(region, locality.ExpandID(instanceID), databaseName, userName)) - return resourceScalewayDocumentDBPrivilegeRead(ctx, d, meta) + return resourceScalewayDocumentDBPrivilegeRead(ctx, d, m) } -func resourceScalewayDocumentDBPrivilegeRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, _, err := documentDBAPIWithRegion(d, meta) +func resourceScalewayDocumentDBPrivilegeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, _, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -181,8 +181,8 @@ func resourceScalewayDocumentDBPrivilegeRead(ctx context.Context, d *schema.Reso return nil } -func resourceScalewayDocumentDBPrivilegeUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := documentDBAPIWithRegion(d, meta) +func resourceScalewayDocumentDBPrivilegeUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -250,8 +250,8 @@ func resourceScalewayDocumentDBPrivilegeUpdate(ctx context.Context, d *schema.Re } //gocyclo:ignore -func resourceScalewayDocumentDBPrivilegeDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := documentDBAPIWithRegion(d, meta) +func resourceScalewayDocumentDBPrivilegeDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_document_db_read_replica.go b/scaleway/resource_document_db_read_replica.go index d1e1a2617..11bab568a 100644 --- a/scaleway/resource_document_db_read_replica.go +++ b/scaleway/resource_document_db_read_replica.go @@ -229,8 +229,8 @@ func flattenDocumentDBReadReplicaEndpoints(endpoints []*documentdb.Endpoint) (di return directAccess, privateNetwork } -func resourceScalewayDocumentDBReadReplicaCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := documentDBAPIWithRegion(d, meta) +func resourceScalewayDocumentDBReadReplicaCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -262,11 +262,11 @@ func resourceScalewayDocumentDBReadReplicaCreate(ctx context.Context, d *schema. return diag.FromErr(err) } - return resourceScalewayDocumentDBReadReplicaRead(ctx, d, meta) + return resourceScalewayDocumentDBReadReplicaRead(ctx, d, m) } -func resourceScalewayDocumentDBReadReplicaRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := documentDBAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayDocumentDBReadReplicaRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := documentDBAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -290,8 +290,8 @@ func resourceScalewayDocumentDBReadReplicaRead(ctx context.Context, d *schema.Re } //gocyclo:ignore -func resourceScalewayDocumentDBReadReplicaUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := documentDBAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayDocumentDBReadReplicaUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := documentDBAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -365,11 +365,11 @@ func resourceScalewayDocumentDBReadReplicaUpdate(ctx context.Context, d *schema. return diag.FromErr(err) } - return resourceScalewayDocumentDBReadReplicaRead(ctx, d, meta) + return resourceScalewayDocumentDBReadReplicaRead(ctx, d, m) } -func resourceScalewayDocumentDBReadReplicaDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := documentDBAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayDocumentDBReadReplicaDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := documentDBAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_document_db_user.go b/scaleway/resource_document_db_user.go index b19dee347..47c957184 100644 --- a/scaleway/resource_document_db_user.go +++ b/scaleway/resource_document_db_user.go @@ -64,8 +64,8 @@ func resourceScalewayDocumentDBUser() *schema.Resource { } } -func resourceScalewayDocumentDBUserCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := documentDBAPIWithRegion(d, meta) +func resourceScalewayDocumentDBUserCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -114,11 +114,11 @@ func resourceScalewayDocumentDBUserCreate(ctx context.Context, d *schema.Resourc d.SetId(resourceScalewayDocumentDBUserID(region, locality.ExpandID(instanceID), user.Name)) - return resourceScalewayDocumentDBUserRead(ctx, d, meta) + return resourceScalewayDocumentDBUserRead(ctx, d, m) } -func resourceScalewayDocumentDBUserRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, _, err := documentDBAPIWithRegion(d, meta) +func resourceScalewayDocumentDBUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, _, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -157,8 +157,8 @@ func resourceScalewayDocumentDBUserRead(ctx context.Context, d *schema.ResourceD return nil } -func resourceScalewayDocumentDBUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, _, err := documentDBAPIWithRegion(d, meta) +func resourceScalewayDocumentDBUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, _, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -192,11 +192,11 @@ func resourceScalewayDocumentDBUpdate(ctx context.Context, d *schema.ResourceDat return diag.FromErr(err) } - return resourceScalewayDocumentDBUserRead(ctx, d, meta) + return resourceScalewayDocumentDBUserRead(ctx, d, m) } -func resourceScalewayDocumentDBUserDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := documentDBAPIWithRegion(d, meta) +func resourceScalewayDocumentDBUserDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := documentDBAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_domain_record.go b/scaleway/resource_domain_record.go index df33584e4..64bcf3f15 100644 --- a/scaleway/resource_domain_record.go +++ b/scaleway/resource_domain_record.go @@ -263,8 +263,8 @@ func resourceScalewayDomainRecord() *schema.Resource { } } -func resourceScalewayDomainRecordCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - domainAPI := newDomainAPI(meta) +func resourceScalewayDomainRecordCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + domainAPI := newDomainAPI(m) dnsZone := d.Get("dns_zone").(string) geoIP, okGeoIP := d.GetOk("geo_ip") @@ -325,11 +325,11 @@ func resourceScalewayDomainRecordCreate(ctx context.Context, d *schema.ResourceD d.SetId(recordID) tflog.Debug(ctx, fmt.Sprintf("record ID[%s]", recordID)) - return resourceScalewayDomainRecordRead(ctx, d, meta) + return resourceScalewayDomainRecordRead(ctx, d, m) } -func resourceScalewayDomainRecordRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - domainAPI := newDomainAPI(meta) +func resourceScalewayDomainRecordRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + domainAPI := newDomainAPI(m) var record *domain.Record var dnsZone string var projectID string @@ -435,12 +435,12 @@ func resourceScalewayDomainRecordRead(ctx context.Context, d *schema.ResourceDat return nil } -func resourceScalewayDomainRecordUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceScalewayDomainRecordUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { if !d.HasChanges(changeKeys...) { - return resourceScalewayDomainRecordRead(ctx, d, meta) + return resourceScalewayDomainRecordRead(ctx, d, m) } - domainAPI := newDomainAPI(meta) + domainAPI := newDomainAPI(m) req := &domain.UpdateDNSZoneRecordsRequest{ DNSZone: d.Get("dns_zone").(string), @@ -479,11 +479,11 @@ func resourceScalewayDomainRecordUpdate(ctx context.Context, d *schema.ResourceD return diag.FromErr(err) } - return resourceScalewayDomainRecordRead(ctx, d, meta) + return resourceScalewayDomainRecordRead(ctx, d, m) } -func resourceScalewayDomainRecordDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - domainAPI := newDomainAPI(meta) +func resourceScalewayDomainRecordDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + domainAPI := newDomainAPI(m) recordID := locality.ExpandID(d.Id()) _, err := domainAPI.UpdateDNSZoneRecords(&domain.UpdateDNSZoneRecordsRequest{ diff --git a/scaleway/resource_domain_zone.go b/scaleway/resource_domain_zone.go index 23b867eeb..b37fb47c1 100644 --- a/scaleway/resource_domain_zone.go +++ b/scaleway/resource_domain_zone.go @@ -80,8 +80,8 @@ func resourceScalewayDomainZone() *schema.Resource { } } -func resourceScalewayDomainZoneCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - domainAPI := newDomainAPI(meta) +func resourceScalewayDomainZoneCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + domainAPI := newDomainAPI(m) domainName := strings.ToLower(d.Get("domain").(string)) subdomainName := strings.ToLower(d.Get("subdomain").(string)) @@ -99,7 +99,7 @@ func resourceScalewayDomainZoneCreate(ctx context.Context, d *schema.ResourceDat if zones.DNSZones[i].Domain == domainName && zones.DNSZones[i].Subdomain == subdomainName { d.SetId(fmt.Sprintf("%s.%s", subdomainName, domainName)) - return resourceScalewayDomainZoneRead(ctx, d, meta) + return resourceScalewayDomainZoneRead(ctx, d, m) } } @@ -112,17 +112,17 @@ func resourceScalewayDomainZoneCreate(ctx context.Context, d *schema.ResourceDat }, scw.WithContext(ctx)) if err != nil { if is409Error(err) { - return resourceScalewayDomainZoneRead(ctx, d, meta) + return resourceScalewayDomainZoneRead(ctx, d, m) } return diag.FromErr(err) } d.SetId(fmt.Sprintf("%s.%s", dnsZone.Subdomain, dnsZone.Domain)) - return resourceScalewayDomainZoneRead(ctx, d, meta) + return resourceScalewayDomainZoneRead(ctx, d, m) } -func resourceScalewayDomainZoneRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - domainAPI := newDomainAPI(meta) +func resourceScalewayDomainZoneRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + domainAPI := newDomainAPI(m) var zone *domain.DNSZone @@ -161,8 +161,8 @@ func resourceScalewayDomainZoneRead(ctx context.Context, d *schema.ResourceData, return nil } -func resourceScalewayDomainZoneUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - domainAPI := newDomainAPI(meta) +func resourceScalewayDomainZoneUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + domainAPI := newDomainAPI(m) if d.HasChangesExcept("subdomain") { _, err := domainAPI.UpdateDNSZone(&domain.UpdateDNSZoneRequest{ @@ -174,11 +174,11 @@ func resourceScalewayDomainZoneUpdate(ctx context.Context, d *schema.ResourceDat return diag.FromErr(err) } } - return resourceScalewayDomainZoneRead(ctx, d, meta) + return resourceScalewayDomainZoneRead(ctx, d, m) } -func resourceScalewayDomainZoneDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - domainAPI := newDomainAPI(meta) +func resourceScalewayDomainZoneDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + domainAPI := newDomainAPI(m) _, err := waitForDNSZone(ctx, domainAPI, d.Id(), d.Timeout(schema.TimeoutDelete)) if err != nil { diff --git a/scaleway/resource_flexible_ip.go b/scaleway/resource_flexible_ip.go index 099c3564f..a359cf9f8 100644 --- a/scaleway/resource_flexible_ip.go +++ b/scaleway/resource_flexible_ip.go @@ -88,8 +88,8 @@ func resourceScalewayFlexibleIP() *schema.Resource { } } -func resourceScalewayFlexibleIPCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - fipAPI, zone, err := fipAPIWithZone(d, meta) +func resourceScalewayFlexibleIPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -113,11 +113,11 @@ func resourceScalewayFlexibleIPCreate(ctx context.Context, d *schema.ResourceDat if err != nil { return diag.FromErr(err) } - return resourceScalewayFlexibleIPRead(ctx, d, meta) + return resourceScalewayFlexibleIPRead(ctx, d, m) } -func resourceScalewayFlexibleIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - fipAPI, zone, ID, err := fipAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayFlexibleIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + fipAPI, zone, ID, err := fipAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -160,8 +160,8 @@ func resourceScalewayFlexibleIPRead(ctx context.Context, d *schema.ResourceData, return nil } -func resourceScalewayFlexibleIPUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - fipAPI, zone, ID, err := fipAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayFlexibleIPUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + fipAPI, zone, ID, err := fipAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -230,11 +230,11 @@ func resourceScalewayFlexibleIPUpdate(ctx context.Context, d *schema.ResourceDat return diag.FromErr(err) } - return resourceScalewayFlexibleIPRead(ctx, d, meta) + return resourceScalewayFlexibleIPRead(ctx, d, m) } -func resourceScalewayFlexibleIPDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - fipAPI, zone, ID, err := fipAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayFlexibleIPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + fipAPI, zone, ID, err := fipAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_flexible_ip_mac_address.go b/scaleway/resource_flexible_ip_mac_address.go index 7ab85173a..b34b1447d 100644 --- a/scaleway/resource_flexible_ip_mac_address.go +++ b/scaleway/resource_flexible_ip_mac_address.go @@ -83,8 +83,8 @@ func resourceScalewayFlexibleIPMACAddress() *schema.Resource { } } -func resourceScalewayFlexibleIPMACCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - fipAPI, zone, err := fipAPIWithZone(d, meta) +func resourceScalewayFlexibleIPMACCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -132,11 +132,11 @@ func resourceScalewayFlexibleIPMACCreate(ctx context.Context, d *schema.Resource } } - return resourceScalewayFlexibleIPMACRead(ctx, d, meta) + return resourceScalewayFlexibleIPMACRead(ctx, d, m) } -func resourceScalewayFlexibleIPMACRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - fipAPI, zone, err := fipAPIWithZone(d, meta) +func resourceScalewayFlexibleIPMACRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -168,8 +168,8 @@ func resourceScalewayFlexibleIPMACRead(ctx context.Context, d *schema.ResourceDa return nil } -func resourceScalewayFlexibleIPMACUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - fipAPI, zone, err := fipAPIWithZone(d, meta) +func resourceScalewayFlexibleIPMACUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -248,11 +248,11 @@ func resourceScalewayFlexibleIPMACUpdate(ctx context.Context, d *schema.Resource return diag.FromErr(err) } - return resourceScalewayFlexibleIPMACRead(ctx, d, meta) + return resourceScalewayFlexibleIPMACRead(ctx, d, m) } -func resourceScalewayFlexibleIPMACDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - fipAPI, zone, err := fipAPIWithZone(d, meta) +func resourceScalewayFlexibleIPMACDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + fipAPI, zone, err := fipAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_function.go b/scaleway/resource_function.go index 3e43adafa..7593ab968 100644 --- a/scaleway/resource_function.go +++ b/scaleway/resource_function.go @@ -161,8 +161,8 @@ func resourceScalewayFunction() *schema.Resource { } } -func resourceScalewayFunctionCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := functionAPIWithRegion(d, meta) +func resourceScalewayFunctionCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -200,7 +200,7 @@ func resourceScalewayFunctionCreate(ctx context.Context, d *schema.ResourceData, var diags diag.Diagnostics if zipFile, zipFileExists := d.GetOk("zip_file"); zipFileExists { - err = functionUpload(ctx, meta, api, region, f.ID, zipFile.(string)) + err = functionUpload(ctx, m, api, region, f.ID, zipFile.(string)) if err != nil { diags = append(diags, diag.Diagnostic{ Severity: diag.Error, @@ -245,11 +245,11 @@ func resourceScalewayFunctionCreate(ctx context.Context, d *schema.ResourceData, return diag.FromErr(err) } - return append(diags, resourceScalewayFunctionRead(ctx, d, meta)...) + return append(diags, resourceScalewayFunctionRead(ctx, d, m)...) } -func resourceScalewayFunctionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -300,8 +300,8 @@ func resourceScalewayFunctionRead(ctx context.Context, d *schema.ResourceData, m return diags } -func resourceScalewayFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -386,7 +386,7 @@ func resourceScalewayFunctionUpdate(ctx context.Context, d *schema.ResourceData, shouldDeploy := d.Get("deploy").(bool) if zipHasChanged { - err = functionUpload(ctx, meta, api, region, f.ID, d.Get("zip_file").(string)) + err = functionUpload(ctx, m, api, region, f.ID, d.Get("zip_file").(string)) if err != nil { return diag.FromErr(fmt.Errorf("failed to upload function: %w", err)) } @@ -403,11 +403,11 @@ func resourceScalewayFunctionUpdate(ctx context.Context, d *schema.ResourceData, } } - return resourceScalewayFunctionRead(ctx, d, meta) + return resourceScalewayFunctionRead(ctx, d, m) } -func resourceScalewayFunctionDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_function_cron.go b/scaleway/resource_function_cron.go index 5b820b176..36a4704a6 100644 --- a/scaleway/resource_function_cron.go +++ b/scaleway/resource_function_cron.go @@ -62,8 +62,8 @@ func resourceScalewayFunctionCron() *schema.Resource { } } -func resourceScalewayFunctionCronCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := functionAPIWithRegion(d, meta) +func resourceScalewayFunctionCronCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -101,11 +101,11 @@ func resourceScalewayFunctionCronCreate(ctx context.Context, d *schema.ResourceD d.SetId(regional.NewIDString(region, cron.ID)) - return resourceScalewayFunctionCronRead(ctx, d, meta) + return resourceScalewayFunctionCronRead(ctx, d, m) } -func resourceScalewayFunctionCronRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionCronRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -133,8 +133,8 @@ func resourceScalewayFunctionCronRead(ctx context.Context, d *schema.ResourceDat return nil } -func resourceScalewayFunctionCronUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionCronUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -174,11 +174,11 @@ func resourceScalewayFunctionCronUpdate(ctx context.Context, d *schema.ResourceD } } - return resourceScalewayFunctionCronRead(ctx, d, meta) + return resourceScalewayFunctionCronRead(ctx, d, m) } -func resourceScalewayFunctionCronDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionCronDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_function_domain.go b/scaleway/resource_function_domain.go index 32797c75b..4dd904a57 100644 --- a/scaleway/resource_function_domain.go +++ b/scaleway/resource_function_domain.go @@ -52,8 +52,8 @@ func resourceScalewayFunctionDomain() *schema.Resource { } } -func resourceScalewayFunctionDomainCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := functionAPIWithRegion(d, meta) +func resourceScalewayFunctionDomainCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -84,11 +84,11 @@ func resourceScalewayFunctionDomainCreate(ctx context.Context, d *schema.Resourc return diag.FromErr(err) } - return resourceScalewayFunctionDomainRead(ctx, d, meta) + return resourceScalewayFunctionDomainRead(ctx, d, m) } -func resourceScalewayFunctionDomainRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionDomainRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -110,8 +110,8 @@ func resourceScalewayFunctionDomainRead(ctx context.Context, d *schema.ResourceD return nil } -func resourceScalewayFunctionDomainDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionDomainDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_function_namespace.go b/scaleway/resource_function_namespace.go index 6cb0c4e65..09df26fc9 100644 --- a/scaleway/resource_function_namespace.go +++ b/scaleway/resource_function_namespace.go @@ -79,8 +79,8 @@ func resourceScalewayFunctionNamespace() *schema.Resource { } } -func resourceScalewayFunctionNamespaceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := functionAPIWithRegion(d, meta) +func resourceScalewayFunctionNamespaceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -104,11 +104,11 @@ func resourceScalewayFunctionNamespaceCreate(ctx context.Context, d *schema.Reso return diag.FromErr(err) } - return resourceScalewayFunctionNamespaceRead(ctx, d, meta) + return resourceScalewayFunctionNamespaceRead(ctx, d, m) } -func resourceScalewayFunctionNamespaceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -134,8 +134,8 @@ func resourceScalewayFunctionNamespaceRead(ctx context.Context, d *schema.Resour return nil } -func resourceScalewayFunctionNamespaceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionNamespaceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -170,11 +170,11 @@ func resourceScalewayFunctionNamespaceUpdate(ctx context.Context, d *schema.Reso return diag.FromErr(err) } - return resourceScalewayFunctionNamespaceRead(ctx, d, meta) + return resourceScalewayFunctionNamespaceRead(ctx, d, m) } -func resourceScalewayFunctionNamespaceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionNamespaceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_function_token.go b/scaleway/resource_function_token.go index c4a490f8a..3b11aed5f 100644 --- a/scaleway/resource_function_token.go +++ b/scaleway/resource_function_token.go @@ -60,8 +60,8 @@ func resourceScalewayFunctionToken() *schema.Resource { } } -func resourceScalewayFunctionTokenCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := functionAPIWithRegion(d, meta) +func resourceScalewayFunctionTokenCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -81,11 +81,11 @@ func resourceScalewayFunctionTokenCreate(ctx context.Context, d *schema.Resource _ = d.Set("token", token.Token) - return resourceScalewayFunctionTokenRead(ctx, d, meta) + return resourceScalewayFunctionTokenRead(ctx, d, m) } -func resourceScalewayFunctionTokenRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, ID, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionTokenRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, ID, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -109,8 +109,8 @@ func resourceScalewayFunctionTokenRead(ctx context.Context, d *schema.ResourceDa return nil } -func resourceScalewayFunctionTokenDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, ID, err := containerAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionTokenDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, ID, err := containerAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_function_trigger.go b/scaleway/resource_function_trigger.go index 0541fb305..c9b94a602 100644 --- a/scaleway/resource_function_trigger.go +++ b/scaleway/resource_function_trigger.go @@ -131,8 +131,8 @@ func resourceScalewayFunctionTrigger() *schema.Resource { } } -func resourceScalewayFunctionTriggerCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := functionAPIWithRegion(d, meta) +func resourceScalewayFunctionTriggerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := functionAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -145,7 +145,7 @@ func resourceScalewayFunctionTriggerCreate(ctx context.Context, d *schema.Resour } if scwSqs, isScwSqs := d.GetOk("sqs.0"); isScwSqs { - err := completeFunctionTriggerMnqCreationConfig(scwSqs, d, meta, region) + err := completeFunctionTriggerMnqCreationConfig(scwSqs, d, m, region) if err != nil { return diag.FromErr(fmt.Errorf("failed to complete sqs config: %w", err)) } @@ -155,7 +155,7 @@ func resourceScalewayFunctionTriggerCreate(ctx context.Context, d *schema.Resour } if scwNats, isScwNats := d.GetOk("nats.0"); isScwNats { - err := completeFunctionTriggerMnqCreationConfig(scwNats, d, meta, region) + err := completeFunctionTriggerMnqCreationConfig(scwNats, d, m, region) if err != nil { return diag.FromErr(fmt.Errorf("failed to complete nats config: %w", err)) } @@ -176,11 +176,11 @@ func resourceScalewayFunctionTriggerCreate(ctx context.Context, d *schema.Resour return diag.FromErr(err) } - return resourceScalewayFunctionTriggerRead(ctx, d, meta) + return resourceScalewayFunctionTriggerRead(ctx, d, m) } -func resourceScalewayFunctionTriggerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionTriggerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -214,8 +214,8 @@ func resourceScalewayFunctionTriggerRead(ctx context.Context, d *schema.Resource return diags } -func resourceScalewayFunctionTriggerUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionTriggerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -246,11 +246,11 @@ func resourceScalewayFunctionTriggerUpdate(ctx context.Context, d *schema.Resour return diag.FromErr(err) } - return resourceScalewayFunctionTriggerRead(ctx, d, meta) + return resourceScalewayFunctionTriggerRead(ctx, d, m) } -func resourceScalewayFunctionTriggerDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := functionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayFunctionTriggerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := functionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_iam_api_key.go b/scaleway/resource_iam_api_key.go index eef67dc69..ee97738a1 100644 --- a/scaleway/resource_iam_api_key.go +++ b/scaleway/resource_iam_api_key.go @@ -83,9 +83,9 @@ func resourceScalewayIamAPIKey() *schema.Resource { } } -func resourceScalewayIamAPIKeyCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iamAPI := iamAPI(meta) - res, err := iamAPI.CreateAPIKey(&iam.CreateAPIKeyRequest{ +func resourceScalewayIamAPIKeyCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) + res, err := api.CreateAPIKey(&iam.CreateAPIKeyRequest{ ApplicationID: expandStringPtr(d.Get("application_id")), UserID: expandStringPtr(d.Get("user_id")), ExpiresAt: expandTimePtr(d.Get("expires_at")), @@ -100,11 +100,11 @@ func resourceScalewayIamAPIKeyCreate(ctx context.Context, d *schema.ResourceData d.SetId(res.AccessKey) - return resourceScalewayIamAPIKeyRead(ctx, d, meta) + return resourceScalewayIamAPIKeyRead(ctx, d, m) } -func resourceScalewayIamAPIKeyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamAPIKeyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) res, err := api.GetAPIKey(&iam.GetAPIKeyRequest{ AccessKey: d.Id(), }, scw.WithContext(ctx)) @@ -135,8 +135,8 @@ func resourceScalewayIamAPIKeyRead(ctx context.Context, d *schema.ResourceData, return nil } -func resourceScalewayIamAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamAPIKeyUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) req := &iam.UpdateAPIKeyRequest{ AccessKey: d.Id(), @@ -161,11 +161,11 @@ func resourceScalewayIamAPIKeyUpdate(ctx context.Context, d *schema.ResourceData } } - return resourceScalewayIamAPIKeyRead(ctx, d, meta) + return resourceScalewayIamAPIKeyRead(ctx, d, m) } -func resourceScalewayIamAPIKeyDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamAPIKeyDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) err := api.DeleteAPIKey(&iam.DeleteAPIKeyRequest{ AccessKey: d.Id(), diff --git a/scaleway/resource_iam_application.go b/scaleway/resource_iam_application.go index 721f44849..ef4705dd4 100644 --- a/scaleway/resource_iam_application.go +++ b/scaleway/resource_iam_application.go @@ -59,8 +59,8 @@ func resourceScalewayIamApplication() *schema.Resource { } } -func resourceScalewayIamApplicationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamApplicationCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) app, err := api.CreateApplication(&iam.CreateApplicationRequest{ Name: expandOrGenerateString(d.Get("name"), "application"), Description: d.Get("description").(string), @@ -73,11 +73,11 @@ func resourceScalewayIamApplicationCreate(ctx context.Context, d *schema.Resourc d.SetId(app.ID) - return resourceScalewayIamApplicationRead(ctx, d, meta) + return resourceScalewayIamApplicationRead(ctx, d, m) } -func resourceScalewayIamApplicationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamApplicationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) app, err := api.GetApplication(&iam.GetApplicationRequest{ ApplicationID: d.Id(), }, scw.WithContext(ctx)) @@ -99,8 +99,8 @@ func resourceScalewayIamApplicationRead(ctx context.Context, d *schema.ResourceD return nil } -func resourceScalewayIamApplicationUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamApplicationUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) req := &iam.UpdateApplicationRequest{ ApplicationID: d.Id(), @@ -128,11 +128,11 @@ func resourceScalewayIamApplicationUpdate(ctx context.Context, d *schema.Resourc } } - return resourceScalewayIamApplicationRead(ctx, d, meta) + return resourceScalewayIamApplicationRead(ctx, d, m) } -func resourceScalewayIamApplicationDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamApplicationDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) err := api.DeleteApplication(&iam.DeleteApplicationRequest{ ApplicationID: d.Id(), diff --git a/scaleway/resource_iam_group.go b/scaleway/resource_iam_group.go index 163d34674..5d8eef002 100644 --- a/scaleway/resource_iam_group.go +++ b/scaleway/resource_iam_group.go @@ -78,8 +78,8 @@ func resourceScalewayIamGroup() *schema.Resource { } } -func resourceScalewayIamGroupCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamGroupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) req := &iam.CreateGroupRequest{ OrganizationID: d.Get("organization_id").(string), Name: expandOrGenerateString(d.Get("name"), "group"), @@ -106,11 +106,11 @@ func resourceScalewayIamGroupCreate(ctx context.Context, d *schema.ResourceData, } } - return resourceScalewayIamGroupRead(ctx, d, meta) + return resourceScalewayIamGroupRead(ctx, d, m) } -func resourceScalewayIamGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) group, err := api.GetGroup(&iam.GetGroupRequest{ GroupID: d.Id(), }, scw.WithContext(ctx)) @@ -137,8 +137,8 @@ func resourceScalewayIamGroupRead(ctx context.Context, d *schema.ResourceData, m return nil } -func resourceScalewayIamGroupUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamGroupUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) group, err := api.GetGroup(&iam.GetGroupRequest{ GroupID: d.Id(), @@ -193,11 +193,11 @@ func resourceScalewayIamGroupUpdate(ctx context.Context, d *schema.ResourceData, } } - return resourceScalewayIamGroupRead(ctx, d, meta) + return resourceScalewayIamGroupRead(ctx, d, m) } -func resourceScalewayIamGroupDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamGroupDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) err := api.DeleteGroup(&iam.DeleteGroupRequest{ GroupID: d.Id(), diff --git a/scaleway/resource_iam_group_membership.go b/scaleway/resource_iam_group_membership.go index 5127543c0..5e5595bc0 100644 --- a/scaleway/resource_iam_group_membership.go +++ b/scaleway/resource_iam_group_membership.go @@ -45,8 +45,8 @@ func resourceScalewayIamGroupMembership() *schema.Resource { } } -func resourceScalewayIamGroupMembershipCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamGroupMembershipCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) userID := expandStringPtr(d.Get("user_id")) applicationID := expandStringPtr(d.Get("application_id")) @@ -62,11 +62,11 @@ func resourceScalewayIamGroupMembershipCreate(ctx context.Context, d *schema.Res d.SetId(groupMembershipID(group.ID, userID, applicationID)) - return resourceScalewayIamGroupMembershipRead(ctx, d, meta) + return resourceScalewayIamGroupMembershipRead(ctx, d, m) } -func resourceScalewayIamGroupMembershipRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamGroupMembershipRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) groupID, userID, applicationID, err := expandGroupMembershipID(d.Id()) if err != nil { return diag.FromErr(err) @@ -115,8 +115,8 @@ func resourceScalewayIamGroupMembershipRead(ctx context.Context, d *schema.Resou return nil } -func resourceScalewayIamGroupMembershipDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamGroupMembershipDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) groupID, userID, applicationID, err := expandGroupMembershipID(d.Id()) if err != nil { return diag.FromErr(err) diff --git a/scaleway/resource_iam_policy.go b/scaleway/resource_iam_policy.go index 74bde8d05..9c4f7b4d6 100644 --- a/scaleway/resource_iam_policy.go +++ b/scaleway/resource_iam_policy.go @@ -119,8 +119,8 @@ func resourceScalewayIamPolicy() *schema.Resource { } } -func resourceScalewayIamPolicyCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamPolicyCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) pol, err := api.CreatePolicy(&iam.CreatePolicyRequest{ Name: expandOrGenerateString(d.Get("name"), "policy"), @@ -139,11 +139,11 @@ func resourceScalewayIamPolicyCreate(ctx context.Context, d *schema.ResourceData d.SetId(pol.ID) - return resourceScalewayIamPolicyRead(ctx, d, meta) + return resourceScalewayIamPolicyRead(ctx, d, m) } -func resourceScalewayIamPolicyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamPolicyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) pol, err := api.GetPolicy(&iam.GetPolicyRequest{ PolicyID: d.Id(), }, scw.WithContext(ctx)) @@ -186,8 +186,8 @@ func resourceScalewayIamPolicyRead(ctx context.Context, d *schema.ResourceData, return nil } -func resourceScalewayIamPolicyUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamPolicyUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) req := &iam.UpdatePolicyRequest{ PolicyID: d.Id(), @@ -240,11 +240,11 @@ func resourceScalewayIamPolicyUpdate(ctx context.Context, d *schema.ResourceData } } - return resourceScalewayIamPolicyRead(ctx, d, meta) + return resourceScalewayIamPolicyRead(ctx, d, m) } -func resourceScalewayIamPolicyDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamPolicyDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) err := api.DeletePolicy(&iam.DeletePolicyRequest{ PolicyID: d.Id(), diff --git a/scaleway/resource_iam_ssh_key.go b/scaleway/resource_iam_ssh_key.go index a9f2e6301..58594c7e8 100644 --- a/scaleway/resource_iam_ssh_key.go +++ b/scaleway/resource_iam_ssh_key.go @@ -64,10 +64,10 @@ func resourceScalewayIamSSKKey() *schema.Resource { } } -func resourceScalewayIamSSKKeyCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iamAPI := iamAPI(meta) +func resourceScalewayIamSSKKeyCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) - res, err := iamAPI.CreateSSHKey(&iam.CreateSSHKeyRequest{ + res, err := api.CreateSSHKey(&iam.CreateSSHKeyRequest{ Name: d.Get("name").(string), PublicKey: strings.Trim(d.Get("public_key").(string), "\n"), ProjectID: (d.Get("project_id")).(string), @@ -77,7 +77,7 @@ func resourceScalewayIamSSKKeyCreate(ctx context.Context, d *schema.ResourceData } if _, disabledExists := d.GetOk("disabled"); disabledExists { - _, err = iamAPI.UpdateSSHKey(&iam.UpdateSSHKeyRequest{ + _, err = api.UpdateSSHKey(&iam.UpdateSSHKeyRequest{ SSHKeyID: d.Id(), Disabled: expandBoolPtr(getBool(d, "disabled")), }, scw.WithContext(ctx)) @@ -88,13 +88,13 @@ func resourceScalewayIamSSKKeyCreate(ctx context.Context, d *schema.ResourceData d.SetId(res.ID) - return resourceScalewayIamSSHKeyRead(ctx, d, meta) + return resourceScalewayIamSSHKeyRead(ctx, d, m) } -func resourceScalewayIamSSHKeyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iamAPI := iamAPI(meta) +func resourceScalewayIamSSHKeyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) - res, err := iamAPI.GetSSHKey(&iam.GetSSHKeyRequest{ + res, err := api.GetSSHKey(&iam.GetSSHKeyRequest{ SSHKeyID: d.Id(), }, scw.WithContext(ctx)) if err != nil { @@ -117,8 +117,8 @@ func resourceScalewayIamSSHKeyRead(ctx context.Context, d *schema.ResourceData, return nil } -func resourceScalewayIamSSKKeyUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iamAPI := iamAPI(meta) +func resourceScalewayIamSSKKeyUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) req := &iam.UpdateSSHKeyRequest{ SSHKeyID: d.Id(), @@ -133,7 +133,7 @@ func resourceScalewayIamSSKKeyUpdate(ctx context.Context, d *schema.ResourceData if d.HasChange("disabled") { if _, disabledExists := d.GetOk("disabled"); !disabledExists { - _, err := iamAPI.UpdateSSHKey(&iam.UpdateSSHKeyRequest{ + _, err := api.UpdateSSHKey(&iam.UpdateSSHKeyRequest{ SSHKeyID: d.Id(), Disabled: expandBoolPtr(false), }) @@ -141,7 +141,7 @@ func resourceScalewayIamSSKKeyUpdate(ctx context.Context, d *schema.ResourceData return diag.FromErr(err) } } else { - _, err := iamAPI.UpdateSSHKey(&iam.UpdateSSHKeyRequest{ + _, err := api.UpdateSSHKey(&iam.UpdateSSHKeyRequest{ SSHKeyID: d.Id(), Disabled: expandBoolPtr(getBool(d, "disabled")), }) @@ -152,19 +152,19 @@ func resourceScalewayIamSSKKeyUpdate(ctx context.Context, d *schema.ResourceData } if hasUpdated { - _, err := iamAPI.UpdateSSHKey(req, scw.WithContext(ctx)) + _, err := api.UpdateSSHKey(req, scw.WithContext(ctx)) if err != nil { return diag.FromErr(err) } } - return resourceScalewayIamSSHKeyRead(ctx, d, meta) + return resourceScalewayIamSSHKeyRead(ctx, d, m) } -func resourceScalewayIamSSKKeyDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iamAPI := iamAPI(meta) +func resourceScalewayIamSSKKeyDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) - err := iamAPI.DeleteSSHKey(&iam.DeleteSSHKeyRequest{ + err := api.DeleteSSHKey(&iam.DeleteSSHKeyRequest{ SSHKeyID: d.Id(), }, scw.WithContext(ctx)) if err != nil && !is404Error(err) { diff --git a/scaleway/resource_iam_user.go b/scaleway/resource_iam_user.go index 180fc13a9..8e206dcda 100644 --- a/scaleway/resource_iam_user.go +++ b/scaleway/resource_iam_user.go @@ -70,9 +70,9 @@ func resourceScalewayIamUser() *schema.Resource { } } -func resourceScalewayIamUserCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iamAPI := iamAPI(meta) - user, err := iamAPI.CreateUser(&iam.CreateUserRequest{ +func resourceScalewayIamUserCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) + user, err := api.CreateUser(&iam.CreateUserRequest{ OrganizationID: d.Get("organization_id").(string), Email: d.Get("email").(string), }, scw.WithContext(ctx)) @@ -82,11 +82,11 @@ func resourceScalewayIamUserCreate(ctx context.Context, d *schema.ResourceData, d.SetId(user.ID) - return resourceScalewayIamUserRead(ctx, d, meta) + return resourceScalewayIamUserRead(ctx, d, m) } -func resourceScalewayIamUserRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) user, err := api.GetUser(&iam.GetUserRequest{ UserID: d.Id(), }, scw.WithContext(ctx)) @@ -111,8 +111,8 @@ func resourceScalewayIamUserRead(ctx context.Context, d *schema.ResourceData, me return nil } -func resourceScalewayIamUserDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := iamAPI(meta) +func resourceScalewayIamUserDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := iamAPI(m) err := api.DeleteUser(&iam.DeleteUserRequest{ UserID: d.Id(), diff --git a/scaleway/resource_instance_image.go b/scaleway/resource_instance_image.go index 2e0950b07..9d127e0d3 100644 --- a/scaleway/resource_instance_image.go +++ b/scaleway/resource_instance_image.go @@ -174,8 +174,8 @@ func resourceScalewayInstanceImage() *schema.Resource { } } -func resourceScalewayInstanceImageCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstanceImageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -222,11 +222,11 @@ func resourceScalewayInstanceImageCreate(ctx context.Context, d *schema.Resource return diag.FromErr(err) } - return resourceScalewayInstanceImageRead(ctx, d, meta) + return resourceScalewayInstanceImageRead(ctx, d, m) } -func resourceScalewayInstanceImageRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -260,8 +260,8 @@ func resourceScalewayInstanceImageRead(ctx context.Context, d *schema.ResourceDa return nil } -func resourceScalewayInstanceImageUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceImageUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -329,11 +329,11 @@ func resourceScalewayInstanceImageUpdate(ctx context.Context, d *schema.Resource return diag.FromErr(err) } - return resourceScalewayInstanceImageRead(ctx, d, meta) + return resourceScalewayInstanceImageRead(ctx, d, m) } -func resourceScalewayInstanceImageDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceImageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_instance_image_test.go b/scaleway/resource_instance_image_test.go index 14c7c7ae6..01ff852c8 100644 --- a/scaleway/resource_instance_image_test.go +++ b/scaleway/resource_instance_image_test.go @@ -491,7 +491,7 @@ func testAccCheckScalewayInstanceImageExists(tt *TestTools, n string) resource.T if err != nil { return err } - instanceAPI := instance.NewAPI(tt.Meta.scwClient) + instanceAPI := instance.NewAPI(tt.Meta.ScwClient()) _, err = instanceAPI.GetImage(&instance.GetImageRequest{ ImageID: ID, Zone: zone, diff --git a/scaleway/resource_instance_ip.go b/scaleway/resource_instance_ip.go index 19385c387..008815707 100644 --- a/scaleway/resource_instance_ip.go +++ b/scaleway/resource_instance_ip.go @@ -82,8 +82,8 @@ func resourceScalewayInstanceIP() *schema.Resource { } } -func resourceScalewayInstanceIPCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstanceIPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -116,11 +116,11 @@ func resourceScalewayInstanceIPCreate(ctx context.Context, d *schema.ResourceDat } d.SetId(zonal.NewIDString(zone, res.IP.ID)) - return resourceScalewayInstanceIPRead(ctx, d, meta) + return resourceScalewayInstanceIPRead(ctx, d, m) } -func resourceScalewayInstanceIPUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceIPUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -142,11 +142,11 @@ func resourceScalewayInstanceIPUpdate(ctx context.Context, d *schema.ResourceDat return diag.FromErr(err) } - return resourceScalewayInstanceIPRead(ctx, d, meta) + return resourceScalewayInstanceIPRead(ctx, d, m) } -func resourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -196,8 +196,8 @@ func resourceScalewayInstanceIPRead(ctx context.Context, d *schema.ResourceData, return nil } -func resourceScalewayInstanceIPDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceIPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_instance_ip_reverse_dns.go b/scaleway/resource_instance_ip_reverse_dns.go index 748513fe6..cdc71d93a 100644 --- a/scaleway/resource_instance_ip_reverse_dns.go +++ b/scaleway/resource_instance_ip_reverse_dns.go @@ -45,8 +45,8 @@ func resourceScalewayInstanceIPReverseDNS() *schema.Resource { } } -func resourceScalewayInstanceIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstanceIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -80,11 +80,11 @@ func resourceScalewayInstanceIPReverseDNSCreate(ctx context.Context, d *schema.R } } - return resourceScalewayInstanceIPReverseDNSRead(ctx, d, meta) + return resourceScalewayInstanceIPReverseDNSRead(ctx, d, m) } -func resourceScalewayInstanceIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -107,8 +107,8 @@ func resourceScalewayInstanceIPReverseDNSRead(ctx context.Context, d *schema.Res return nil } -func resourceScalewayInstanceIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -132,11 +132,11 @@ func resourceScalewayInstanceIPReverseDNSUpdate(ctx context.Context, d *schema.R } } - return resourceScalewayInstanceIPReverseDNSRead(ctx, d, meta) + return resourceScalewayInstanceIPReverseDNSRead(ctx, d, m) } -func resourceScalewayInstanceIPReverseDNSDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceIPReverseDNSDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_instance_placement_group.go b/scaleway/resource_instance_placement_group.go index a31603163..fb76d6cf9 100644 --- a/scaleway/resource_instance_placement_group.go +++ b/scaleway/resource_instance_placement_group.go @@ -71,8 +71,8 @@ func resourceScalewayInstancePlacementGroup() *schema.Resource { } } -func resourceScalewayInstancePlacementGroupCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstancePlacementGroupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -90,11 +90,11 @@ func resourceScalewayInstancePlacementGroupCreate(ctx context.Context, d *schema } d.SetId(zonal.NewIDString(zone, res.PlacementGroup.ID)) - return resourceScalewayInstancePlacementGroupRead(ctx, d, meta) + return resourceScalewayInstancePlacementGroupRead(ctx, d, m) } -func resourceScalewayInstancePlacementGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstancePlacementGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -123,8 +123,8 @@ func resourceScalewayInstancePlacementGroupRead(ctx context.Context, d *schema.R return nil } -func resourceScalewayInstancePlacementGroupUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstancePlacementGroupUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -165,11 +165,11 @@ func resourceScalewayInstancePlacementGroupUpdate(ctx context.Context, d *schema } } - return resourceScalewayInstancePlacementGroupRead(ctx, d, meta) + return resourceScalewayInstancePlacementGroupRead(ctx, d, m) } -func resourceScalewayInstancePlacementGroupDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstancePlacementGroupDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_instance_private_nic.go b/scaleway/resource_instance_private_nic.go index e4c61ff23..83eb8ecb2 100644 --- a/scaleway/resource_instance_private_nic.go +++ b/scaleway/resource_instance_private_nic.go @@ -70,8 +70,8 @@ func resourceScalewayInstancePrivateNIC() *schema.Resource { } } -func resourceScalewayInstancePrivateNICCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstancePrivateNICCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -110,11 +110,11 @@ func resourceScalewayInstancePrivateNICCreate(ctx context.Context, d *schema.Res ), ) - return resourceScalewayInstancePrivateNICRead(ctx, d, meta) + return resourceScalewayInstancePrivateNICRead(ctx, d, m) } -func resourceScalewayInstancePrivateNICRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, _, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstancePrivateNICRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, _, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -149,8 +149,8 @@ func resourceScalewayInstancePrivateNICRead(ctx context.Context, d *schema.Resou return nil } -func resourceScalewayInstancePrivateNICUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, _, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstancePrivateNICUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, _, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -175,11 +175,11 @@ func resourceScalewayInstancePrivateNICUpdate(ctx context.Context, d *schema.Res } } - return resourceScalewayInstancePrivateNICRead(ctx, d, meta) + return resourceScalewayInstancePrivateNICRead(ctx, d, m) } -func resourceScalewayInstancePrivateNICDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, _, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstancePrivateNICDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, _, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_instance_security_group.go b/scaleway/resource_instance_security_group.go index f5bbe2885..fffbd4b31 100644 --- a/scaleway/resource_instance_security_group.go +++ b/scaleway/resource_instance_security_group.go @@ -105,8 +105,8 @@ func resourceScalewayInstanceSecurityGroup() *schema.Resource { } } -func resourceScalewayInstanceSecurityGroupCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstanceSecurityGroupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -133,14 +133,14 @@ func resourceScalewayInstanceSecurityGroupCreate(ctx context.Context, d *schema. d.SetId(zonal.NewIDString(zone, res.SecurityGroup.ID)) if d.Get("external_rules").(bool) { - return resourceScalewayInstanceSecurityGroupRead(ctx, d, meta) + return resourceScalewayInstanceSecurityGroupRead(ctx, d, m) } // We call update instead of read as it will take care of creating rules. - return resourceScalewayInstanceSecurityGroupUpdate(ctx, d, meta) + return resourceScalewayInstanceSecurityGroupUpdate(ctx, d, m) } -func resourceScalewayInstanceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, ID, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -239,8 +239,8 @@ func getSecurityGroupRules(ctx context.Context, instanceAPI *instance.API, zone return stateRules[instance.SecurityGroupRuleDirectionInbound], stateRules[instance.SecurityGroupRuleDirectionOutbound], nil } -func resourceScalewayInstanceSecurityGroupUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, _, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstanceSecurityGroupUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, _, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -298,7 +298,7 @@ func resourceScalewayInstanceSecurityGroupUpdate(ctx context.Context, d *schema. } } - return resourceScalewayInstanceSecurityGroupRead(ctx, d, meta) + return resourceScalewayInstanceSecurityGroupRead(ctx, d, m) } // updateSecurityGroupeRules handles updating SecurityGroupRules @@ -342,8 +342,8 @@ func updateSecurityGroupeRules(ctx context.Context, d *schema.ResourceData, zone return nil } -func resourceScalewayInstanceSecurityGroupDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, _, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstanceSecurityGroupDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, _, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_instance_security_group_rules.go b/scaleway/resource_instance_security_group_rules.go index 11fdbb336..4ba0caa12 100644 --- a/scaleway/resource_instance_security_group_rules.go +++ b/scaleway/resource_instance_security_group_rules.go @@ -44,17 +44,17 @@ func resourceScalewayInstanceSecurityGroupRules() *schema.Resource { } } -func resourceScalewayInstanceSecurityGroupRulesCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceScalewayInstanceSecurityGroupRulesCreate(ctx context.Context, d *schema.ResourceData, m interface{}) 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 resourceScalewayInstanceSecurityGroupRulesUpdate(ctx, d, meta) + return resourceScalewayInstanceSecurityGroupRulesUpdate(ctx, d, m) } -func resourceScalewayInstanceSecurityGroupRulesRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceScalewayInstanceSecurityGroupRulesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { securityGroupZonedID := d.Id() - instanceAPI, zone, securityGroupID, err := instanceAPIWithZoneAndID(meta, securityGroupZonedID) + instanceAPI, zone, securityGroupID, err := instanceAPIWithZoneAndID(m, securityGroupZonedID) if err != nil { return diag.FromErr(err) } @@ -76,9 +76,9 @@ func resourceScalewayInstanceSecurityGroupRulesRead(ctx context.Context, d *sche return nil } -func resourceScalewayInstanceSecurityGroupRulesUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceScalewayInstanceSecurityGroupRulesUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { securityGroupZonedID := d.Id() - instanceAPI, zone, securityGroupID, err := instanceAPIWithZoneAndID(meta, securityGroupZonedID) + instanceAPI, zone, securityGroupID, err := instanceAPIWithZoneAndID(m, securityGroupZonedID) if err != nil { return diag.FromErr(err) } @@ -88,12 +88,12 @@ func resourceScalewayInstanceSecurityGroupRulesUpdate(ctx context.Context, d *sc return diag.FromErr(err) } - return resourceScalewayInstanceSecurityGroupRulesRead(ctx, d, meta) + return resourceScalewayInstanceSecurityGroupRulesRead(ctx, d, m) } -func resourceScalewayInstanceSecurityGroupRulesDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceScalewayInstanceSecurityGroupRulesDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { securityGroupZonedID := d.Id() - instanceAPI, zone, securityGroupID, err := instanceAPIWithZoneAndID(meta, securityGroupZonedID) + instanceAPI, zone, securityGroupID, err := instanceAPIWithZoneAndID(m, securityGroupZonedID) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_instance_security_group_test.go b/scaleway/resource_instance_security_group_test.go index 98d18f2f6..db94b07d0 100644 --- a/scaleway/resource_instance_security_group_test.go +++ b/scaleway/resource_instance_security_group_test.go @@ -540,7 +540,7 @@ func testAccCheckScalewayInstanceSecurityGroupExists(tt *TestTools, n string) re return err } - instanceAPI := instance.NewAPI(tt.Meta.scwClient) + instanceAPI := instance.NewAPI(tt.Meta.ScwClient()) _, err = instanceAPI.GetSecurityGroup(&instance.GetSecurityGroupRequest{ SecurityGroupID: ID, Zone: zone, @@ -555,7 +555,7 @@ func testAccCheckScalewayInstanceSecurityGroupExists(tt *TestTools, n string) re func testAccCheckScalewayInstanceSecurityGroupDestroy(tt *TestTools) resource.TestCheckFunc { return func(state *terraform.State) error { - instanceAPI := instance.NewAPI(tt.Meta.scwClient) + instanceAPI := instance.NewAPI(tt.Meta.ScwClient()) for _, rs := range state.RootModule().Resources { if rs.Type != "scaleway_instance_security_group" { continue diff --git a/scaleway/resource_instance_server.go b/scaleway/resource_instance_server.go index 6ed7a6309..fce67f0b8 100644 --- a/scaleway/resource_instance_server.go +++ b/scaleway/resource_instance_server.go @@ -23,6 +23,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) func resourceScalewayInstanceServer() *schema.Resource { @@ -331,8 +332,8 @@ func resourceScalewayInstanceServer() *schema.Resource { } //gocyclo:ignore -func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, err := instanceAndBlockAPIWithZone(d, meta) +func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, err := instanceAndBlockAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -348,7 +349,7 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc // Replace dashes with underscores ubuntu-focal -> ubuntu_focal imageLabel := formatImageLabel(imageUUID) - marketPlaceAPI := marketplace.NewAPI(meta.(*Meta).scwClient) + marketPlaceAPI := marketplace.NewAPI(meta.ExtractScwClient(m)) image, err := marketPlaceAPI.GetLocalImageByLabel(&marketplace.GetLocalImageByLabelRequest{ CommercialType: commercialType, Zone: zone, @@ -527,7 +528,7 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc // Private Network //// if rawPNICs, ok := d.GetOk("private_network"); ok { - vpcAPI, err := vpcAPI(meta) + vpcAPI, err := vpcAPI(m) if err != nil { return diag.FromErr(err) } @@ -560,12 +561,12 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc } } - return resourceScalewayInstanceServerRead(ctx, d, meta) + return resourceScalewayInstanceServerRead(ctx, d, m) } //gocyclo:ignore -func resourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -736,8 +737,8 @@ func resourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceD } //gocyclo:ignore -func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, id, err := instanceAndBlockAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, id, err := instanceAndBlockAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -1048,11 +1049,11 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc } } - return append(warnings, resourceScalewayInstanceServerRead(ctx, d, meta)...) + return append(warnings, resourceScalewayInstanceServerRead(ctx, d, m)...) } -func resourceScalewayInstanceServerDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, zone, id, err := instanceAndBlockAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, zone, id, err := instanceAndBlockAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -1203,13 +1204,13 @@ func customDiffInstanceServerType(_ context.Context, diff *schema.ResourceDiff, return nil } -func customDiffInstanceServerImage(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) error { +func customDiffInstanceServerImage(ctx context.Context, diff *schema.ResourceDiff, m interface{}) error { if diff.Get("image") == "" || !diff.HasChange("image") || diff.Id() == "" { return nil } // We get the server to fetch the UUID of the image - instanceAPI, zone, id, err := instanceAPIWithZoneAndID(meta, diff.Id()) + instanceAPI, zone, id, err := instanceAPIWithZoneAndID(m, diff.Id()) if err != nil { return err } @@ -1236,7 +1237,7 @@ func customDiffInstanceServerImage(ctx context.Context, diff *schema.ResourceDif // If image is a label, we check that server.Image.ID matches the label in case the user has edited // the image with another tool. - marketplaceAPI := marketplace.NewAPI(meta.(*Meta).scwClient) + marketplaceAPI := marketplace.NewAPI(meta.ExtractScwClient(m)) if err != nil { return err } diff --git a/scaleway/resource_instance_server_test.go b/scaleway/resource_instance_server_test.go index 57c27603e..393e7ad10 100644 --- a/scaleway/resource_instance_server_test.go +++ b/scaleway/resource_instance_server_test.go @@ -15,6 +15,7 @@ import ( "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/logging" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/stretchr/testify/require" ) @@ -1824,17 +1825,17 @@ func TestAccScalewayInstanceServer_IPMigrate(t *testing.T) { temporarySecretKey := "" customProviderFactory := map[string]func() (*schema.Provider, error){ "scaleway": func() (*schema.Provider, error) { - meta, err := buildMeta(context.Background(), &metaConfig{ - providerSchema: nil, - terraformVersion: "terraform-tests", - httpClient: tt.Meta.httpClient, - forceAccessKey: temporaryAccessKey, - forceSecretKey: temporarySecretKey, + m, err := meta.NewMeta(context.Background(), &meta.Config{ + ProviderSchema: nil, + TerraformVersion: "terraform-tests", + HTTPClient: tt.Meta.HTTPClient(), + ForceAccessKey: temporaryAccessKey, + ForceSecretKey: temporarySecretKey, }) if err != nil { return nil, err } - return Provider(&ProviderConfig{Meta: meta})(), nil + return Provider(&ProviderConfig{Meta: m})(), nil }, } diff --git a/scaleway/resource_instance_snapshot.go b/scaleway/resource_instance_snapshot.go index 7d3f5fbb9..b48b6488f 100644 --- a/scaleway/resource_instance_snapshot.go +++ b/scaleway/resource_instance_snapshot.go @@ -107,8 +107,8 @@ func resourceScalewayInstanceSnapshot() *schema.Resource { } } -func resourceScalewayInstanceSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstanceSnapshotCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -152,11 +152,11 @@ func resourceScalewayInstanceSnapshotCreate(ctx context.Context, d *schema.Resou return diag.FromErr(err) } - return resourceScalewayInstanceSnapshotRead(ctx, d, meta) + return resourceScalewayInstanceSnapshotRead(ctx, d, m) } -func resourceScalewayInstanceSnapshotRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -181,8 +181,8 @@ func resourceScalewayInstanceSnapshotRead(ctx context.Context, d *schema.Resourc return nil } -func resourceScalewayInstanceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -204,11 +204,11 @@ func resourceScalewayInstanceSnapshotUpdate(ctx context.Context, d *schema.Resou return diag.FromErr(fmt.Errorf("couldn't update snapshot: %s", err)) } - return resourceScalewayInstanceSnapshotRead(ctx, d, meta) + return resourceScalewayInstanceSnapshotRead(ctx, d, m) } -func resourceScalewayInstanceSnapshotDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceSnapshotDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_instance_user_data.go b/scaleway/resource_instance_user_data.go index 4e0e87e6c..c295f7f0d 100644 --- a/scaleway/resource_instance_user_data.go +++ b/scaleway/resource_instance_user_data.go @@ -53,8 +53,8 @@ func resourceScalewayInstanceUserData() *schema.Resource { } } -func resourceScalewayInstanceUserDataCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstanceUserDataCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -86,11 +86,11 @@ func resourceScalewayInstanceUserDataCreate(ctx context.Context, d *schema.Resou d.SetId(zonal.NewNestedIDString(zone, key, server.ID)) - return resourceScalewayInstanceUserDataRead(ctx, d, meta) + return resourceScalewayInstanceUserDataRead(ctx, d, m) } -func resourceScalewayInstanceUserDataRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, key, err := instanceAPIWithZoneAndNestedID(meta, d.Id()) +func resourceScalewayInstanceUserDataRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, key, err := instanceAPIWithZoneAndNestedID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -132,8 +132,8 @@ func resourceScalewayInstanceUserDataRead(ctx context.Context, d *schema.Resourc return nil } -func resourceScalewayInstanceUserDataUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, key, err := instanceAPIWithZoneAndNestedID(meta, d.Id()) +func resourceScalewayInstanceUserDataUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, key, err := instanceAPIWithZoneAndNestedID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -168,11 +168,11 @@ func resourceScalewayInstanceUserDataUpdate(ctx context.Context, d *schema.Resou return diag.FromErr(err) } - return resourceScalewayInstanceUserDataRead(ctx, d, meta) + return resourceScalewayInstanceUserDataRead(ctx, d, m) } -func resourceScalewayInstanceUserDataDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, key, err := instanceAPIWithZoneAndNestedID(meta, d.Id()) +func resourceScalewayInstanceUserDataDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, key, err := instanceAPIWithZoneAndNestedID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_instance_volume.go b/scaleway/resource_instance_volume.go index 43058da57..72c6805d7 100644 --- a/scaleway/resource_instance_volume.go +++ b/scaleway/resource_instance_volume.go @@ -83,8 +83,8 @@ func resourceScalewayInstanceVolume() *schema.Resource { } } -func resourceScalewayInstanceVolumeCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, err := instanceAPIWithZone(d, meta) +func resourceScalewayInstanceVolumeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, err := instanceAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -126,11 +126,11 @@ func resourceScalewayInstanceVolumeCreate(ctx context.Context, d *schema.Resourc return diag.FromErr(err) } - return resourceScalewayInstanceVolumeRead(ctx, d, meta) + return resourceScalewayInstanceVolumeRead(ctx, d, m) } -func resourceScalewayInstanceVolumeRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceVolumeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -168,8 +168,8 @@ func resourceScalewayInstanceVolumeRead(ctx context.Context, d *schema.ResourceD return nil } -func resourceScalewayInstanceVolumeUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceVolumeUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -223,11 +223,11 @@ func resourceScalewayInstanceVolumeUpdate(ctx context.Context, d *schema.Resourc return diag.FromErr(fmt.Errorf("couldn't update volume: %s", err)) } - return resourceScalewayInstanceVolumeRead(ctx, d, meta) + return resourceScalewayInstanceVolumeRead(ctx, d, m) } -func resourceScalewayInstanceVolumeDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - instanceAPI, zone, id, err := instanceAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayInstanceVolumeDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + instanceAPI, zone, id, err := instanceAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_instance_volume_test.go b/scaleway/resource_instance_volume_test.go index 44b35b825..69052bf6f 100644 --- a/scaleway/resource_instance_volume_test.go +++ b/scaleway/resource_instance_volume_test.go @@ -240,7 +240,7 @@ func testAccCheckScalewayInstanceVolumeExists(tt *TestTools, n string) resource. return err } - instanceAPI := instance.NewAPI(tt.Meta.scwClient) + instanceAPI := instance.NewAPI(tt.Meta.ScwClient()) _, err = instanceAPI.GetVolume(&instance.GetVolumeRequest{ VolumeID: id, Zone: zone, @@ -255,7 +255,7 @@ func testAccCheckScalewayInstanceVolumeExists(tt *TestTools, n string) resource. func testAccCheckScalewayInstanceVolumeDestroy(tt *TestTools) resource.TestCheckFunc { return func(state *terraform.State) error { - instanceAPI := instance.NewAPI(tt.Meta.scwClient) + instanceAPI := instance.NewAPI(tt.Meta.ScwClient()) for _, rs := range state.RootModule().Resources { if rs.Type != "scaleway_instance_volume" { continue diff --git a/scaleway/resource_iot_device.go b/scaleway/resource_iot_device.go index 438bc2e9a..093192797 100644 --- a/scaleway/resource_iot_device.go +++ b/scaleway/resource_iot_device.go @@ -183,8 +183,8 @@ func resourceScalewayIotDevice() *schema.Resource { } } -func resourceScalewayIotDeviceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, err := iotAPIWithRegion(d, meta) +func resourceScalewayIotDeviceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, err := iotAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -270,11 +270,11 @@ func resourceScalewayIotDeviceCreate(ctx context.Context, d *schema.ResourceData _ = d.Set("certificate", []map[string]interface{}{cert}) } - return resourceScalewayIotDeviceRead(ctx, d, meta) + return resourceScalewayIotDeviceRead(ctx, d, m) } -func resourceScalewayIotDeviceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, deviceID, err := iotAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIotDeviceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, deviceID, err := iotAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -358,8 +358,8 @@ func resourceScalewayIotDeviceRead(ctx context.Context, d *schema.ResourceData, return nil } -func resourceScalewayIotDeviceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, deviceID, err := iotAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIotDeviceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, deviceID, err := iotAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -432,11 +432,11 @@ func resourceScalewayIotDeviceUpdate(ctx context.Context, d *schema.ResourceData } } - return resourceScalewayIotDeviceRead(ctx, d, meta) + return resourceScalewayIotDeviceRead(ctx, d, m) } -func resourceScalewayIotDeviceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, deviceID, err := iotAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIotDeviceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, deviceID, err := iotAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_iot_hub.go b/scaleway/resource_iot_hub.go index 67636d35d..0b57333ae 100644 --- a/scaleway/resource_iot_hub.go +++ b/scaleway/resource_iot_hub.go @@ -126,8 +126,8 @@ func resourceScalewayIotHub() *schema.Resource { } } -func resourceScalewayIotHubCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, err := iotAPIWithRegion(d, meta) +func resourceScalewayIotHubCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, err := iotAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -204,11 +204,11 @@ func resourceScalewayIotHubCreate(ctx context.Context, d *schema.ResourceData, m MQTTUrl := computeIotHubCaURL(req.ProductPlan, region) _ = d.Set("mqtt_ca_url", MQTTUrl) - return resourceScalewayIotHubRead(ctx, d, meta) + return resourceScalewayIotHubRead(ctx, d, m) } -func resourceScalewayIotHubRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, hubID, err := iotAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIotHubRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, hubID, err := iotAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -242,7 +242,7 @@ func resourceScalewayIotHubRead(ctx context.Context, d *schema.ResourceData, met _ = d.Set("device_auto_provisioning", response.EnableDeviceAutoProvisioning) _ = d.Set("mqtt_ca_url", computeIotHubCaURL(response.ProductPlan, region)) mqttURL := d.Get("mqtt_ca_url") - mqttCa, err := computeIotHubMQTTCa(ctx, fmt.Sprintf("%v", mqttURL), meta) + mqttCa, err := computeIotHubMQTTCa(ctx, fmt.Sprintf("%v", mqttURL), m) if err != nil { _ = diag.Diagnostic{ Severity: diag.Warning, @@ -256,8 +256,8 @@ func resourceScalewayIotHubRead(ctx context.Context, d *schema.ResourceData, met return nil } -func resourceScalewayIotHubUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, hubID, err := iotAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIotHubUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, hubID, err := iotAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -341,11 +341,11 @@ func resourceScalewayIotHubUpdate(ctx context.Context, d *schema.ResourceData, m return diag.FromErr(err) } - return resourceScalewayIotHubRead(ctx, d, meta) + return resourceScalewayIotHubRead(ctx, d, m) } -func resourceScalewayIotHubDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, id, err := iotAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIotHubDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, id, err := iotAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_iot_network.go b/scaleway/resource_iot_network.go index 9723e5223..6b5be0796 100644 --- a/scaleway/resource_iot_network.go +++ b/scaleway/resource_iot_network.go @@ -78,8 +78,8 @@ func resourceScalewayIotNetwork() *schema.Resource { } } -func resourceScalewayIotNetworkCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, err := iotAPIWithRegion(d, meta) +func resourceScalewayIotNetworkCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, err := iotAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -105,11 +105,11 @@ func resourceScalewayIotNetworkCreate(ctx context.Context, d *schema.ResourceDat // Secret key cannot be retrieved later _ = d.Set("secret", res.Secret) - return resourceScalewayIotNetworkRead(ctx, d, meta) + return resourceScalewayIotNetworkRead(ctx, d, m) } -func resourceScalewayIotNetworkRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, networkID, err := iotAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIotNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, networkID, err := iotAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -136,8 +136,8 @@ func resourceScalewayIotNetworkRead(ctx context.Context, d *schema.ResourceData, return nil } -func resourceScalewayIotNetworkDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, networkID, err := iotAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIotNetworkDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, networkID, err := iotAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_iot_routes.go b/scaleway/resource_iot_routes.go index bcd489007..b867ef9c8 100644 --- a/scaleway/resource_iot_routes.go +++ b/scaleway/resource_iot_routes.go @@ -193,8 +193,8 @@ func resourceScalewayIotRoute() *schema.Resource { } } -func resourceScalewayIotRouteCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, err := iotAPIWithRegion(d, meta) +func resourceScalewayIotRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, err := iotAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -253,11 +253,11 @@ func resourceScalewayIotRouteCreate(ctx context.Context, d *schema.ResourceData, return diag.FromErr(err) } - return resourceScalewayIotRouteRead(ctx, d, meta) + return resourceScalewayIotRouteRead(ctx, d, m) } -func resourceScalewayIotRouteRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, routeID, err := iotAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIotRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, routeID, err := iotAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -312,8 +312,8 @@ func resourceScalewayIotRouteRead(ctx context.Context, d *schema.ResourceData, m return nil } -func resourceScalewayIotRouteDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - iotAPI, region, routeID, err := iotAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIotRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + iotAPI, region, routeID, err := iotAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_ipam_ip.go b/scaleway/resource_ipam_ip.go index 2ec20a3d3..cf3d07e33 100644 --- a/scaleway/resource_ipam_ip.go +++ b/scaleway/resource_ipam_ip.go @@ -144,8 +144,8 @@ func resourceScalewayIPAMIP() *schema.Resource { } } -func resourceScalewayIPAMIPCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - ipamAPI, region, err := ipamAPIWithRegion(d, meta) +func resourceScalewayIPAMIPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + ipamAPI, region, err := ipamAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -181,15 +181,15 @@ func resourceScalewayIPAMIPCreate(ctx context.Context, d *schema.ResourceData, m d.SetId(regional.NewIDString(region, res.ID)) - return resourceScalewayIPAMIPRead(ctx, d, meta) + return resourceScalewayIPAMIPRead(ctx, d, m) } -func resourceScalewayIPAMIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - ipamAPI, region, ID, err := ipamAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIPAMIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + ipamAPI, region, ID, err := ipamAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } - vpcAPI, err := vpcAPI(meta) + vpcAPI, err := vpcAPI(m) if err != nil { return diag.FromErr(err) } @@ -256,8 +256,8 @@ func resourceScalewayIPAMIPRead(ctx context.Context, d *schema.ResourceData, met return nil } -func resourceScalewayIPAMIPUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - ipamAPI, region, ID, err := ipamAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIPAMIPUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + ipamAPI, region, ID, err := ipamAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -271,11 +271,11 @@ func resourceScalewayIPAMIPUpdate(ctx context.Context, d *schema.ResourceData, m return diag.FromErr(err) } - return resourceScalewayIPAMIPRead(ctx, d, meta) + return resourceScalewayIPAMIPRead(ctx, d, m) } -func resourceScalewayIPAMIPDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - ipamAPI, region, ID, err := ipamAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIPAMIPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + ipamAPI, region, ID, err := ipamAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_ipam_ip_reverse_dns.go b/scaleway/resource_ipam_ip_reverse_dns.go index af33951ff..e8600f934 100644 --- a/scaleway/resource_ipam_ip_reverse_dns.go +++ b/scaleway/resource_ipam_ip_reverse_dns.go @@ -50,8 +50,8 @@ func resourceScalewayIPAMIPReverseDNS() *schema.Resource { } } -func resourceScalewayIPAMIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - ipamAPI, region, err := ipamAPIWithRegion(d, meta) +func resourceScalewayIPAMIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + ipamAPI, region, err := ipamAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -83,11 +83,11 @@ func resourceScalewayIPAMIPReverseDNSCreate(ctx context.Context, d *schema.Resou } } - return resourceScalewayIPAMIPReverseDNSRead(ctx, d, meta) + return resourceScalewayIPAMIPReverseDNSRead(ctx, d, m) } -func resourceScalewayIPAMIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - ipamAPI, region, ID, err := ipamAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIPAMIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + ipamAPI, region, ID, err := ipamAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -119,8 +119,8 @@ func resourceScalewayIPAMIPReverseDNSRead(ctx context.Context, d *schema.Resourc return nil } -func resourceScalewayIPAMIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - ipamAPI, region, ID, err := ipamAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIPAMIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + ipamAPI, region, ID, err := ipamAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -143,11 +143,11 @@ func resourceScalewayIPAMIPReverseDNSUpdate(ctx context.Context, d *schema.Resou } } - return resourceScalewayIPAMIPReverseDNSRead(ctx, d, meta) + return resourceScalewayIPAMIPReverseDNSRead(ctx, d, m) } -func resourceScalewayIPAMIPReverseDNSDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - ipamAPI, region, ID, err := ipamAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayIPAMIPReverseDNSDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + ipamAPI, region, ID, err := ipamAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_job_definition.go b/scaleway/resource_job_definition.go index ad7c689c9..a568a2aad 100644 --- a/scaleway/resource_job_definition.go +++ b/scaleway/resource_job_definition.go @@ -90,8 +90,8 @@ func resourceScalewayJobDefinition() *schema.Resource { } } -func resourceScalewayJobDefinitionCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := jobsAPIWithRegion(d, meta) +func resourceScalewayJobDefinitionCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := jobsAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -130,11 +130,11 @@ func resourceScalewayJobDefinitionCreate(ctx context.Context, d *schema.Resource d.SetId(regional.NewIDString(region, definition.ID)) - return resourceScalewayJobDefinitionRead(ctx, d, meta) + return resourceScalewayJobDefinitionRead(ctx, d, m) } -func resourceScalewayJobDefinitionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := jobsAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayJobDefinitionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := jobsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -166,8 +166,8 @@ func resourceScalewayJobDefinitionRead(ctx context.Context, d *schema.ResourceDa return nil } -func resourceScalewayJobDefinitionUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := jobsAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayJobDefinitionUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := jobsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -229,11 +229,11 @@ func resourceScalewayJobDefinitionUpdate(ctx context.Context, d *schema.Resource return diag.FromErr(err) } - return resourceScalewayJobDefinitionRead(ctx, d, meta) + return resourceScalewayJobDefinitionRead(ctx, d, m) } -func resourceScalewayJobDefinitionDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := jobsAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayJobDefinitionDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := jobsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_k8s_cluster.go b/scaleway/resource_k8s_cluster.go index 5f6248ea2..41d1e7f8b 100644 --- a/scaleway/resource_k8s_cluster.go +++ b/scaleway/resource_k8s_cluster.go @@ -318,8 +318,8 @@ func resourceScalewayK8SCluster() *schema.Resource { } //gocyclo:ignore -func resourceScalewayK8SClusterCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - k8sAPI, region, err := k8sAPIWithRegion(d, meta) +func resourceScalewayK8SClusterCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + k8sAPI, region, err := k8sAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -518,11 +518,11 @@ func resourceScalewayK8SClusterCreate(ctx context.Context, d *schema.ResourceDat return append(diag.FromErr(err), diags...) } - return append(resourceScalewayK8SClusterRead(ctx, d, meta), diags...) + return append(resourceScalewayK8SClusterRead(ctx, d, m), diags...) } -func resourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - k8sAPI, region, clusterID, err := k8sAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + k8sAPI, region, clusterID, err := k8sAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -608,8 +608,8 @@ func resourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceData, } //gocyclo:ignore -func resourceScalewayK8SClusterUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - k8sAPI, region, clusterID, err := k8sAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayK8SClusterUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + k8sAPI, region, clusterID, err := k8sAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -828,7 +828,7 @@ func resourceScalewayK8SClusterUpdate(ctx context.Context, d *schema.ResourceDat return append(diag.FromErr(errors.New("it is only possible to change the private network attached to the cluster, but not to remove it")), diags...) } if actual == "" { - err = migrateToPrivateNetworkCluster(ctx, d, meta) + err = migrateToPrivateNetworkCluster(ctx, d, m) if err != nil { return append(diag.FromErr(err), diags...) } @@ -878,11 +878,11 @@ func resourceScalewayK8SClusterUpdate(ctx context.Context, d *schema.ResourceDat } } - return append(resourceScalewayK8SClusterRead(ctx, d, meta), diags...) + return append(resourceScalewayK8SClusterRead(ctx, d, m), diags...) } -func resourceScalewayK8SClusterDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - k8sAPI, region, clusterID, err := k8sAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayK8SClusterDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + k8sAPI, region, clusterID, err := k8sAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_k8s_cluster_test.go b/scaleway/resource_k8s_cluster_test.go index e80286883..feaa46e16 100644 --- a/scaleway/resource_k8s_cluster_test.go +++ b/scaleway/resource_k8s_cluster_test.go @@ -20,7 +20,7 @@ func init() { } func testAccScalewayK8SClusterGetLatestK8SVersion(tt *TestTools) string { - api := k8s.NewAPI(tt.Meta.scwClient) + api := k8s.NewAPI(tt.Meta.ScwClient()) versions, err := api.ListVersions(&k8s.ListVersionsRequest{}) if err != nil { tt.T.Fatalf("Could not get latestK8SVersion: %s", err) @@ -33,7 +33,7 @@ func testAccScalewayK8SClusterGetLatestK8SVersion(tt *TestTools) string { } func testAccScalewayK8SClusterGetLatestK8SVersionMinor(tt *TestTools) string { - api := k8s.NewAPI(tt.Meta.scwClient) + api := k8s.NewAPI(tt.Meta.ScwClient()) versions, err := api.ListVersions(&k8s.ListVersionsRequest{}) if err != nil { tt.T.Fatalf("Could not get latestK8SVersion: %s", err) @@ -47,7 +47,7 @@ func testAccScalewayK8SClusterGetLatestK8SVersionMinor(tt *TestTools) string { } func testAccScalewayK8SClusterGetPreviousK8SVersion(tt *TestTools) string { - api := k8s.NewAPI(tt.Meta.scwClient) + api := k8s.NewAPI(tt.Meta.ScwClient()) versions, err := api.ListVersions(&k8s.ListVersionsRequest{}) if err != nil { tt.T.Fatalf("Could not get latestK8SVersion: %s", err) @@ -60,7 +60,7 @@ func testAccScalewayK8SClusterGetPreviousK8SVersion(tt *TestTools) string { } func testAccScalewayK8SClusterGetPreviousK8SVersionMinor(tt *TestTools) string { - api := k8s.NewAPI(tt.Meta.scwClient) + api := k8s.NewAPI(tt.Meta.ScwClient()) versions, err := api.ListVersions(&k8s.ListVersionsRequest{}) if err != nil { tt.T.Fatalf("Could not get latestK8SVersion: %s", err) diff --git a/scaleway/resource_k8s_pool.go b/scaleway/resource_k8s_pool.go index 7dcd08968..e0d7dadd1 100644 --- a/scaleway/resource_k8s_pool.go +++ b/scaleway/resource_k8s_pool.go @@ -229,8 +229,8 @@ func resourceScalewayK8SPool() *schema.Resource { } //gocyclo:ignore -func resourceScalewayK8SPoolCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - k8sAPI, region, err := k8sAPIWithRegion(d, meta) +func resourceScalewayK8SPoolCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + k8sAPI, region, err := k8sAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -334,11 +334,11 @@ func resourceScalewayK8SPoolCreate(ctx context.Context, d *schema.ResourceData, return diag.FromErr(err) } - return resourceScalewayK8SPoolRead(ctx, d, meta) + return resourceScalewayK8SPoolRead(ctx, d, m) } -func resourceScalewayK8SPoolRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - k8sAPI, region, poolID, err := k8sAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayK8SPoolRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + k8sAPI, region, poolID, err := k8sAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -400,8 +400,8 @@ func resourceScalewayK8SPoolRead(ctx context.Context, d *schema.ResourceData, me return nil } -func resourceScalewayK8SPoolUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - k8sAPI, region, poolID, err := k8sAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayK8SPoolUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + k8sAPI, region, poolID, err := k8sAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -467,11 +467,11 @@ func resourceScalewayK8SPoolUpdate(ctx context.Context, d *schema.ResourceData, } } - return resourceScalewayK8SPoolRead(ctx, d, meta) + return resourceScalewayK8SPoolRead(ctx, d, m) } -func resourceScalewayK8SPoolDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - k8sAPI, region, poolID, err := k8sAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayK8SPoolDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + k8sAPI, region, poolID, err := k8sAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_k8s_pool_test.go b/scaleway/resource_k8s_pool_test.go index d9c4c8020..13b8ef44e 100644 --- a/scaleway/resource_k8s_pool_test.go +++ b/scaleway/resource_k8s_pool_test.go @@ -556,7 +556,7 @@ func testAccCheckScalewayK8SPoolServersAreInPrivateNetwork(tt *TestTools, cluste return err } - instanceAPI := instance.NewAPI(tt.Meta.scwClient) + instanceAPI := instance.NewAPI(tt.Meta.ScwClient()) for _, node := range nodes.Nodes { providerIDSplit := strings.SplitN(node.ProviderID, "/", 5) @@ -617,7 +617,7 @@ func testAccCheckScalewayK8SPoolPublicIP(tt *TestTools, clusterTFName, poolTFNam return err } - instanceAPI := instance.NewAPI(tt.Meta.scwClient) + instanceAPI := instance.NewAPI(tt.Meta.ScwClient()) for _, node := range nodes.Nodes { providerIDSplit := strings.SplitN(node.ProviderID, "/", 5) diff --git a/scaleway/resource_lb.go b/scaleway/resource_lb.go index f6da3ffda..9d6adf4b8 100644 --- a/scaleway/resource_lb.go +++ b/scaleway/resource_lb.go @@ -164,8 +164,8 @@ func resourceScalewayLb() *schema.Resource { } } -func resourceScalewayLbCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, err := lbAPIWithZone(d, meta) +func resourceScalewayLbCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -219,11 +219,11 @@ func resourceScalewayLbCreate(ctx context.Context, d *schema.ResourceData, meta } } - return resourceScalewayLbRead(ctx, d, meta) + return resourceScalewayLbRead(ctx, d, m) } -func resourceScalewayLbRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -271,8 +271,8 @@ func resourceScalewayLbRead(ctx context.Context, d *schema.ResourceData, meta in } //gocyclo:ignore -func resourceScalewayLbUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -395,11 +395,11 @@ func resourceScalewayLbUpdate(ctx context.Context, d *schema.ResourceData, meta } } - return resourceScalewayLbRead(ctx, d, meta) + return resourceScalewayLbRead(ctx, d, m) } -func resourceScalewayLbDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_lb_acl.go b/scaleway/resource_lb_acl.go index 30bb47090..682fb504a 100644 --- a/scaleway/resource_lb_acl.go +++ b/scaleway/resource_lb_acl.go @@ -163,8 +163,8 @@ func resourceScalewayLbACL() *schema.Resource { } } -func resourceScalewayLbACLCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, _, err := lbAPIWithZone(d, meta) +func resourceScalewayLbACLCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, _, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -191,11 +191,11 @@ func resourceScalewayLbACLCreate(ctx context.Context, d *schema.ResourceData, me d.SetId(zonal.NewIDString(frontZone, res.ID)) - return resourceScalewayLbACLRead(ctx, d, meta) + return resourceScalewayLbACLRead(ctx, d, m) } -func resourceScalewayLbACLRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbACLRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -227,8 +227,8 @@ func resourceScalewayLbACLRead(ctx context.Context, d *schema.ResourceData, meta return nil } -func resourceScalewayLbACLUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbACLUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -248,11 +248,11 @@ func resourceScalewayLbACLUpdate(ctx context.Context, d *schema.ResourceData, me return diag.FromErr(err) } - return resourceScalewayLbACLRead(ctx, d, meta) + return resourceScalewayLbACLRead(ctx, d, m) } -func resourceScalewayLbACLDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbACLDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_lb_backend.go b/scaleway/resource_lb_backend.go index 97b988732..65f482c2f 100644 --- a/scaleway/resource_lb_backend.go +++ b/scaleway/resource_lb_backend.go @@ -325,8 +325,8 @@ E.g. 'failover-website.s3-website.fr-par.scw.cloud' if your bucket website URL i } } -func resourceScalewayLbBackendCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, _, err := lbAPIWithZone(d, meta) +func resourceScalewayLbBackendCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, _, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -443,11 +443,11 @@ func resourceScalewayLbBackendCreate(ctx context.Context, d *schema.ResourceData d.SetId(zonal.NewIDString(zone, res.ID)) - return resourceScalewayLbBackendRead(ctx, d, meta) + return resourceScalewayLbBackendRead(ctx, d, m) } -func resourceScalewayLbBackendRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbBackendRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -510,8 +510,8 @@ func resourceScalewayLbBackendRead(ctx context.Context, d *schema.ResourceData, } //gocyclo:ignore -func resourceScalewayLbBackendUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbBackendUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -645,11 +645,11 @@ func resourceScalewayLbBackendUpdate(ctx context.Context, d *schema.ResourceData return diag.FromErr(err) } - return resourceScalewayLbBackendRead(ctx, d, meta) + return resourceScalewayLbBackendRead(ctx, d, m) } -func resourceScalewayLbBackendDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbBackendDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_lb_certificate.go b/scaleway/resource_lb_certificate.go index 967cd216a..99d729f97 100644 --- a/scaleway/resource_lb_certificate.go +++ b/scaleway/resource_lb_certificate.go @@ -127,13 +127,13 @@ func resourceScalewayLbCertificate() *schema.Resource { } } -func resourceScalewayLbCertificateCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceScalewayLbCertificateCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { zone, lbID, err := zonal.ParseID(d.Get("lb_id").(string)) if err != nil { return diag.FromErr(err) } - lbAPI, _, err := lbAPIWithZone(d, meta) + lbAPI, _, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -174,11 +174,11 @@ func resourceScalewayLbCertificateCreate(ctx context.Context, d *schema.Resource return diag.FromErr(err) } - return resourceScalewayLbCertificateRead(ctx, d, meta) + return resourceScalewayLbCertificateRead(ctx, d, m) } -func resourceScalewayLbCertificateRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbCertificateRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -220,8 +220,8 @@ func resourceScalewayLbCertificateRead(ctx context.Context, d *schema.ResourceDa return diags } -func resourceScalewayLbCertificateUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbCertificateUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -251,11 +251,11 @@ func resourceScalewayLbCertificateUpdate(ctx context.Context, d *schema.Resource } } - return resourceScalewayLbCertificateRead(ctx, d, meta) + return resourceScalewayLbCertificateRead(ctx, d, m) } -func resourceScalewayLbCertificateDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, id, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbCertificateDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, id, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_lb_frontend.go b/scaleway/resource_lb_frontend.go index bfc77f66c..8209735c3 100644 --- a/scaleway/resource_lb_frontend.go +++ b/scaleway/resource_lb_frontend.go @@ -231,8 +231,8 @@ func resourceScalewayLbFrontend() *schema.Resource { } } -func resourceScalewayLbFrontendCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, _, err := lbAPIWithZone(d, meta) +func resourceScalewayLbFrontendCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, _, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -294,14 +294,14 @@ func resourceScalewayLbFrontendCreate(ctx context.Context, d *schema.ResourceDat d.SetId(zonal.NewIDString(zone, frontend.ID)) if d.Get("external_acls").(bool) { - return resourceScalewayLbFrontendRead(ctx, d, meta) + return resourceScalewayLbFrontendRead(ctx, d, m) } - return resourceScalewayLbFrontendUpdate(ctx, d, meta) + return resourceScalewayLbFrontendUpdate(ctx, d, m) } -func resourceScalewayLbFrontendRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbFrontendRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -442,8 +442,8 @@ func expandsLBACLs(raw interface{}) []*lbSDK.ACL { return newACL } -func resourceScalewayLbFrontendUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbFrontendUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -488,11 +488,11 @@ func resourceScalewayLbFrontendUpdate(ctx context.Context, d *schema.ResourceDat return diagnostics } - return resourceScalewayLbFrontendRead(ctx, d, meta) + return resourceScalewayLbFrontendRead(ctx, d, m) } -func resourceScalewayLbFrontendDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbFrontendDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_lb_ip.go b/scaleway/resource_lb_ip.go index 336f00fff..f688eeacf 100644 --- a/scaleway/resource_lb_ip.go +++ b/scaleway/resource_lb_ip.go @@ -57,8 +57,8 @@ func resourceScalewayLbIP() *schema.Resource { } } -func resourceScalewayLbIPCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, err := lbAPIWithZone(d, meta) +func resourceScalewayLbIPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -81,11 +81,11 @@ func resourceScalewayLbIPCreate(ctx context.Context, d *schema.ResourceData, met d.SetId(zonal.NewIDString(zone, res.ID)) - return resourceScalewayLbIPRead(ctx, d, meta) + return resourceScalewayLbIPRead(ctx, d, m) } -func resourceScalewayLbIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -131,8 +131,8 @@ func resourceScalewayLbIPRead(ctx context.Context, d *schema.ResourceData, meta return nil } -func resourceScalewayLbIPUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbIPUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -196,12 +196,12 @@ func resourceScalewayLbIPUpdate(ctx context.Context, d *schema.ResourceData, met } } - return resourceScalewayLbIPRead(ctx, d, meta) + return resourceScalewayLbIPRead(ctx, d, m) } //gocyclo:ignore -func resourceScalewayLbIPDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbIPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_lb_route.go b/scaleway/resource_lb_route.go index eccbe3437..f0d79ef08 100644 --- a/scaleway/resource_lb_route.go +++ b/scaleway/resource_lb_route.go @@ -66,8 +66,8 @@ func resourceScalewayLbRoute() *schema.Resource { } } -func resourceScalewayLbRouteCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, _, err := lbAPIWithZone(d, meta) +func resourceScalewayLbRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, _, err := lbAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -103,11 +103,11 @@ func resourceScalewayLbRouteCreate(ctx context.Context, d *schema.ResourceData, d.SetId(zonal.NewIDString(frontZone, route.ID)) - return resourceScalewayLbRouteRead(ctx, d, meta) + return resourceScalewayLbRouteRead(ctx, d, m) } -func resourceScalewayLbRouteRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -134,8 +134,8 @@ func resourceScalewayLbRouteRead(ctx context.Context, d *schema.ResourceData, me return nil } -func resourceScalewayLbRouteUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbRouteUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -164,11 +164,11 @@ func resourceScalewayLbRouteUpdate(ctx context.Context, d *schema.ResourceData, return diag.FromErr(err) } - return resourceScalewayLbRouteRead(ctx, d, meta) + return resourceScalewayLbRouteRead(ctx, d, m) } -func resourceScalewayLbRouteDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - lbAPI, zone, ID, err := lbAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayLbRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + lbAPI, zone, ID, err := lbAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_mnq_nats_account.go b/scaleway/resource_mnq_nats_account.go index 590d04e67..701edf998 100644 --- a/scaleway/resource_mnq_nats_account.go +++ b/scaleway/resource_mnq_nats_account.go @@ -38,8 +38,8 @@ func resourceScalewayMNQNatsAccount() *schema.Resource { } } -func resourceScalewayMNQNatsAccountCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := newMNQNatsAPI(d, meta) +func resourceScalewayMNQNatsAccountCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := newMNQNatsAPI(d, m) if err != nil { return diag.FromErr(err) } @@ -55,11 +55,11 @@ func resourceScalewayMNQNatsAccountCreate(ctx context.Context, d *schema.Resourc d.SetId(regional.NewIDString(region, account.ID)) - return resourceScalewayMNQNatsAccountRead(ctx, d, meta) + return resourceScalewayMNQNatsAccountRead(ctx, d, m) } -func resourceScalewayMNQNatsAccountRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqNatsAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQNatsAccountRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqNatsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -84,8 +84,8 @@ func resourceScalewayMNQNatsAccountRead(ctx context.Context, d *schema.ResourceD return nil } -func resourceScalewayMNQNatsAccountUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqNatsAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQNatsAccountUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqNatsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -103,11 +103,11 @@ func resourceScalewayMNQNatsAccountUpdate(ctx context.Context, d *schema.Resourc return diag.FromErr(err) } - return resourceScalewayMNQNatsAccountRead(ctx, d, meta) + return resourceScalewayMNQNatsAccountRead(ctx, d, m) } -func resourceScalewayMNQNatsAccountDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqNatsAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQNatsAccountDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqNatsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_mnq_nats_credentials.go b/scaleway/resource_mnq_nats_credentials.go index 1629767df..35539b50a 100644 --- a/scaleway/resource_mnq_nats_credentials.go +++ b/scaleway/resource_mnq_nats_credentials.go @@ -44,8 +44,8 @@ func resourceScalewayMNQNatsCredentials() *schema.Resource { } } -func resourceScalewayMNQNatsCredentialsCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := newMNQNatsAPI(d, meta) +func resourceScalewayMNQNatsCredentialsCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := newMNQNatsAPI(d, m) if err != nil { return diag.FromErr(err) } @@ -63,11 +63,11 @@ func resourceScalewayMNQNatsCredentialsCreate(ctx context.Context, d *schema.Res d.SetId(regional.NewIDString(region, credentials.ID)) - return resourceScalewayMNQNatsCredentialsRead(ctx, d, meta) + return resourceScalewayMNQNatsCredentialsRead(ctx, d, m) } -func resourceScalewayMNQNatsCredentialsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqNatsAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQNatsCredentialsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqNatsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -91,8 +91,8 @@ func resourceScalewayMNQNatsCredentialsRead(ctx context.Context, d *schema.Resou return nil } -func resourceScalewayMNQNatsCredentialsUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqNatsAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQNatsCredentialsUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqNatsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -110,11 +110,11 @@ func resourceScalewayMNQNatsCredentialsUpdate(ctx context.Context, d *schema.Res return diag.FromErr(err) } - return resourceScalewayMNQNatsAccountRead(ctx, d, meta) + return resourceScalewayMNQNatsAccountRead(ctx, d, m) } -func resourceScalewayMNQNatsCredentialsDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqNatsAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQNatsCredentialsDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqNatsAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_mnq_sns.go b/scaleway/resource_mnq_sns.go index c665912f0..c134b1aca 100644 --- a/scaleway/resource_mnq_sns.go +++ b/scaleway/resource_mnq_sns.go @@ -31,8 +31,8 @@ func resourceScalewayMNQSNS() *schema.Resource { } } -func resourceScalewayMNQSNSCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := newMNQSNSAPI(d, meta) +func resourceScalewayMNQSNSCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := newMNQSNSAPI(d, m) if err != nil { return diag.FromErr(err) } @@ -47,11 +47,11 @@ func resourceScalewayMNQSNSCreate(ctx context.Context, d *schema.ResourceData, m d.SetId(regional.NewIDString(region, sns.ProjectID)) - return resourceScalewayMNQSNSRead(ctx, d, meta) + return resourceScalewayMNQSNSRead(ctx, d, m) } -func resourceScalewayMNQSNSRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqSNSAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQSNSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqSNSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -71,8 +71,8 @@ func resourceScalewayMNQSNSRead(ctx context.Context, d *schema.ResourceData, met return nil } -func resourceScalewayMNQSNSDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqSNSAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQSNSDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqSNSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_mnq_sns_credentials.go b/scaleway/resource_mnq_sns_credentials.go index 200b29661..61bc48628 100644 --- a/scaleway/resource_mnq_sns_credentials.go +++ b/scaleway/resource_mnq_sns_credentials.go @@ -75,8 +75,8 @@ func resourceScalewayMNQSNSCredentials() *schema.Resource { } } -func resourceScalewayMNQSNSCredentialsCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := newMNQSNSAPI(d, meta) +func resourceScalewayMNQSNSCredentialsCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := newMNQSNSAPI(d, m) if err != nil { return diag.FromErr(err) } @@ -100,11 +100,11 @@ func resourceScalewayMNQSNSCredentialsCreate(ctx context.Context, d *schema.Reso _ = d.Set("access_key", credentials.AccessKey) _ = d.Set("secret_key", credentials.SecretKey) - return resourceScalewayMNQSNSCredentialsRead(ctx, d, meta) + return resourceScalewayMNQSNSCredentialsRead(ctx, d, m) } -func resourceScalewayMNQSNSCredentialsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqSNSAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQSNSCredentialsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqSNSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -136,8 +136,8 @@ func resourceScalewayMNQSNSCredentialsRead(ctx context.Context, d *schema.Resour return nil } -func resourceScalewayMNQSNSCredentialsUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqSNSAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQSNSCredentialsUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqSNSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -171,11 +171,11 @@ func resourceScalewayMNQSNSCredentialsUpdate(ctx context.Context, d *schema.Reso return diag.FromErr(err) } - return resourceScalewayMNQSNSCredentialsRead(ctx, d, meta) + return resourceScalewayMNQSNSCredentialsRead(ctx, d, m) } -func resourceScalewayMNQSNSCredentialsDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqSNSAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQSNSCredentialsDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqSNSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_mnq_sns_topic.go b/scaleway/resource_mnq_sns_topic.go index d6bb1fef2..550337dd3 100644 --- a/scaleway/resource_mnq_sns_topic.go +++ b/scaleway/resource_mnq_sns_topic.go @@ -10,6 +10,7 @@ import ( mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) func resourceScalewayMNQSNSTopic() *schema.Resource { @@ -86,13 +87,13 @@ func resourceScalewayMNQSNSTopic() *schema.Resource { } } -func resourceScalewayMNQSNSTopicCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := newMNQSNSAPI(d, meta) +func resourceScalewayMNQSNSTopicCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := newMNQSNSAPI(d, m) if err != nil { return diag.FromErr(err) } - projectID, _, err := extractProjectID(d, meta.(*Meta)) + projectID, _, err := meta.ExtractProjectID(d, m) if err != nil { return diag.FromErr(err) } @@ -105,7 +106,7 @@ func resourceScalewayMNQSNSTopicCreate(ctx context.Context, d *schema.ResourceDa return diag.FromErr(fmt.Errorf("expected sns to be enabled for given project, go %q", snsInfo.Status)) } - snsClient, _, err := SNSClientWithRegion(d, meta) + snsClient, _, err := SNSClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -134,11 +135,11 @@ func resourceScalewayMNQSNSTopicCreate(ctx context.Context, d *schema.ResourceDa d.SetId(composeMNQID(region, projectID, topicName)) - return resourceScalewayMNQSNSTopicRead(ctx, d, meta) + return resourceScalewayMNQSNSTopicRead(ctx, d, m) } -func resourceScalewayMNQSNSTopicRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - snsClient, _, err := SNSClientWithRegion(d, meta) +func resourceScalewayMNQSNSTopicRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + snsClient, _, err := SNSClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -170,8 +171,8 @@ func resourceScalewayMNQSNSTopicRead(ctx context.Context, d *schema.ResourceData return nil } -func resourceScalewayMNQSNSTopicUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - snsClient, _, err := SNSClientWithRegion(d, meta) +func resourceScalewayMNQSNSTopicUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + snsClient, _, err := SNSClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -214,11 +215,11 @@ func resourceScalewayMNQSNSTopicUpdate(ctx context.Context, d *schema.ResourceDa } } - return resourceScalewayMNQSNSTopicRead(ctx, d, meta) + return resourceScalewayMNQSNSTopicRead(ctx, d, m) } -func resourceScalewayMNQSNSTopicDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - snsClient, _, err := SNSClientWithRegion(d, meta) +func resourceScalewayMNQSNSTopicDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + snsClient, _, err := SNSClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_mnq_sns_topic_subscription.go b/scaleway/resource_mnq_sns_topic_subscription.go index 9671aaa42..13394c95d 100644 --- a/scaleway/resource_mnq_sns_topic_subscription.go +++ b/scaleway/resource_mnq_sns_topic_subscription.go @@ -11,6 +11,7 @@ import ( mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) func resourceScalewayMNQSNSTopicSubscription() *schema.Resource { @@ -86,13 +87,13 @@ func resourceScalewayMNQSNSTopicSubscription() *schema.Resource { } } -func resourceScalewayMNQSNSTopicSubscriptionCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := newMNQSNSAPI(d, meta) +func resourceScalewayMNQSNSTopicSubscriptionCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := newMNQSNSAPI(d, m) if err != nil { return diag.FromErr(err) } - projectID, _, err := extractProjectID(d, meta.(*Meta)) + projectID, _, err := meta.ExtractProjectID(d, m) if err != nil { return diag.FromErr(err) } @@ -105,7 +106,7 @@ func resourceScalewayMNQSNSTopicSubscriptionCreate(ctx context.Context, d *schem return diag.FromErr(fmt.Errorf("expected sns to be enabled for given project, go %q", snsInfo.Status)) } - snsClient, _, err := SNSClientWithRegion(d, meta) + snsClient, _, err := SNSClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -157,11 +158,11 @@ func resourceScalewayMNQSNSTopicSubscriptionCreate(ctx context.Context, d *schem d.SetId(composeMNQSubscriptionID(arn.Region, arn.ProjectID, arn.ResourceName, arn.ExtraResourceID)) - return resourceScalewayMNQSNSTopicSubscriptionRead(ctx, d, meta) + return resourceScalewayMNQSNSTopicSubscriptionRead(ctx, d, m) } -func resourceScalewayMNQSNSTopicSubscriptionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - snsClient, region, err := SNSClientWithRegionFromID(d, meta, d.Id()) +func resourceScalewayMNQSNSTopicSubscriptionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + snsClient, region, err := SNSClientWithRegionFromID(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -193,8 +194,8 @@ func resourceScalewayMNQSNSTopicSubscriptionRead(ctx context.Context, d *schema. return nil } -func resourceScalewayMNQSNSTopicSubscriptionDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - snsClient, _, err := SNSClientWithRegionFromID(d, meta, d.Id()) +func resourceScalewayMNQSNSTopicSubscriptionDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + snsClient, _, err := SNSClientWithRegionFromID(d, m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_mnq_sns_topic_subscription_test.go b/scaleway/resource_mnq_sns_topic_subscription_test.go index 90f6e6392..ee3c47673 100644 --- a/scaleway/resource_mnq_sns_topic_subscription_test.go +++ b/scaleway/resource_mnq_sns_topic_subscription_test.go @@ -92,7 +92,7 @@ func testAccCheckScalewayMNQSNSTopicSubscriptionExists(tt *TestTools, n string) return fmt.Errorf("failed to parse id: %w", err) } - snsClient, err := newSNSClient(tt.Meta.httpClient, arn.Region.String(), rs.Primary.Attributes["sns_endpoint"], rs.Primary.Attributes["access_key"], rs.Primary.Attributes["secret_key"]) + snsClient, err := newSNSClient(tt.Meta.HTTPClient(), arn.Region.String(), rs.Primary.Attributes["sns_endpoint"], rs.Primary.Attributes["access_key"], rs.Primary.Attributes["secret_key"]) if err != nil { return err } @@ -120,7 +120,7 @@ func testAccCheckScalewayMNQSNSTopicSubscriptionDestroy(tt *TestTools) resource. return fmt.Errorf("failed to parse id: %w", err) } - snsClient, err := newSNSClient(tt.Meta.httpClient, arn.Region.String(), rs.Primary.Attributes["sns_endpoint"], rs.Primary.Attributes["access_key"], rs.Primary.Attributes["secret_key"]) + snsClient, err := newSNSClient(tt.Meta.HTTPClient(), arn.Region.String(), rs.Primary.Attributes["sns_endpoint"], rs.Primary.Attributes["access_key"], rs.Primary.Attributes["secret_key"]) if err != nil { return err } diff --git a/scaleway/resource_mnq_sns_topic_test.go b/scaleway/resource_mnq_sns_topic_test.go index bbf448686..58982a3a5 100644 --- a/scaleway/resource_mnq_sns_topic_test.go +++ b/scaleway/resource_mnq_sns_topic_test.go @@ -149,7 +149,7 @@ func testAccCheckScalewayMNQSNSTopicExists(tt *TestTools, n string) resource.Tes return fmt.Errorf("failed to parse id: %w", err) } - snsClient, err := newSNSClient(tt.Meta.httpClient, region.String(), rs.Primary.Attributes["sns_endpoint"], rs.Primary.Attributes["access_key"], rs.Primary.Attributes["secret_key"]) + snsClient, err := newSNSClient(tt.Meta.HTTPClient(), region.String(), rs.Primary.Attributes["sns_endpoint"], rs.Primary.Attributes["access_key"], rs.Primary.Attributes["secret_key"]) if err != nil { return err } @@ -177,7 +177,7 @@ func testAccCheckScalewayMNQSNSTopicDestroy(tt *TestTools) resource.TestCheckFun return fmt.Errorf("failed to parse id: %w", err) } - snsClient, err := newSNSClient(tt.Meta.httpClient, region.String(), rs.Primary.Attributes["sns_endpoint"], rs.Primary.Attributes["access_key"], rs.Primary.Attributes["secret_key"]) + snsClient, err := newSNSClient(tt.Meta.HTTPClient(), region.String(), rs.Primary.Attributes["sns_endpoint"], rs.Primary.Attributes["access_key"], rs.Primary.Attributes["secret_key"]) if err != nil { return err } diff --git a/scaleway/resource_mnq_sqs.go b/scaleway/resource_mnq_sqs.go index c4afcef13..d207dc3c1 100644 --- a/scaleway/resource_mnq_sqs.go +++ b/scaleway/resource_mnq_sqs.go @@ -31,8 +31,8 @@ func resourceScalewayMNQSQS() *schema.Resource { } } -func resourceScalewayMNQSQSCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := newMNQSQSAPI(d, meta) +func resourceScalewayMNQSQSCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := newMNQSQSAPI(d, m) if err != nil { return diag.FromErr(err) } @@ -47,11 +47,11 @@ func resourceScalewayMNQSQSCreate(ctx context.Context, d *schema.ResourceData, m d.SetId(regional.NewIDString(region, sqs.ProjectID)) - return resourceScalewayMNQSQSRead(ctx, d, meta) + return resourceScalewayMNQSQSRead(ctx, d, m) } -func resourceScalewayMNQSQSRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqSQSAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQSQSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqSQSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -71,8 +71,8 @@ func resourceScalewayMNQSQSRead(ctx context.Context, d *schema.ResourceData, met return nil } -func resourceScalewayMNQSQSDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqSQSAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQSQSDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqSQSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_mnq_sqs_credentials.go b/scaleway/resource_mnq_sqs_credentials.go index 6b687debf..dc2b9a2fc 100644 --- a/scaleway/resource_mnq_sqs_credentials.go +++ b/scaleway/resource_mnq_sqs_credentials.go @@ -75,8 +75,8 @@ func resourceScalewayMNQSQSCredentials() *schema.Resource { } } -func resourceScalewayMNQSQSCredentialsCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := newMNQSQSAPI(d, meta) +func resourceScalewayMNQSQSCredentialsCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := newMNQSQSAPI(d, m) if err != nil { return diag.FromErr(err) } @@ -100,11 +100,11 @@ func resourceScalewayMNQSQSCredentialsCreate(ctx context.Context, d *schema.Reso _ = d.Set("access_key", credentials.AccessKey) _ = d.Set("secret_key", credentials.SecretKey) - return resourceScalewayMNQSQSCredentialsRead(ctx, d, meta) + return resourceScalewayMNQSQSCredentialsRead(ctx, d, m) } -func resourceScalewayMNQSQSCredentialsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqSQSAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQSQSCredentialsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqSQSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -136,8 +136,8 @@ func resourceScalewayMNQSQSCredentialsRead(ctx context.Context, d *schema.Resour return nil } -func resourceScalewayMNQSQSCredentialsUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqSQSAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQSQSCredentialsUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqSQSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -171,11 +171,11 @@ func resourceScalewayMNQSQSCredentialsUpdate(ctx context.Context, d *schema.Reso return diag.FromErr(err) } - return resourceScalewayMNQSQSCredentialsRead(ctx, d, meta) + return resourceScalewayMNQSQSCredentialsRead(ctx, d, m) } -func resourceScalewayMNQSQSCredentialsDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := mnqSQSAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayMNQSQSCredentialsDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := mnqSQSAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_mnq_sqs_queue.go b/scaleway/resource_mnq_sqs_queue.go index 1c6e17ae6..e14f85752 100644 --- a/scaleway/resource_mnq_sqs_queue.go +++ b/scaleway/resource_mnq_sqs_queue.go @@ -13,6 +13,7 @@ import ( mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/transport" ) @@ -127,13 +128,13 @@ func resourceScalewayMNQSQSQueue() *schema.Resource { } } -func resourceScalewayMNQSQSQueueCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := newMNQSQSAPI(d, meta) +func resourceScalewayMNQSQSQueueCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := newMNQSQSAPI(d, m) if err != nil { return diag.FromErr(err) } - projectID, _, err := extractProjectID(d, meta.(*Meta)) + projectID, _, err := meta.ExtractProjectID(d, m) if err != nil { return diag.FromErr(err) } @@ -150,7 +151,7 @@ func resourceScalewayMNQSQSQueueCreate(ctx context.Context, d *schema.ResourceDa return diag.FromErr(fmt.Errorf("expected sqs to be enabled for given project, got: %q", sqsInfo.Status)) } - sqsClient, _, err := SQSClientWithRegion(d, meta) + sqsClient, _, err := SQSClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -181,11 +182,11 @@ func resourceScalewayMNQSQSQueueCreate(ctx context.Context, d *schema.ResourceDa d.SetId(composeMNQID(region, projectID, queueName)) - return resourceScalewayMNQSQSQueueRead(ctx, d, meta) + return resourceScalewayMNQSQSQueueRead(ctx, d, m) } -func resourceScalewayMNQSQSQueueRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - sqsClient, _, err := SQSClientWithRegion(d, meta) +func resourceScalewayMNQSQSQueueRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + sqsClient, _, err := SQSClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -233,8 +234,8 @@ func resourceScalewayMNQSQSQueueRead(ctx context.Context, d *schema.ResourceData return nil } -func resourceScalewayMNQSQSQueueUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - sqsClient, _, err := SQSClientWithRegion(d, meta) +func resourceScalewayMNQSQSQueueUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + sqsClient, _, err := SQSClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -270,11 +271,11 @@ func resourceScalewayMNQSQSQueueUpdate(ctx context.Context, d *schema.ResourceDa return diag.Errorf("failed to update SQS Queue attributes: %s", err) } - return resourceScalewayMNQSQSQueueRead(ctx, d, meta) + return resourceScalewayMNQSQSQueueRead(ctx, d, m) } -func resourceScalewayMNQSQSQueueDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - sqsClient, _, err := SQSClientWithRegion(d, meta) +func resourceScalewayMNQSQSQueueDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + sqsClient, _, err := SQSClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_mnq_sqs_queue_test.go b/scaleway/resource_mnq_sqs_queue_test.go index 2df13c807..f3037c828 100644 --- a/scaleway/resource_mnq_sqs_queue_test.go +++ b/scaleway/resource_mnq_sqs_queue_test.go @@ -13,6 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" accountV3 "github.com/scaleway/scaleway-sdk-go/api/account/v3" mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/stretchr/testify/require" ) @@ -99,7 +100,7 @@ func TestAccScalewayMNQSQSQueue_DefaultProject(t *testing.T) { ctx := context.Background() - accountAPI := accountV3.NewProjectAPI(tt.Meta.scwClient) + accountAPI := accountV3.NewProjectAPI(tt.Meta.ScwClient()) projectID := "" project, err := accountAPI.CreateProject(&accountV3.ProjectAPICreateProjectRequest{ Name: "tf_tests_mnq_sqs_queue_default_project", @@ -111,9 +112,9 @@ func TestAccScalewayMNQSQSQueue_DefaultProject(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProviderFactories: func() map[string]func() (*schema.Provider, error) { - metaProd, err := buildMeta(ctx, &metaConfig{ - terraformVersion: "terraform-tests", - httpClient: tt.Meta.httpClient, + metaProd, err := meta.NewMeta(ctx, &meta.Config{ + TerraformVersion: "terraform-tests", + HTTPClient: tt.Meta.HTTPClient(), }) require.NoError(t, err) @@ -175,7 +176,7 @@ func testAccCheckScalewayMNQSQSQueueExists(tt *TestTools, n string) resource.Tes return err } - sqsClient, err := newSQSClient(tt.Meta.httpClient, region.String(), rs.Primary.Attributes["sqs_endpoint"], rs.Primary.Attributes["access_key"], rs.Primary.Attributes["secret_key"]) + sqsClient, err := newSQSClient(tt.Meta.HTTPClient(), region.String(), rs.Primary.Attributes["sqs_endpoint"], rs.Primary.Attributes["access_key"], rs.Primary.Attributes["secret_key"]) if err != nil { return err } @@ -217,7 +218,7 @@ func testAccCheckScalewayMNQSQSQueueDestroy(tt *TestTools) resource.TestCheckFun return err } - mnqAPI := mnq.NewSqsAPI(tt.Meta.scwClient) + mnqAPI := mnq.NewSqsAPI(tt.Meta.ScwClient()) sqsInfo, err := mnqAPI.GetSqsInfo(&mnq.SqsAPIGetSqsInfoRequest{ Region: region, ProjectID: projectID, @@ -231,7 +232,7 @@ func testAccCheckScalewayMNQSQSQueueDestroy(tt *TestTools) resource.TestCheckFun return nil } - sqsClient, err := newSQSClient(tt.Meta.httpClient, region.String(), rs.Primary.Attributes["sqs_endpoint"], rs.Primary.Attributes["access_key"], rs.Primary.Attributes["secret_key"]) + sqsClient, err := newSQSClient(tt.Meta.HTTPClient(), region.String(), rs.Primary.Attributes["sqs_endpoint"], rs.Primary.Attributes["access_key"], rs.Primary.Attributes["secret_key"]) if err != nil { return err } diff --git a/scaleway/resource_object.go b/scaleway/resource_object.go index e71f9b619..485eb1d68 100644 --- a/scaleway/resource_object.go +++ b/scaleway/resource_object.go @@ -106,8 +106,8 @@ func resourceScalewayObject() *schema.Resource { } } -func resourceScalewayObjectCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - s3Client, region, err := s3ClientWithRegion(d, meta) +func resourceScalewayObjectCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + s3Client, region, err := s3ClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -120,7 +120,7 @@ func resourceScalewayObjectCreate(ctx context.Context, d *schema.ResourceData, m bucketRegion := regionalID.Region if bucketRegion != "" && bucketRegion != region { - s3Client, err = s3ClientForceRegion(d, meta, bucketRegion.String()) + s3Client, err = s3ClientForceRegion(d, m, bucketRegion.String()) if err != nil { return diag.FromErr(err) } @@ -178,11 +178,11 @@ func resourceScalewayObjectCreate(ctx context.Context, d *schema.ResourceData, m d.SetId(regional.NewIDString(region, objectID(bucket, key))) - return resourceScalewayObjectRead(ctx, d, meta) + return resourceScalewayObjectRead(ctx, d, m) } -func resourceScalewayObjectUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - s3Client, region, key, bucket, err := s3ClientWithRegionAndNestedName(d, meta, d.Id()) +func resourceScalewayObjectUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + s3Client, region, key, bucket, err := s3ClientWithRegionAndNestedName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -251,11 +251,11 @@ func resourceScalewayObjectUpdate(ctx context.Context, d *schema.ResourceData, m d.SetId(regional.NewIDString(region, objectID(bucketUpdated, keyUpdated))) - return resourceScalewayObjectCreate(ctx, d, meta) + return resourceScalewayObjectCreate(ctx, d, m) } -func resourceScalewayObjectRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - s3Client, region, key, bucket, err := s3ClientWithRegionAndNestedName(d, meta, d.Id()) +func resourceScalewayObjectRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + s3Client, region, key, bucket, err := s3ClientWithRegionAndNestedName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -310,8 +310,8 @@ func resourceScalewayObjectRead(ctx context.Context, d *schema.ResourceData, met return nil } -func resourceScalewayObjectDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - s3Client, _, key, bucket, err := s3ClientWithRegionAndNestedName(d, meta, d.Id()) +func resourceScalewayObjectDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + s3Client, _, key, bucket, err := s3ClientWithRegionAndNestedName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_object_bucket.go b/scaleway/resource_object_bucket.go index 01374572f..573fed32f 100644 --- a/scaleway/resource_object_bucket.go +++ b/scaleway/resource_object_bucket.go @@ -221,12 +221,12 @@ func resourceScalewayObjectBucket() *schema.Resource { } } -func resourceScalewayObjectBucketCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceScalewayObjectBucketCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { bucketName := d.Get("name").(string) objectLockEnabled := d.Get("object_lock_enabled").(bool) acl := d.Get("acl").(string) - s3Client, region, err := s3ClientWithRegion(d, meta) + s3Client, region, err := s3ClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -260,11 +260,11 @@ func resourceScalewayObjectBucketCreate(ctx context.Context, d *schema.ResourceD d.SetId(regional.NewIDString(region, bucketName)) - return resourceScalewayObjectBucketUpdate(ctx, d, meta) + return resourceScalewayObjectBucketUpdate(ctx, d, m) } -func resourceScalewayObjectBucketUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - s3Client, _, bucketName, err := s3ClientWithRegionAndName(d, meta, d.Id()) +func resourceScalewayObjectBucketUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + s3Client, _, bucketName, err := s3ClientWithRegionAndName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -322,7 +322,7 @@ func resourceScalewayObjectBucketUpdate(ctx context.Context, d *schema.ResourceD } } - return resourceScalewayObjectBucketRead(ctx, d, meta) + return resourceScalewayObjectBucketRead(ctx, d, m) } //gocyclo:ignore @@ -446,8 +446,8 @@ func resourceBucketLifecycleUpdate(ctx context.Context, conn *s3.S3, d *schema.R } //gocyclo:ignore -func resourceScalewayObjectBucketRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - s3Client, region, bucketName, err := s3ClientWithRegionAndName(d, meta, d.Id()) +func resourceScalewayObjectBucketRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + s3Client, region, bucketName, err := s3ClientWithRegionAndName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -651,8 +651,8 @@ func resourceScalewayObjectBucketRead(ctx context.Context, d *schema.ResourceDat return diags } -func resourceScalewayObjectBucketDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - s3Client, _, bucketName, err := s3ClientWithRegionAndName(d, meta, d.Id()) +func resourceScalewayObjectBucketDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + s3Client, _, bucketName, err := s3ClientWithRegionAndName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -672,7 +672,7 @@ func resourceScalewayObjectBucketDelete(ctx context.Context, d *schema.ResourceD return diag.FromErr(fmt.Errorf("error S3 bucket force_destroy: %s", err)) } // Try to delete bucket again after deleting objects - return resourceScalewayObjectBucketDelete(ctx, d, meta) + return resourceScalewayObjectBucketDelete(ctx, d, m) } } if err != nil { diff --git a/scaleway/resource_object_bucket_acl.go b/scaleway/resource_object_bucket_acl.go index 49b48f789..c472c43b0 100644 --- a/scaleway/resource_object_bucket_acl.go +++ b/scaleway/resource_object_bucket_acl.go @@ -138,8 +138,8 @@ func resourceScalewayObjectBucketACL() *schema.Resource { } } -func resourceBucketACLCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - conn, region, err := s3ClientWithRegion(d, meta) +func resourceBucketACLCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + conn, region, err := s3ClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -149,7 +149,7 @@ func resourceBucketACLCreate(ctx context.Context, d *schema.ResourceData, meta i bucketRegion := regionalID.Region if bucketRegion != "" && bucketRegion != region { - conn, err = s3ClientForceRegion(d, meta, bucketRegion.String()) + conn, err = s3ClientForceRegion(d, m, bucketRegion.String()) if err != nil { return diag.FromErr(err) } @@ -183,7 +183,7 @@ func resourceBucketACLCreate(ctx context.Context, d *schema.ResourceData, meta i d.SetId(BucketACLCreateResourceID(region, bucket, acl)) - return resourceBucketACLRead(ctx, d, meta) + return resourceBucketACLRead(ctx, d, m) } func expandBucketACLAccessControlPolicy(l []interface{}) *s3.AccessControlPolicy { @@ -362,9 +362,9 @@ func flattenBucketACLAccessControlPolicyOwner(owner *s3.Owner) []interface{} { return []interface{}{m} } -func resourceBucketACLRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceBucketACLRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { expectedBucketOwner := d.Get("expected_bucket_owner") - conn, region, bucket, acl, err := s3ClientWithRegionWithNameACL(d, meta, d.Id()) + conn, region, bucket, acl, err := s3ClientWithRegionWithNameACL(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -414,8 +414,8 @@ 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, meta interface{}) diag.Diagnostics { - conn, region, bucket, acl, err := s3ClientWithRegionWithNameACL(d, meta, d.Id()) +func resourceBucketACLUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + conn, region, bucket, acl, err := s3ClientWithRegionWithNameACL(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -447,7 +447,7 @@ func resourceBucketACLUpdate(ctx context.Context, d *schema.ResourceData, meta i d.SetId(BucketACLCreateResourceID(region, bucket, acl)) } - return resourceBucketACLRead(ctx, d, meta) + return resourceBucketACLRead(ctx, d, m) } func resourceBucketACLDelete(ctx context.Context, _ *schema.ResourceData, _ interface{}) diag.Diagnostics { diff --git a/scaleway/resource_object_bucket_lock_configuration.go b/scaleway/resource_object_bucket_lock_configuration.go index 51d5d598f..9b15dc824 100644 --- a/scaleway/resource_object_bucket_lock_configuration.go +++ b/scaleway/resource_object_bucket_lock_configuration.go @@ -77,8 +77,8 @@ func resourceObjectLockConfiguration() *schema.Resource { } } -func resourceObjectLockConfigurationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - conn, region, err := s3ClientWithRegion(d, meta) +func resourceObjectLockConfigurationCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + conn, region, err := s3ClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -88,7 +88,7 @@ func resourceObjectLockConfigurationCreate(ctx context.Context, d *schema.Resour bucketRegion := regionalID.Region if bucketRegion != "" && bucketRegion != region { - conn, err = s3ClientForceRegion(d, meta, bucketRegion.String()) + conn, err = s3ClientForceRegion(d, m, bucketRegion.String()) if err != nil { return diag.FromErr(err) } @@ -110,11 +110,11 @@ func resourceObjectLockConfigurationCreate(ctx context.Context, d *schema.Resour d.SetId(regional.NewIDString(region, bucket)) - return resourceObjectLockConfigurationRead(ctx, d, meta) + return resourceObjectLockConfigurationRead(ctx, d, m) } -func resourceObjectLockConfigurationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - conn, _, bucket, err := s3ClientWithRegionAndName(d, meta, d.Id()) +func resourceObjectLockConfigurationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + conn, _, bucket, err := s3ClientWithRegionAndName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -154,8 +154,8 @@ func resourceObjectLockConfigurationRead(ctx context.Context, d *schema.Resource return nil } -func resourceObjectLockConfigurationUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - conn, _, bucket, err := s3ClientWithRegionAndName(d, meta, d.Id()) +func resourceObjectLockConfigurationUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + conn, _, bucket, err := s3ClientWithRegionAndName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -175,11 +175,11 @@ func resourceObjectLockConfigurationUpdate(ctx context.Context, d *schema.Resour return diag.FromErr(fmt.Errorf("error updating Object bucket lock configuration (%s): %w", d.Id(), err)) } - return resourceObjectLockConfigurationRead(ctx, d, meta) + return resourceObjectLockConfigurationRead(ctx, d, m) } -func resourceObjectLockConfigurationDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - conn, _, bucket, err := s3ClientWithRegionAndName(d, meta, d.Id()) +func resourceObjectLockConfigurationDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + conn, _, bucket, err := s3ClientWithRegionAndName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_object_bucket_policy.go b/scaleway/resource_object_bucket_policy.go index 8612be346..39faaee21 100644 --- a/scaleway/resource_object_bucket_policy.go +++ b/scaleway/resource_object_bucket_policy.go @@ -48,8 +48,8 @@ func resourceScalewayObjectBucketPolicy() *schema.Resource { } } -func resourceScalewayObjectBucketPolicyCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - s3Client, region, err := s3ClientWithRegion(d, meta) +func resourceScalewayObjectBucketPolicyCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + s3Client, region, err := s3ClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -60,7 +60,7 @@ func resourceScalewayObjectBucketPolicyCreate(ctx context.Context, d *schema.Res tflog.Debug(ctx, "bucket name: "+bucket) if bucketRegion != "" && bucketRegion != region { - s3Client, err = s3ClientForceRegion(d, meta, bucketRegion.String()) + s3Client, err = s3ClientForceRegion(d, m, bucketRegion.String()) if err != nil { return diag.FromErr(err) } @@ -99,12 +99,12 @@ func resourceScalewayObjectBucketPolicyCreate(ctx context.Context, d *schema.Res d.SetId(regional.NewIDString(region, bucket)) - return resourceScalewayObjectBucketPolicyRead(ctx, d, meta) + return resourceScalewayObjectBucketPolicyRead(ctx, d, m) } //gocyclo:ignore -func resourceScalewayObjectBucketPolicyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - s3Client, region, _, err := s3ClientWithRegionAndName(d, meta, d.Id()) +func resourceScalewayObjectBucketPolicyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + s3Client, region, _, err := s3ClientWithRegionAndName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -163,8 +163,8 @@ func resourceScalewayObjectBucketPolicyRead(ctx context.Context, d *schema.Resou return diags } -func resourceScalewayObjectBucketPolicyDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - s3Client, _, bucketName, err := s3ClientWithRegionAndName(d, meta, d.Id()) +func resourceScalewayObjectBucketPolicyDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + s3Client, _, bucketName, err := s3ClientWithRegionAndName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_object_bucket_test.go b/scaleway/resource_object_bucket_test.go index f9a792511..dd42dd5b2 100644 --- a/scaleway/resource_object_bucket_test.go +++ b/scaleway/resource_object_bucket_test.go @@ -37,7 +37,7 @@ func TestAccScalewayObjectBucket_Basic(t *testing.T) { bucketSecondary := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket-secondary") objectBucketTestMainRegion := scw.RegionFrPar objectBucketTestSecondaryRegion := scw.RegionNlAms - objectBucketTestDefaultRegion, _ := tt.Meta.scwClient.GetDefaultRegion() + objectBucketTestDefaultRegion, _ := tt.Meta.ScwClient().GetDefaultRegion() resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/scaleway/resource_object_bucket_website_configuration.go b/scaleway/resource_object_bucket_website_configuration.go index 87c293bb6..0b74bca23 100644 --- a/scaleway/resource_object_bucket_website_configuration.go +++ b/scaleway/resource_object_bucket_website_configuration.go @@ -79,8 +79,8 @@ func ResourceBucketWebsiteConfiguration() *schema.Resource { } } -func resourceBucketWebsiteConfigurationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - conn, region, err := s3ClientWithRegion(d, meta) +func resourceBucketWebsiteConfigurationCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + conn, region, err := s3ClientWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -90,7 +90,7 @@ func resourceBucketWebsiteConfigurationCreate(ctx context.Context, d *schema.Res bucketRegion := regionalID.Region if bucketRegion != "" && bucketRegion != region { - conn, err = s3ClientForceRegion(d, meta, bucketRegion.String()) + conn, err = s3ClientForceRegion(d, m, bucketRegion.String()) if err != nil { return diag.FromErr(err) } @@ -124,11 +124,11 @@ func resourceBucketWebsiteConfigurationCreate(ctx context.Context, d *schema.Res d.SetId(regional.NewIDString(region, bucket)) - return resourceBucketWebsiteConfigurationRead(ctx, d, meta) + return resourceBucketWebsiteConfigurationRead(ctx, d, m) } -func resourceBucketWebsiteConfigurationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - conn, region, bucket, err := s3ClientWithRegionAndName(d, meta, d.Id()) +func resourceBucketWebsiteConfigurationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + conn, region, bucket, err := s3ClientWithRegionAndName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -192,8 +192,8 @@ func resourceBucketWebsiteConfigurationRead(ctx context.Context, d *schema.Resou return nil } -func resourceBucketWebsiteConfigurationUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - conn, _, bucket, err := s3ClientWithRegionAndName(d, meta, d.Id()) +func resourceBucketWebsiteConfigurationUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + conn, _, bucket, err := s3ClientWithRegionAndName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -216,11 +216,11 @@ func resourceBucketWebsiteConfigurationUpdate(ctx context.Context, d *schema.Res return diag.FromErr(fmt.Errorf("error updating Object bucket website configuration (%s): %w", d.Id(), err)) } - return resourceBucketWebsiteConfigurationRead(ctx, d, meta) + return resourceBucketWebsiteConfigurationRead(ctx, d, m) } -func resourceBucketWebsiteConfigurationDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - conn, _, bucket, err := s3ClientWithRegionAndName(d, meta, d.Id()) +func resourceBucketWebsiteConfigurationDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + conn, _, bucket, err := s3ClientWithRegionAndName(d, m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_rdb_acl.go b/scaleway/resource_rdb_acl.go index c9a192083..31e6059a1 100644 --- a/scaleway/resource_rdb_acl.go +++ b/scaleway/resource_rdb_acl.go @@ -70,8 +70,8 @@ func resourceScalewayRdbACL() *schema.Resource { } } -func resourceScalewayRdbACLCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := rdbAPIWithRegion(d, meta) +func resourceScalewayRdbACLCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := rdbAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -99,11 +99,11 @@ func resourceScalewayRdbACLCreate(ctx context.Context, d *schema.ResourceData, m d.SetId(instanceID) - return resourceScalewayRdbACLRead(ctx, d, meta) + return resourceScalewayRdbACLRead(ctx, d, m) } -func resourceScalewayRdbACLRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, instanceID, err := rdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRdbACLRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, instanceID, err := rdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -152,8 +152,8 @@ func resourceScalewayRdbACLRead(ctx context.Context, d *schema.ResourceData, met return diags } -func resourceScalewayRdbACLUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, instanceID, err := rdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRdbACLUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, instanceID, err := rdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -185,11 +185,11 @@ func resourceScalewayRdbACLUpdate(ctx context.Context, d *schema.ResourceData, m } } - return resourceScalewayRdbACLRead(ctx, d, meta) + return resourceScalewayRdbACLRead(ctx, d, m) } -func resourceScalewayRdbACLDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, instanceID, err := rdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRdbACLDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, instanceID, err := rdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_rdb_database.go b/scaleway/resource_rdb_database.go index 070f1df26..e4c6b3f17 100644 --- a/scaleway/resource_rdb_database.go +++ b/scaleway/resource_rdb_database.go @@ -79,8 +79,8 @@ func resourceScalewayRdbDatabase() *schema.Resource { } } -func resourceScalewayRdbDatabaseCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI := newRdbAPI(meta) +func resourceScalewayRdbDatabaseCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI := newRdbAPI(m) region, instanceID, err := regional.ParseID(d.Get("instance_id").(string)) if err != nil { return diag.FromErr(err) @@ -124,7 +124,7 @@ func resourceScalewayRdbDatabaseCreate(ctx context.Context, d *schema.ResourceDa d.SetId(resourceScalewayRdbDatabaseID(region, instanceID, db.Name)) _ = d.Set("region", region) - return resourceScalewayRdbDatabaseRead(ctx, d, meta) + return resourceScalewayRdbDatabaseRead(ctx, d, m) } func getDatabase(ctx context.Context, api *rdb.API, r scw.Region, instanceID, dbName string) (*rdb.Database, error) { @@ -144,8 +144,8 @@ func getDatabase(ctx context.Context, api *rdb.API, r scw.Region, instanceID, db return res.Databases[0], nil } -func resourceScalewayRdbDatabaseRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI := newRdbAPI(meta) +func resourceScalewayRdbDatabaseRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI := newRdbAPI(m) region, instanceID, databaseName, err := resourceScalewayRdbDatabaseParseID(d.Id()) if err != nil { return diag.FromErr(err) @@ -171,8 +171,8 @@ func resourceScalewayRdbDatabaseRead(ctx context.Context, d *schema.ResourceData return nil } -func resourceScalewayRdbDatabaseDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI := newRdbAPI(meta) +func resourceScalewayRdbDatabaseDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI := newRdbAPI(m) region, instanceID, databaseName, err := resourceScalewayRdbDatabaseParseID(d.Id()) if err != nil { return diag.FromErr(err) diff --git a/scaleway/resource_rdb_database_backup.go b/scaleway/resource_rdb_database_backup.go index 2965fa0c9..faa3d16b8 100644 --- a/scaleway/resource_rdb_database_backup.go +++ b/scaleway/resource_rdb_database_backup.go @@ -82,8 +82,8 @@ func resourceScalewayRdbDatabaseBackup() *schema.Resource { } } -func resourceScalewayRdbDatabaseBackupCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, err := rdbAPIWithRegion(d, meta) +func resourceScalewayRdbDatabaseBackupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, err := rdbAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -110,11 +110,11 @@ func resourceScalewayRdbDatabaseBackupCreate(ctx context.Context, d *schema.Reso return diag.FromErr(err) } - return resourceScalewayRdbDatabaseBackupRead(ctx, d, meta) + return resourceScalewayRdbDatabaseBackupRead(ctx, d, m) } -func resourceScalewayRdbDatabaseBackupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, id, err := rdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRdbDatabaseBackupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, id, err := rdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -143,8 +143,8 @@ func resourceScalewayRdbDatabaseBackupRead(ctx context.Context, d *schema.Resour return nil } -func resourceScalewayRdbDatabaseBackupUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, id, err := rdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRdbDatabaseBackupUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, id, err := rdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -177,11 +177,11 @@ func resourceScalewayRdbDatabaseBackupUpdate(ctx context.Context, d *schema.Reso return diag.FromErr(err) } - return resourceScalewayRdbDatabaseBackupRead(ctx, d, meta) + return resourceScalewayRdbDatabaseBackupRead(ctx, d, m) } -func resourceScalewayRdbDatabaseBackupDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, id, err := rdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRdbDatabaseBackupDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, id, err := rdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_rdb_instance.go b/scaleway/resource_rdb_instance.go index 7c38df254..08b1174b6 100644 --- a/scaleway/resource_rdb_instance.go +++ b/scaleway/resource_rdb_instance.go @@ -285,8 +285,8 @@ func resourceScalewayRdbInstance() *schema.Resource { } } -func resourceScalewayRdbInstanceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, err := rdbAPIWithRegion(d, meta) +func resourceScalewayRdbInstanceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, err := rdbAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -388,11 +388,11 @@ func resourceScalewayRdbInstanceCreate(ctx context.Context, d *schema.ResourceDa } } - return resourceScalewayRdbInstanceRead(ctx, d, meta) + return resourceScalewayRdbInstanceRead(ctx, d, m) } -func resourceScalewayRdbInstanceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, ID, err := rdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, ID, err := rdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -471,7 +471,7 @@ func resourceScalewayRdbInstanceRead(ctx context.Context, d *schema.ResourceData _ = d.Set("init_settings", flattenInstanceSettings(res.InitSettings)) // set endpoints - enableIpam, err := getIPAMConfigRead(res, meta) + enableIpam, err := getIPAMConfigRead(res, m) if err != nil { return diag.FromErr(err) } @@ -486,8 +486,8 @@ func resourceScalewayRdbInstanceRead(ctx context.Context, d *schema.ResourceData } //gocyclo:ignore -func resourceScalewayRdbInstanceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, ID, err := rdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRdbInstanceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, ID, err := rdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -768,11 +768,11 @@ func resourceScalewayRdbInstanceUpdate(ctx context.Context, d *schema.ResourceDa } } - return resourceScalewayRdbInstanceRead(ctx, d, meta) + return resourceScalewayRdbInstanceRead(ctx, d, m) } -func resourceScalewayRdbInstanceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, ID, err := rdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRdbInstanceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, ID, err := rdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_rdb_instance_test.go b/scaleway/resource_rdb_instance_test.go index 9af2f3c80..9eb19dbf4 100644 --- a/scaleway/resource_rdb_instance_test.go +++ b/scaleway/resource_rdb_instance_test.go @@ -24,7 +24,7 @@ func init() { } func testAccCheckScalewayRdbEngineGetLatestVersion(tt *TestTools, engineName string) string { - api := rdb.NewAPI(tt.Meta.scwClient) + api := rdb.NewAPI(tt.Meta.ScwClient()) engines, err := api.ListDatabaseEngines(&rdb.ListDatabaseEnginesRequest{}) if err != nil { tt.T.Fatalf("Could not get latest engine version: %s", err) diff --git a/scaleway/resource_rdb_privilege.go b/scaleway/resource_rdb_privilege.go index fbd4d6382..414ac4208 100644 --- a/scaleway/resource_rdb_privilege.go +++ b/scaleway/resource_rdb_privilege.go @@ -72,8 +72,8 @@ func resourceScalewayRdbPrivilege() *schema.Resource { } } -func resourceScalewayRdbPrivilegeCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := rdbAPIWithRegion(d, meta) +func resourceScalewayRdbPrivilegeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := rdbAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -120,11 +120,11 @@ func resourceScalewayRdbPrivilegeCreate(ctx context.Context, d *schema.ResourceD d.SetId(resourceScalewayRdbUserPrivilegeID(region, locality.ExpandID(instanceID), databaseName, userName)) - return resourceScalewayRdbPrivilegeRead(ctx, d, meta) + return resourceScalewayRdbPrivilegeRead(ctx, d, m) } -func resourceScalewayRdbPrivilegeRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api := newRdbAPI(meta) +func resourceScalewayRdbPrivilegeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api := newRdbAPI(m) region, instanceID, databaseName, userName, err := resourceScalewayRdbUserPrivilegeParseID(d.Id()) if err != nil { @@ -185,8 +185,8 @@ func resourceScalewayRdbPrivilegeRead(ctx context.Context, d *schema.ResourceDat return nil } -func resourceScalewayRdbPrivilegeUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI := newRdbAPI(meta) +func resourceScalewayRdbPrivilegeUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI := newRdbAPI(m) region, instanceID, databaseName, userName, err := resourceScalewayRdbUserPrivilegeParseID(d.Id()) if err != nil { return diag.FromErr(err) @@ -250,8 +250,8 @@ func resourceScalewayRdbPrivilegeUpdate(ctx context.Context, d *schema.ResourceD } //gocyclo:ignore -func resourceScalewayRdbPrivilegeDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI := newRdbAPI(meta) +func resourceScalewayRdbPrivilegeDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI := newRdbAPI(m) region, instanceID, databaseName, userName, err := resourceScalewayRdbUserPrivilegeParseID(d.Id()) if err != nil { return diag.FromErr(err) diff --git a/scaleway/resource_rdb_read_replica.go b/scaleway/resource_rdb_read_replica.go index a9929677c..9743d0dd3 100644 --- a/scaleway/resource_rdb_read_replica.go +++ b/scaleway/resource_rdb_read_replica.go @@ -150,8 +150,8 @@ func resourceScalewayRdbReadReplica() *schema.Resource { } } -func resourceScalewayRdbReadReplicaCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, err := rdbAPIWithRegion(d, meta) +func resourceScalewayRdbReadReplicaCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, err := rdbAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -189,11 +189,11 @@ func resourceScalewayRdbReadReplicaCreate(ctx context.Context, d *schema.Resourc return diag.FromErr(err) } - return resourceScalewayRdbReadReplicaRead(ctx, d, meta) + return resourceScalewayRdbReadReplicaRead(ctx, d, m) } -func resourceScalewayRdbReadReplicaRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, ID, err := rdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRdbReadReplicaRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, ID, err := rdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -207,7 +207,7 @@ func resourceScalewayRdbReadReplicaRead(ctx context.Context, d *schema.ResourceD return diag.FromErr(err) } - enableIpam, err := getIPAMConfigRead(rr, meta) + enableIpam, err := getIPAMConfigRead(rr, m) if err != nil { return diag.FromErr(err) } @@ -224,8 +224,8 @@ func resourceScalewayRdbReadReplicaRead(ctx context.Context, d *schema.ResourceD } //gocyclo:ignore -func resourceScalewayRdbReadReplicaUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, ID, err := rdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRdbReadReplicaUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, ID, err := rdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -318,11 +318,11 @@ func resourceScalewayRdbReadReplicaUpdate(ctx context.Context, d *schema.Resourc return diag.FromErr(err) } - return resourceScalewayRdbReadReplicaRead(ctx, d, meta) + return resourceScalewayRdbReadReplicaRead(ctx, d, m) } -func resourceScalewayRdbReadReplicaDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI, region, ID, err := rdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRdbReadReplicaDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI, region, ID, err := rdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_rdb_user.go b/scaleway/resource_rdb_user.go index c23131fdd..5c3e3e523 100644 --- a/scaleway/resource_rdb_user.go +++ b/scaleway/resource_rdb_user.go @@ -64,8 +64,8 @@ func resourceScalewayRdbUser() *schema.Resource { } } -func resourceScalewayRdbUserCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI := newRdbAPI(meta) +func resourceScalewayRdbUserCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI := newRdbAPI(m) // resource depends on the instance locality regionalID := d.Get("instance_id").(string) region, instanceID, err := regional.ParseID(regionalID) @@ -110,11 +110,11 @@ func resourceScalewayRdbUserCreate(ctx context.Context, d *schema.ResourceData, d.SetId(resourceScalewayRdbUserID(region, locality.ExpandID(instanceID), user.Name)) - return resourceScalewayRdbUserRead(ctx, d, meta) + return resourceScalewayRdbUserRead(ctx, d, m) } -func resourceScalewayRdbUserRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI := newRdbAPI(meta) +func resourceScalewayRdbUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI := newRdbAPI(m) region, instanceID, userName, err := resourceScalewayRdbUserParseID(d.Id()) if err != nil { return diag.FromErr(err) @@ -158,8 +158,8 @@ func resourceScalewayRdbUserRead(ctx context.Context, d *schema.ResourceData, me return nil } -func resourceScalewayRdbUserUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI := newRdbAPI(meta) +func resourceScalewayRdbUserUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI := newRdbAPI(m) // resource depends on the instance locality region, instanceID, userName, err := resourceScalewayRdbUserParseID(d.Id()) if err != nil { @@ -189,11 +189,11 @@ func resourceScalewayRdbUserUpdate(ctx context.Context, d *schema.ResourceData, return diag.FromErr(err) } - return resourceScalewayRdbUserRead(ctx, d, meta) + return resourceScalewayRdbUserRead(ctx, d, m) } -func resourceScalewayRdbUserDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - rdbAPI := newRdbAPI(meta) +func resourceScalewayRdbUserDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + rdbAPI := newRdbAPI(m) // resource depends on the instance locality region, instanceID, userName, err := resourceScalewayRdbUserParseID(d.Id()) if err != nil { diff --git a/scaleway/resource_redis_cluster.go b/scaleway/resource_redis_cluster.go index 27e13b1d4..68efedaad 100644 --- a/scaleway/resource_redis_cluster.go +++ b/scaleway/resource_redis_cluster.go @@ -227,8 +227,8 @@ func customizeDiffMigrateClusterSize() schema.CustomizeDiffFunc { } } -func resourceScalewayRedisClusterCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - redisAPI, zone, err := redisAPIWithZone(d, meta) +func resourceScalewayRedisClusterCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + redisAPI, zone, err := redisAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -289,11 +289,11 @@ func resourceScalewayRedisClusterCreate(ctx context.Context, d *schema.ResourceD return diag.FromErr(err) } - return resourceScalewayRedisClusterRead(ctx, d, meta) + return resourceScalewayRedisClusterRead(ctx, d, m) } -func resourceScalewayRedisClusterRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - redisAPI, zone, ID, err := redisAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayRedisClusterRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + redisAPI, zone, ID, err := redisAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -357,8 +357,8 @@ func resourceScalewayRedisClusterRead(ctx context.Context, d *schema.ResourceDat return nil } -func resourceScalewayRedisClusterUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - redisAPI, zone, ID, err := redisAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayRedisClusterUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + redisAPI, zone, ID, err := redisAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -453,7 +453,7 @@ func resourceScalewayRedisClusterUpdate(ctx context.Context, d *schema.ResourceD return diag.FromErr(err) } - return resourceScalewayRedisClusterRead(ctx, d, meta) + return resourceScalewayRedisClusterRead(ctx, d, m) } func resourceScalewayRedisClusterUpdateACL(ctx context.Context, d *schema.ResourceData, redisAPI *redis.API, zone scw.Zone, clusterID string) diag.Diagnostics { @@ -525,8 +525,8 @@ func resourceScalewayRedisClusterUpdateEndpoints(ctx context.Context, d *schema. return nil } -func resourceScalewayRedisClusterDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - redisAPI, zone, ID, err := redisAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayRedisClusterDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + redisAPI, zone, ID, err := redisAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_redis_cluster_test.go b/scaleway/resource_redis_cluster_test.go index dff526c7d..012dad229 100644 --- a/scaleway/resource_redis_cluster_test.go +++ b/scaleway/resource_redis_cluster_test.go @@ -1019,7 +1019,7 @@ func testAccCheckScalewayRedisCertificateIsValid(name string) resource.TestCheck } func testAccScalewayRedisClusterGetLatestVersion(tt *TestTools) string { - api := redis.NewAPI(tt.Meta.scwClient) + api := redis.NewAPI(tt.Meta.ScwClient()) versions, err := api.ListClusterVersions(&redis.ListClusterVersionsRequest{}) if err != nil { diff --git a/scaleway/resource_registry_namespace.go b/scaleway/resource_registry_namespace.go index 7ccab9cfe..8227d3bf1 100644 --- a/scaleway/resource_registry_namespace.go +++ b/scaleway/resource_registry_namespace.go @@ -56,8 +56,8 @@ func resourceScalewayRegistryNamespace() *schema.Resource { } } -func resourceScalewayRegistryNamespaceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := registryAPIWithRegion(d, meta) +func resourceScalewayRegistryNamespaceCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := registryAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -80,11 +80,11 @@ func resourceScalewayRegistryNamespaceCreate(ctx context.Context, d *schema.Reso return diag.FromErr(err) } - return resourceScalewayRegistryNamespaceRead(ctx, d, meta) + return resourceScalewayRegistryNamespaceRead(ctx, d, m) } -func resourceScalewayRegistryNamespaceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := registryAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRegistryNamespaceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := registryAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -109,8 +109,8 @@ func resourceScalewayRegistryNamespaceRead(ctx context.Context, d *schema.Resour return nil } -func resourceScalewayRegistryNamespaceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := registryAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRegistryNamespaceUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := registryAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -135,11 +135,11 @@ func resourceScalewayRegistryNamespaceUpdate(ctx context.Context, d *schema.Reso } } - return resourceScalewayRegistryNamespaceRead(ctx, d, meta) + return resourceScalewayRegistryNamespaceRead(ctx, d, m) } -func resourceScalewayRegistryNamespaceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := registryAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayRegistryNamespaceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := registryAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_sdb_sql_database.go b/scaleway/resource_sdb_sql_database.go index 14cce440e..4e467a2c7 100644 --- a/scaleway/resource_sdb_sql_database.go +++ b/scaleway/resource_sdb_sql_database.go @@ -57,8 +57,8 @@ func resourceScalewaySDBSQLDatabase() *schema.Resource { } } -func resourceScalewayServerlessSQLDBDatabaseCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := serverlessSQLdbAPIWithRegion(d, meta) +func resourceScalewayServerlessSQLDBDatabaseCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := serverlessSQLdbAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -82,11 +82,11 @@ func resourceScalewayServerlessSQLDBDatabaseCreate(ctx context.Context, d *schem return diag.FromErr(err) } - return resourceScalewayServerlessSQLDBDatabaseRead(ctx, d, meta) + return resourceScalewayServerlessSQLDBDatabaseRead(ctx, d, m) } -func resourceScalewayServerlessSQLDBDatabaseRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := serverlessSQLdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayServerlessSQLDBDatabaseRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := serverlessSQLdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -110,8 +110,8 @@ func resourceScalewayServerlessSQLDBDatabaseRead(ctx context.Context, d *schema. return nil } -func resourceScalewayServerlessSQLDBDatabaseUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := serverlessSQLdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayServerlessSQLDBDatabaseUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := serverlessSQLdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -141,11 +141,11 @@ func resourceScalewayServerlessSQLDBDatabaseUpdate(ctx context.Context, d *schem return diag.FromErr(err) } - return resourceScalewayServerlessSQLDBDatabaseRead(ctx, d, meta) + return resourceScalewayServerlessSQLDBDatabaseRead(ctx, d, m) } -func resourceScalewayServerlessSQLDBDatabaseDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := serverlessSQLdbAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayServerlessSQLDBDatabaseDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := serverlessSQLdbAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_secret.go b/scaleway/resource_secret.go index 6a6e302bf..3f8227609 100644 --- a/scaleway/resource_secret.go +++ b/scaleway/resource_secret.go @@ -78,8 +78,8 @@ func resourceScalewaySecret() *schema.Resource { } } -func resourceScalewaySecretCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := secretAPIWithRegion(d, meta) +func resourceScalewaySecretCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := secretAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -112,11 +112,11 @@ func resourceScalewaySecretCreate(ctx context.Context, d *schema.ResourceData, m d.SetId(regional.NewIDString(region, secretResponse.ID)) - return resourceScalewaySecretRead(ctx, d, meta) + return resourceScalewaySecretRead(ctx, d, m) } -func resourceScalewaySecretRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := secretAPIWithRegionAndID(meta, d.Id()) +func resourceScalewaySecretRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := secretAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -150,8 +150,8 @@ func resourceScalewaySecretRead(ctx context.Context, d *schema.ResourceData, met return nil } -func resourceScalewaySecretUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := secretAPIWithRegionAndID(meta, d.Id()) +func resourceScalewaySecretUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := secretAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -194,11 +194,11 @@ func resourceScalewaySecretUpdate(ctx context.Context, d *schema.ResourceData, m } } - return resourceScalewaySecretRead(ctx, d, meta) + return resourceScalewaySecretRead(ctx, d, m) } -func resourceScalewaySecretDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := secretAPIWithRegionAndID(meta, d.Id()) +func resourceScalewaySecretDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := secretAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_secret_version.go b/scaleway/resource_secret_version.go index 25219f171..ed24fc8da 100644 --- a/scaleway/resource_secret_version.go +++ b/scaleway/resource_secret_version.go @@ -73,8 +73,8 @@ func resourceScalewaySecretVersion() *schema.Resource { } } -func resourceScalewaySecretVersionCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := secretAPIWithRegion(d, meta) +func resourceScalewaySecretVersionCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := secretAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -100,11 +100,11 @@ func resourceScalewaySecretVersionCreate(ctx context.Context, d *schema.Resource d.SetId(regional.NewIDString(region, fmt.Sprintf("%s/%d", secretResponse.SecretID, secretResponse.Revision))) - return resourceScalewaySecretVersionRead(ctx, d, meta) + return resourceScalewaySecretVersionRead(ctx, d, m) } -func resourceScalewaySecretVersionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, revision, err := secretVersionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewaySecretVersionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, revision, err := secretVersionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -134,8 +134,8 @@ func resourceScalewaySecretVersionRead(ctx context.Context, d *schema.ResourceDa return nil } -func resourceScalewaySecretVersionUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, revision, err := secretVersionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewaySecretVersionUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, revision, err := secretVersionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -160,11 +160,11 @@ func resourceScalewaySecretVersionUpdate(ctx context.Context, d *schema.Resource } } - return resourceScalewaySecretVersionRead(ctx, d, meta) + return resourceScalewaySecretVersionRead(ctx, d, m) } -func resourceScalewaySecretVersionDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, revision, err := secretVersionAPIWithRegionAndID(meta, d.Id()) +func resourceScalewaySecretVersionDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, revision, err := secretVersionAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_tem_domain.go b/scaleway/resource_tem_domain.go index 52f1030a2..ec23a75bd 100644 --- a/scaleway/resource_tem_domain.go +++ b/scaleway/resource_tem_domain.go @@ -167,8 +167,8 @@ func resourceScalewayTemDomain() *schema.Resource { } } -func resourceScalewayTemDomainCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := temAPIWithRegion(d, meta) +func resourceScalewayTemDomainCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := temAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -185,11 +185,11 @@ func resourceScalewayTemDomainCreate(ctx context.Context, d *schema.ResourceData d.SetId(regional.NewIDString(region, domain.ID)) - return resourceScalewayTemDomainRead(ctx, d, meta) + return resourceScalewayTemDomainRead(ctx, d, m) } -func resourceScalewayTemDomainRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := temAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayTemDomainRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := temAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -230,8 +230,8 @@ func resourceScalewayTemDomainRead(ctx context.Context, d *schema.ResourceData, return nil } -func resourceScalewayTemDomainDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := temAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayTemDomainDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := temAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_vpc.go b/scaleway/resource_vpc.go index 0afe73059..d52a9b363 100644 --- a/scaleway/resource_vpc.go +++ b/scaleway/resource_vpc.go @@ -58,8 +58,8 @@ func resourceScalewayVPC() *schema.Resource { } } -func resourceScalewayVPCCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcAPI, region, err := vpcAPIWithRegion(d, meta) +func resourceScalewayVPCCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcAPI, region, err := vpcAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -76,11 +76,11 @@ func resourceScalewayVPCCreate(ctx context.Context, d *schema.ResourceData, meta d.SetId(regional.NewIDString(region, res.ID)) - return resourceScalewayVPCRead(ctx, d, meta) + return resourceScalewayVPCRead(ctx, d, m) } -func resourceScalewayVPCRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcAPI, region, ID, err := vpcAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayVPCRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcAPI, region, ID, err := vpcAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -112,8 +112,8 @@ func resourceScalewayVPCRead(ctx context.Context, d *schema.ResourceData, meta i return nil } -func resourceScalewayVPCUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcAPI, region, ID, err := vpcAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayVPCUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcAPI, region, ID, err := vpcAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -128,11 +128,11 @@ func resourceScalewayVPCUpdate(ctx context.Context, d *schema.ResourceData, meta return diag.FromErr(err) } - return resourceScalewayVPCRead(ctx, d, meta) + return resourceScalewayVPCRead(ctx, d, m) } -func resourceScalewayVPCDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcAPI, region, ID, err := vpcAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayVPCDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcAPI, region, ID, err := vpcAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_vpc_gateway_network.go b/scaleway/resource_vpc_gateway_network.go index 3ff542a21..4e4a8c333 100644 --- a/scaleway/resource_vpc_gateway_network.go +++ b/scaleway/resource_vpc_gateway_network.go @@ -130,8 +130,8 @@ func resourceScalewayVPCGatewayNetwork() *schema.Resource { } } -func resourceScalewayVPCGatewayNetworkCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, err := vpcgwAPIWithZone(d, meta) +func resourceScalewayVPCGatewayNetworkCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -188,11 +188,11 @@ func resourceScalewayVPCGatewayNetworkCreate(ctx context.Context, d *schema.Reso return diag.FromErr(err) } - return resourceScalewayVPCGatewayNetworkRead(ctx, d, meta) + return resourceScalewayVPCGatewayNetworkRead(ctx, d, m) } -func resourceScalewayVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -262,8 +262,8 @@ func resourceScalewayVPCGatewayNetworkRead(ctx context.Context, d *schema.Resour return nil } -func resourceScalewayVPCGatewayNetworkUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCGatewayNetworkUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -312,11 +312,11 @@ func resourceScalewayVPCGatewayNetworkUpdate(ctx context.Context, d *schema.Reso return diag.FromErr(err) } - return resourceScalewayVPCGatewayNetworkRead(ctx, d, meta) + return resourceScalewayVPCGatewayNetworkRead(ctx, d, m) } -func resourceScalewayVPCGatewayNetworkDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, id, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCGatewayNetworkDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, id, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_vpc_private_network.go b/scaleway/resource_vpc_private_network.go index 72325856b..41cf4351d 100644 --- a/scaleway/resource_vpc_private_network.go +++ b/scaleway/resource_vpc_private_network.go @@ -12,6 +12,7 @@ import ( "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional" "github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" ) func resourceScalewayVPCPrivateNetwork() *schema.Resource { @@ -181,8 +182,8 @@ func resourceScalewayVPCPrivateNetwork() *schema.Resource { } } -func resourceScalewayVPCPrivateNetworkCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcAPI, region, err := vpcAPIWithRegion(d, meta) +func resourceScalewayVPCPrivateNetworkCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcAPI, region, err := vpcAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -219,11 +220,11 @@ func resourceScalewayVPCPrivateNetworkCreate(ctx context.Context, d *schema.Reso d.SetId(regional.NewIDString(region, pn.ID)) - return resourceScalewayVPCPrivateNetworkRead(ctx, d, meta) + return resourceScalewayVPCPrivateNetworkRead(ctx, d, m) } -func resourceScalewayVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcAPI, region, ID, err := vpcAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayVPCPrivateNetworkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcAPI, region, ID, err := vpcAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -240,7 +241,7 @@ func resourceScalewayVPCPrivateNetworkRead(ctx context.Context, d *schema.Resour return diag.FromErr(err) } - zone, err := extractZone(d, meta.(*Meta)) + zone, err := meta.ExtractZone(d, m) if err != nil { return diag.FromErr(err) } @@ -263,8 +264,8 @@ func resourceScalewayVPCPrivateNetworkRead(ctx context.Context, d *schema.Resour return nil } -func resourceScalewayVPCPrivateNetworkUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcAPI, region, ID, err := vpcAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayVPCPrivateNetworkUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcAPI, region, ID, err := vpcAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -279,11 +280,11 @@ func resourceScalewayVPCPrivateNetworkUpdate(ctx context.Context, d *schema.Reso return diag.FromErr(err) } - return resourceScalewayVPCPrivateNetworkRead(ctx, d, meta) + return resourceScalewayVPCPrivateNetworkRead(ctx, d, m) } -func resourceScalewayVPCPrivateNetworkDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcAPI, region, ID, err := vpcAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayVPCPrivateNetworkDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcAPI, region, ID, err := vpcAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_vpc_public_gateway.go b/scaleway/resource_vpc_public_gateway.go index 4ac5f2677..dd19989e1 100644 --- a/scaleway/resource_vpc_public_gateway.go +++ b/scaleway/resource_vpc_public_gateway.go @@ -105,8 +105,8 @@ func resourceScalewayVPCPublicGateway() *schema.Resource { } } -func resourceScalewayVPCPublicGatewayCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, err := vpcgwAPIWithZone(d, meta) +func resourceScalewayVPCPublicGatewayCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -143,11 +143,11 @@ func resourceScalewayVPCPublicGatewayCreate(ctx context.Context, d *schema.Resou return diag.FromErr(err) } - return resourceScalewayVPCPublicGatewayRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayRead(ctx, d, m) } -func resourceScalewayVPCPublicGatewayRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, id, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, id, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -179,8 +179,8 @@ func resourceScalewayVPCPublicGatewayRead(ctx context.Context, d *schema.Resourc return nil } -func resourceScalewayVPCPublicGatewayUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, id, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, id, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -229,11 +229,11 @@ func resourceScalewayVPCPublicGatewayUpdate(ctx context.Context, d *schema.Resou return diag.FromErr(err) } - return resourceScalewayVPCPublicGatewayRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayRead(ctx, d, m) } -func resourceScalewayVPCPublicGatewayDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, id, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, id, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_vpc_public_gateway_dhcp.go b/scaleway/resource_vpc_public_gateway_dhcp.go index 150d45c6c..e30a9f6b3 100644 --- a/scaleway/resource_vpc_public_gateway_dhcp.go +++ b/scaleway/resource_vpc_public_gateway_dhcp.go @@ -127,8 +127,8 @@ func resourceScalewayVPCPublicGatewayDHCP() *schema.Resource { } } -func resourceScalewayVPCPublicGatewayDHCPCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, err := vpcgwAPIWithZone(d, meta) +func resourceScalewayVPCPublicGatewayDHCPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -190,11 +190,11 @@ func resourceScalewayVPCPublicGatewayDHCPCreate(ctx context.Context, d *schema.R d.SetId(zonal.NewIDString(zone, res.ID)) - return resourceScalewayVPCPublicGatewayDHCPRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayDHCPRead(ctx, d, m) } -func resourceScalewayVPCPublicGatewayDHCPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayDHCPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -233,8 +233,8 @@ func resourceScalewayVPCPublicGatewayDHCPRead(ctx context.Context, d *schema.Res return nil } -func resourceScalewayVPCPublicGatewayDHCPUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayDHCPUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -309,11 +309,11 @@ func resourceScalewayVPCPublicGatewayDHCPUpdate(ctx context.Context, d *schema.R return diag.FromErr(err) } - return resourceScalewayVPCPublicGatewayDHCPRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayDHCPRead(ctx, d, m) } -func resourceScalewayVPCPublicGatewayDHCPDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayDHCPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_vpc_public_gateway_dhcp_reservation.go b/scaleway/resource_vpc_public_gateway_dhcp_reservation.go index 7c8a92556..d83827f16 100644 --- a/scaleway/resource_vpc_public_gateway_dhcp_reservation.go +++ b/scaleway/resource_vpc_public_gateway_dhcp_reservation.go @@ -76,8 +76,8 @@ func resourceScalewayVPCPublicGatewayDHCPReservation() *schema.Resource { } } -func resourceScalewayVPCPublicGatewayDHCPCReservationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, err := vpcgwAPIWithZone(d, meta) +func resourceScalewayVPCPublicGatewayDHCPCReservationCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -115,11 +115,11 @@ func resourceScalewayVPCPublicGatewayDHCPCReservationCreate(ctx context.Context, return diag.FromErr(err) } - return resourceScalewayVPCPublicGatewayDHCPReservationRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayDHCPReservationRead(ctx, d, m) } -func resourceScalewayVPCPublicGatewayDHCPReservationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayDHCPReservationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -148,8 +148,8 @@ func resourceScalewayVPCPublicGatewayDHCPReservationRead(ctx context.Context, d return nil } -func resourceScalewayVPCPublicGatewayDHCPReservationUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayDHCPReservationUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -183,11 +183,11 @@ func resourceScalewayVPCPublicGatewayDHCPReservationUpdate(ctx context.Context, } } - return resourceScalewayVPCPublicGatewayDHCPReservationRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayDHCPReservationRead(ctx, d, m) } -func resourceScalewayVPCPublicGatewayDHCPReservationDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayDHCPReservationDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_vpc_public_gateway_ip.go b/scaleway/resource_vpc_public_gateway_ip.go index e6121d688..b59a74379 100644 --- a/scaleway/resource_vpc_public_gateway_ip.go +++ b/scaleway/resource_vpc_public_gateway_ip.go @@ -59,8 +59,8 @@ func resourceScalewayVPCPublicGatewayIP() *schema.Resource { } } -func resourceScalewayVPCPublicGatewayIPCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, err := vpcgwAPIWithZone(d, meta) +func resourceScalewayVPCPublicGatewayIPCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -92,11 +92,11 @@ func resourceScalewayVPCPublicGatewayIPCreate(ctx context.Context, d *schema.Res } } - return resourceScalewayVPCPublicGatewayIPRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayIPRead(ctx, d, m) } -func resourceScalewayVPCPublicGatewayIPRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayIPRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -125,8 +125,8 @@ func resourceScalewayVPCPublicGatewayIPRead(ctx context.Context, d *schema.Resou return nil } -func resourceScalewayVPCPublicGatewayIPUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayIPUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -155,11 +155,11 @@ func resourceScalewayVPCPublicGatewayIPUpdate(ctx context.Context, d *schema.Res } } - return resourceScalewayVPCPublicGatewayIPRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayIPRead(ctx, d, m) } -func resourceScalewayVPCPublicGatewayIPDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayIPDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_vpc_public_gateway_ip_reverse.go b/scaleway/resource_vpc_public_gateway_ip_reverse.go index 8563398ce..3d5faa662 100644 --- a/scaleway/resource_vpc_public_gateway_ip_reverse.go +++ b/scaleway/resource_vpc_public_gateway_ip_reverse.go @@ -44,8 +44,8 @@ func resourceScalewayVPCPublicGatewayIPReverseDNS() *schema.Resource { } } -func resourceScalewayVPCPublicGatewayIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, err := vpcgwAPIWithZone(d, meta) +func resourceScalewayVPCPublicGatewayIPReverseDNSCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -78,11 +78,11 @@ func resourceScalewayVPCPublicGatewayIPReverseDNSCreate(ctx context.Context, d * } } - return resourceScalewayVPCPublicGatewayIPReverseDNSRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayIPReverseDNSRead(ctx, d, m) } -func resourceScalewayVPCPublicGatewayIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayIPReverseDNSRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -105,8 +105,8 @@ func resourceScalewayVPCPublicGatewayIPReverseDNSRead(ctx context.Context, d *sc return nil } -func resourceScalewayVPCPublicGatewayIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayIPReverseDNSUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -130,11 +130,11 @@ func resourceScalewayVPCPublicGatewayIPReverseDNSUpdate(ctx context.Context, d * } } - return resourceScalewayVPCPublicGatewayIPReverseDNSRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayIPReverseDNSRead(ctx, d, m) } -func resourceScalewayVPCPublicGatewayIPReverseDNSDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayIPReverseDNSDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_vpc_public_gateway_pat_rule.go b/scaleway/resource_vpc_public_gateway_pat_rule.go index 625aca266..afc3a08ae 100644 --- a/scaleway/resource_vpc_public_gateway_pat_rule.go +++ b/scaleway/resource_vpc_public_gateway_pat_rule.go @@ -87,8 +87,8 @@ func resourceScalewayVPCPublicGatewayPATRule() *schema.Resource { } } -func resourceScalewayVPCPublicGatewayPATRuleCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, err := vpcgwAPIWithZone(d, meta) +func resourceScalewayVPCPublicGatewayPATRuleCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, err := vpcgwAPIWithZone(d, m) if err != nil { return diag.FromErr(err) } @@ -125,11 +125,11 @@ func resourceScalewayVPCPublicGatewayPATRuleCreate(ctx context.Context, d *schem return diag.FromErr(err) } - return resourceScalewayVPCPublicGatewayPATRuleRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayPATRuleRead(ctx, d, m) } -func resourceScalewayVPCPublicGatewayPATRuleRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayPATRuleRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -159,8 +159,8 @@ func resourceScalewayVPCPublicGatewayPATRuleRead(ctx context.Context, d *schema. return nil } -func resourceScalewayVPCPublicGatewayPATRuleUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayPATRuleUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -229,11 +229,11 @@ func resourceScalewayVPCPublicGatewayPATRuleUpdate(ctx context.Context, d *schem return diag.FromErr(err) } - return resourceScalewayVPCPublicGatewayPATRuleRead(ctx, d, meta) + return resourceScalewayVPCPublicGatewayPATRuleRead(ctx, d, m) } -func resourceScalewayVPCPublicGatewayPATRuleDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(meta, d.Id()) +func resourceScalewayVPCPublicGatewayPATRuleDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + vpcgwAPI, zone, ID, err := vpcgwAPIWithZoneAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/resource_webhosting.go b/scaleway/resource_webhosting.go index 9c555e1e3..859765a0c 100644 --- a/scaleway/resource_webhosting.go +++ b/scaleway/resource_webhosting.go @@ -157,8 +157,8 @@ func resourceScalewayWebhosting() *schema.Resource { } } -func resourceScalewayWebhostingCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, err := webhostingAPIWithRegion(d, meta) +func resourceScalewayWebhostingCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, err := webhostingAPIWithRegion(d, m) if err != nil { return diag.FromErr(err) } @@ -203,11 +203,11 @@ func resourceScalewayWebhostingCreate(ctx context.Context, d *schema.ResourceDat return diag.FromErr(err) } - return resourceScalewayWebhostingRead(ctx, d, meta) + return resourceScalewayWebhostingRead(ctx, d, m) } -func resourceScalewayWebhostingRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := webhostingAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayWebhostingRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := webhostingAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -244,8 +244,8 @@ func resourceScalewayWebhostingRead(ctx context.Context, d *schema.ResourceData, return nil } -func resourceScalewayWebhostingUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := webhostingAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayWebhostingUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := webhostingAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } @@ -293,11 +293,11 @@ func resourceScalewayWebhostingUpdate(ctx context.Context, d *schema.ResourceDat } } - return resourceScalewayWebhostingRead(ctx, d, meta) + return resourceScalewayWebhostingRead(ctx, d, m) } -func resourceScalewayWebhostingDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - api, region, id, err := webhostingAPIWithRegionAndID(meta, d.Id()) +func resourceScalewayWebhostingDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { + api, region, id, err := webhostingAPIWithRegionAndID(m, d.Id()) if err != nil { return diag.FromErr(err) } diff --git a/scaleway/sweeper_test.go b/scaleway/sweeper_test.go index 074ff55a2..6ddaaf46d 100644 --- a/scaleway/sweeper_test.go +++ b/scaleway/sweeper_test.go @@ -9,6 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/scaleway/scaleway-sdk-go/scw" "github.com/scaleway/terraform-provider-scaleway/v2/internal/logging" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/stretchr/testify/assert" ) @@ -55,40 +56,40 @@ func sweepRegions(regions []scw.Region, f func(scwClient *scw.Client, region scw func sweep(f func(scwClient *scw.Client) error) error { ctx := context.Background() - meta, err := buildMeta(ctx, &metaConfig{ - terraformVersion: "terraform-tests", + m, err := meta.NewMeta(ctx, &meta.Config{ + TerraformVersion: "terraform-tests", }) if err != nil { return err } - return f(meta.scwClient) + return f(m.ScwClient()) } // sharedClientForZone returns a Scaleway client needed for the sweeper // functions for a given zone func sharedClientForZone(zone scw.Zone) (*scw.Client, error) { ctx := context.Background() - meta, err := buildMeta(ctx, &metaConfig{ - terraformVersion: "terraform-tests", - forceZone: zone, + m, err := meta.NewMeta(ctx, &meta.Config{ + TerraformVersion: "terraform-tests", + ForceZone: zone, }) if err != nil { return nil, err } - return meta.scwClient, nil + return m.ScwClient(), nil } // sharedS3ClientForRegion returns a common S3 client needed for the sweeper func sharedS3ClientForRegion(region scw.Region) (*s3.S3, error) { ctx := context.Background() - meta, err := buildMeta(ctx, &metaConfig{ - terraformVersion: "terraform-tests", - forceZone: region.GetZones()[0], + m, err := meta.NewMeta(ctx, &meta.Config{ + TerraformVersion: "terraform-tests", + ForceZone: region.GetZones()[0], }) if err != nil { return nil, err } - return newS3ClientFromMeta(meta, region.String()) + return newS3ClientFromMeta(m, region.String()) } func TestIsTestResource(t *testing.T) {