Skip to content

test(edge_services): set plan to all tests #3843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
yfodil wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

test(edge_services): set plan to all tests #3843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a34311
test(edge_services): set plan to all tests
yfodil Mar 26, 2026
58a7821
fix
yfodil Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions internal/services/edgeservices/backend_stage_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ func TestAccDataSourceBackendStage_ByID(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "tf-tests-ds-backend-id"
description = "pipeline for backend data source test"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_object_bucket" "main" {
Expand Down Expand Up @@ -62,9 +67,14 @@ func TestAccDataSourceBackendStage_ByPipelineID(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "tf-tests-ds-backend-filter"
description = "pipeline for backend filter test"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_object_bucket" "main" {
Expand Down
15 changes: 15 additions & 0 deletions internal/services/edgeservices/backend_stage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ func TestAccEdgeServicesBackend_Basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "my-edge_services-pipeline"
description = "pipeline description"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_object_bucket" "main" {
Expand Down Expand Up @@ -69,6 +74,10 @@ func TestAccEdgeServicesBackend_LB(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_lb_ip" "lb_ip" {}

resource "scaleway_lb" "lb01" {
Expand Down Expand Up @@ -112,6 +121,7 @@ func TestAccEdgeServicesBackend_LB(t *testing.T) {
resource "scaleway_edge_services_pipeline" "main" {
name = "my-edge_services-pipeline"
description = "pipeline description"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_edge_services_backend_stage" "main" {
Expand Down Expand Up @@ -145,6 +155,10 @@ func TestAccEdgeServicesBackend_LB(t *testing.T) {
},
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_lb_ip" "lb_ip" {}

resource "scaleway_lb" "lb01" {
Expand Down Expand Up @@ -188,6 +202,7 @@ func TestAccEdgeServicesBackend_LB(t *testing.T) {
resource "scaleway_edge_services_pipeline" "main" {
name = "my-edge_services-pipeline"
description = "pipeline description"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_edge_services_backend_stage" "main" {
Expand Down
10 changes: 10 additions & 0 deletions internal/services/edgeservices/cache_stage_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ func TestAccDataSourceCacheStage_ByID(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "tf-tests-ds-cache-id"
description = "pipeline for cache data source test"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_object_bucket" "main" {
Expand Down Expand Up @@ -68,9 +73,14 @@ func TestAccDataSourceCacheStage_ByPipelineID(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "tf-tests-ds-cache-filter"
description = "pipeline for cache filter test"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_object_bucket" "main" {
Expand Down
10 changes: 10 additions & 0 deletions internal/services/edgeservices/cache_stage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ func TestAccEdgeServicesCache_Basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "my-edge_services-pipeline"
description = "pipeline description"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_edge_services_cache_stage" "main" {
Expand All @@ -40,9 +45,14 @@ func TestAccEdgeServicesCache_Basic(t *testing.T) {
},
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "my-edge_services-pipeline"
description = "pipeline description"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_edge_services_cache_stage" "main" {
Expand Down
10 changes: 10 additions & 0 deletions internal/services/edgeservices/dns_stage_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ func TestAccDataSourceDNSStage_ByID(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "tf-tests-ds-dns-id"
description = "pipeline for DNS data source test"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_object_bucket" "main" {
Expand Down Expand Up @@ -66,9 +71,14 @@ func TestAccDataSourceDNSStage_ByPipelineID(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "tf-tests-ds-dns-filter"
description = "pipeline for DNS filter test"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_object_bucket" "main" {
Expand Down
5 changes: 5 additions & 0 deletions internal/services/edgeservices/dns_stage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ func TestAccEdgeServicesDNS_Basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "my-edge_services-pipeline"
description = "pipeline description"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_edge_services_dns_stage" "main" {
Expand Down
10 changes: 10 additions & 0 deletions internal/services/edgeservices/pipeline_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ func TestAccDataSourcePipeline_ByID(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "tf-tests-ds-pipeline-id"
description = "pipeline for data source test"
depends_on = [scaleway_edge_services_plan.main]
}

data "scaleway_edge_services_pipeline" "by_id" {
Expand Down Expand Up @@ -56,9 +61,14 @@ func TestAccDataSourcePipeline_ByName(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "tf-tests-ds-pipeline-name"
description = "pipeline for name filter test"
depends_on = [scaleway_edge_services_plan.main]
}

data "scaleway_edge_services_pipeline" "by_name" {
Expand Down
5 changes: 5 additions & 0 deletions internal/services/edgeservices/pipeline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ func TestAccEdgeServicesPipeline_Basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "tf-tests-pipeline-name"
description = "a description"
depends_on = [scaleway_edge_services_plan.main]
}
`,
Check: resource.ComposeTestCheckFunc(
Expand Down
6 changes: 5 additions & 1 deletion internal/services/edgeservices/plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/scaleway/scaleway-sdk-go/scw"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/identity"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
)
Expand Down Expand Up @@ -59,7 +60,10 @@ func planSchema() map[string]*schema.Schema {
func ResourcePlanCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
api := NewEdgeServicesAPI(m)

projectID := d.Get("project_id").(string)
projectID, _, err := meta.ExtractProjectID(d, m)
if err != nil {
return diag.FromErr(err)
}

plan, err := api.SelectPlan(&edgeservices.SelectPlanRequest{
ProjectID: projectID,
Expand Down
10 changes: 10 additions & 0 deletions internal/services/edgeservices/route_stage_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ func TestAccDataSourceRouteStage_ByID(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "tf-tests-ds-route-id"
description = "pipeline for route data source test"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_edge_services_waf_stage" "waf" {
Expand Down Expand Up @@ -87,9 +92,14 @@ func TestAccDataSourceRouteStage_ByPipelineID(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "tf-tests-ds-route-filter"
description = "pipeline for route filter test"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_edge_services_waf_stage" "waf" {
Expand Down
10 changes: 10 additions & 0 deletions internal/services/edgeservices/route_stage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ func TestAccEdgeServicesRoute_Basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "my-edge-services-pipeline"
description = "pipeline description"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_edge_services_waf_stage" "waf" {
Expand Down Expand Up @@ -98,9 +103,14 @@ func TestAccEdgeServicesRoute_WafRule(t *testing.T) {
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_edge_services_plan" "main" {
name = "starter"
}

resource "scaleway_edge_services_pipeline" "main" {
name = "my-edge-services-pipeline-waf-rule"
description = "pipeline for waf rule test"
depends_on = [scaleway_edge_services_plan.main]
}

resource "scaleway_edge_services_waf_stage" "waf" {
Expand Down
Loading
Loading