diff --git a/.github/workflows/integration_tests_pr.yml b/.github/workflows/integration_tests_pr.yml index ae1334652..26ab634f6 100644 --- a/.github/workflows/integration_tests_pr.yml +++ b/.github/workflows/integration_tests_pr.yml @@ -15,6 +15,7 @@ on: run_long_tests: description: 'Setting this value will skip long running tests (e.g. Database related cases): (true|false)' required: false + default: false name: Integration tests on PR @@ -49,6 +50,8 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ inputs.sha }} + fetch-depth: 0 + submodules: 'recursive' - run: make deps diff --git a/Makefile b/Makefile index 2bc3696ce..7e3c93403 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ COUNT?=1 PARALLEL?=10 PKG_NAME=linode/... TIMEOUT?=240m -RUN_LONG_TESTS?=False +RUN_LONG_TESTS?=false SWEEP?="tf_test,tf-test" TEST_TAGS="integration" @@ -61,7 +61,7 @@ test: fmt-check smoke-test unit-test int-test .PHONY: unit-test unit-test: fmt-check - go test -v --tags=unit ./$(PKG_NAME) | grep -v "\[no test files\]" + go test -v --tags=unit ./$(PKG_NAME) .PHONY: int-test int-test: fmt-check generate-ip-env-fw-e2e include-env @@ -70,7 +70,7 @@ int-test: fmt-check generate-ip-env-fw-e2e include-env RUN_LONG_TESTS=$(RUN_LONG_TESTS) \ TF_VAR_ipv4_addr=${PUBLIC_IPV4} \ TF_VAR_ipv6_addr=${PUBLIC_IPV6} \ - go test --tags="$(TEST_TAGS)" -v ./$(PKG_NAME) -count $(COUNT) -timeout $(TIMEOUT) -ldflags="-X=github.com/linode/terraform-provider-linode/v2/version.ProviderVersion=acc" -parallel=$(PARALLEL) $(ARGS) | grep -v "\[no test files\]" + go test --tags="$(TEST_TAGS)" -v ./$(PKG_NAME) -count $(COUNT) -timeout $(TIMEOUT) -ldflags="-X=github.com/linode/terraform-provider-linode/v2/version.ProviderVersion=acc" -parallel=$(PARALLEL) $(ARGS) .PHONY: include-env include-env: $(IP_ENV_FILE) @@ -87,7 +87,7 @@ smoke-test: fmt-check TF_ACC=1 \ LINODE_API_VERSION="v4beta" \ RUN_LONG_TESTS=$(RUN_LONG_TESTS) \ - go test -v -run smoke ./linode/... -count $(COUNT) -timeout $(TIMEOUT) -parallel=$(PARALLEL) -ldflags="-X=github.com/linode/terraform-provider-linode/v2/version.ProviderVersion=acc" | grep -v "\[no test files\]" + go test -v -run smoke ./linode/... -count $(COUNT) -timeout $(TIMEOUT) -parallel=$(PARALLEL) -ldflags="-X=github.com/linode/terraform-provider-linode/v2/version.ProviderVersion=acc" .PHONY: docs-check docs-check: diff --git a/linode/acceptance/util.go b/linode/acceptance/util.go index 823ba0314..fbc0f47cc 100644 --- a/linode/acceptance/util.go +++ b/linode/acceptance/util.go @@ -570,8 +570,12 @@ func ModifyProviderMeta(provider *schema.Provider, modifier ProviderMetaModifier } } -// GetRegionsWithCaps returns a list of regions that support the given capabilities. -func GetRegionsWithCaps(capabilities []string, filters ...RegionFilterFunc) ([]string, error) { +// GetRegionsWithCaps returns a list of region IDs that support the given capabilities +// Parameters: +// - capabilities: Required capabilities that the regions must support. +// - siteType: The site type to filter by ("core" or "distributed" or "any"). +// - filters: Optional custom filters for additional criteria. +func GetRegionsWithCaps(capabilities []string, regionType string, filters ...RegionFilterFunc) ([]string, error) { client, err := GetTestClient() if err != nil { return nil, err @@ -582,8 +586,14 @@ func GetRegionsWithCaps(capabilities []string, filters ...RegionFilterFunc) ([]s return nil, err } - // Filter on capabilities + // Filter on capabilities and site type regionsWithCaps := slices.DeleteFunc(regions, func(region linodego.Region) bool { + // Check if the site type matches + // Skip site type check if "any" is passed + if !strings.EqualFold(regionType, "any") && !strings.EqualFold(region.SiteType, regionType) { + return true + } + capsMap := make(map[string]bool) for _, c := range region.Capabilities { @@ -620,8 +630,8 @@ func GetRegionsWithCaps(capabilities []string, filters ...RegionFilterFunc) ([]s } // GetRandomRegionWithCaps gets a random region given a list of region capabilities. -func GetRandomRegionWithCaps(capabilities []string, filters ...RegionFilterFunc) (string, error) { - regions, err := GetRegionsWithCaps(capabilities, filters...) +func GetRandomRegionWithCaps(capabilities []string, regionType string, filters ...RegionFilterFunc) (string, error) { + regions, err := GetRegionsWithCaps(capabilities, regionType, filters...) if err != nil { return "", err } diff --git a/linode/accountavailability/datasource_test.go b/linode/accountavailability/datasource_test.go index c2d8bb647..92fed0966 100644 --- a/linode/accountavailability/datasource_test.go +++ b/linode/accountavailability/datasource_test.go @@ -16,7 +16,7 @@ func TestAccDataSourceNodeBalancers_basic(t *testing.T) { resourceName := "data.linode_account_availability.foobar" - region, err := acceptance.GetRandomRegionWithCaps(nil) + region, err := acceptance.GetRandomRegionWithCaps(nil, "core") if err != nil { log.Fatal(err) } diff --git a/linode/backup/datasource_test.go b/linode/backup/datasource_test.go index b63d521a4..6db6e2259 100644 --- a/linode/backup/datasource_test.go +++ b/linode/backup/datasource_test.go @@ -18,7 +18,7 @@ import ( var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps(nil) + region, err := acceptance.GetRandomRegionWithCaps(nil, "core") if err != nil { log.Fatal(err) } diff --git a/linode/databaseaccesscontrols/resource_test.go b/linode/databaseaccesscontrols/resource_test.go index fa181bfa8..10255e818 100644 --- a/linode/databaseaccesscontrols/resource_test.go +++ b/linode/databaseaccesscontrols/resource_test.go @@ -44,7 +44,7 @@ func init() { postgresEngineVersion = v.ID - region, err := acceptance.GetRandomRegionWithCaps([]string{"Managed Databases"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Managed Databases"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/databasebackups/datasource_test.go b/linode/databasebackups/datasource_test.go index 157674b57..48e9a67fd 100644 --- a/linode/databasebackups/datasource_test.go +++ b/linode/databasebackups/datasource_test.go @@ -34,7 +34,7 @@ func init() { engineVersion = v.ID - region, err := acceptance.GetRandomRegionWithCaps([]string{"Managed Databases"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Managed Databases"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/databasemysql/resource_test.go b/linode/databasemysql/resource_test.go index 705061c64..ebdbb69ca 100644 --- a/linode/databasemysql/resource_test.go +++ b/linode/databasemysql/resource_test.go @@ -42,7 +42,7 @@ func init() { engineVersion = v.ID - region, err := acceptance.GetRandomRegionWithCaps([]string{"Managed Databases"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Managed Databases"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/databasemysqlbackups/datasource_test.go b/linode/databasemysqlbackups/datasource_test.go index 9c5dfd78b..2d25b391f 100644 --- a/linode/databasemysqlbackups/datasource_test.go +++ b/linode/databasemysqlbackups/datasource_test.go @@ -33,7 +33,7 @@ func init() { engineVersion = v.ID - region, err := acceptance.GetRandomRegionWithCaps([]string{"Managed Databases"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Managed Databases"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/databasepostgresql/resource_test.go b/linode/databasepostgresql/resource_test.go index c869b3318..afa66a1ec 100644 --- a/linode/databasepostgresql/resource_test.go +++ b/linode/databasepostgresql/resource_test.go @@ -42,7 +42,7 @@ func init() { engineVersion = v.ID - region, err := acceptance.GetRandomRegionWithCaps([]string{"Managed Databases"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Managed Databases"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/databases/datasource_test.go b/linode/databases/datasource_test.go index e3e35d9ea..38a515e6c 100644 --- a/linode/databases/datasource_test.go +++ b/linode/databases/datasource_test.go @@ -32,7 +32,7 @@ func init() { engineVersion = v.ID - region, err := acceptance.GetRandomRegionWithCaps([]string{"Managed Databases"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Managed Databases"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/firewall/resource_test.go b/linode/firewall/resource_test.go index d051628e6..38bc0934f 100644 --- a/linode/firewall/resource_test.go +++ b/linode/firewall/resource_test.go @@ -27,7 +27,7 @@ func init() { F: sweep, }) - region, err := acceptance.GetRandomRegionWithCaps([]string{"Cloud Firewall", "NodeBalancers"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Cloud Firewall", "NodeBalancers"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/firewalldevice/resource_test.go b/linode/firewalldevice/resource_test.go index e38da295a..e595db960 100644 --- a/linode/firewalldevice/resource_test.go +++ b/linode/firewalldevice/resource_test.go @@ -21,7 +21,7 @@ import ( var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"Cloud Firewall", "NodeBalancers"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Cloud Firewall", "NodeBalancers"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/firewalls/datasource_test.go b/linode/firewalls/datasource_test.go index c4b5b1465..0c879c938 100644 --- a/linode/firewalls/datasource_test.go +++ b/linode/firewalls/datasource_test.go @@ -17,7 +17,7 @@ const testFirewallDataName = "data.linode_firewalls.test" var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"Linodes"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Linodes"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/image/resource_test.go b/linode/image/resource_test.go index 906c5bf4c..ab1bc44a7 100644 --- a/linode/image/resource_test.go +++ b/linode/image/resource_test.go @@ -43,7 +43,7 @@ func init() { F: sweep, }) - region, err := acceptance.GetRandomRegionWithCaps(nil) + region, err := acceptance.GetRandomRegionWithCaps(nil, "core") if err != nil { log.Fatal(err) } diff --git a/linode/images/datasource_test.go b/linode/images/datasource_test.go index 7c015de04..babdce8f4 100644 --- a/linode/images/datasource_test.go +++ b/linode/images/datasource_test.go @@ -15,7 +15,7 @@ import ( var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps(nil) + region, err := acceptance.GetRandomRegionWithCaps(nil, "core") if err != nil { log.Fatal(err) } diff --git a/linode/instance/resource_test.go b/linode/instance/resource_test.go index 3b5532761..8f5125eca 100644 --- a/linode/instance/resource_test.go +++ b/linode/instance/resource_test.go @@ -32,7 +32,7 @@ func init() { region, err := acceptance.GetRandomRegionWithCaps([]string{ linodego.CapabilityVlans, linodego.CapabilityVPCs, linodego.CapabilityDiskEncryption, - }) + }, "core") if err != nil { log.Fatal(err) } @@ -2063,7 +2063,7 @@ func TestAccResourceInstance_userData(t *testing.T) { var instance linodego.Instance instanceName := acctest.RandomWithPrefix("tf_test") - region, err := acceptance.GetRandomRegionWithCaps([]string{"Metadata"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Metadata"}, "core") if err != nil { t.Fatal(err) } @@ -2165,7 +2165,7 @@ func TestAccResourceInstance_firewallOnCreation(t *testing.T) { var instance linodego.Instance instanceName := acctest.RandomWithPrefix("tf_test") - region, err := acceptance.GetRandomRegionWithCaps([]string{"Cloud Firewall"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Cloud Firewall"}, "core") rootPass := acctest.RandString(12) if err != nil { t.Fatal(err) @@ -2329,7 +2329,7 @@ func TestAccResourceInstance_migration(t *testing.T) { // Resolve a region to migrate to targetRegion, err := acceptance.GetRandomRegionWithCaps( - []string{"Linodes"}, + []string{"Linodes"}, "core", func(v linodego.Region) bool { return v.ID != testRegion }, @@ -2386,7 +2386,7 @@ func TestAccResourceInstance_withPG(t *testing.T) { // Resolve a region with support for PGs targetRegion, err := acceptance.GetRandomRegionWithCaps( - []string{"Linodes", "Placement Group"}, + []string{"Linodes", "Placement Group"}, "core", ) if err != nil { t.Fatal(err) @@ -2433,7 +2433,7 @@ func TestAccResourceInstance_pgAssignment(t *testing.T) { // Resolve a region with support for PGs testRegion, err := acceptance.GetRandomRegionWithCaps( - []string{"Linodes", "Placement Group"}, + []string{"Linodes", "Placement Group"}, "core", ) if err != nil { t.Fatal(err) @@ -2523,7 +2523,7 @@ func TestAccResourceInstance_diskEncryption(t *testing.T) { // Resolve a region that supports disk encryption targetRegion, err := acceptance.GetRandomRegionWithCaps( - []string{linodego.CapabilityLinodes, linodego.CapabilityDiskEncryption}, + []string{linodego.CapabilityLinodes, linodego.CapabilityDiskEncryption}, "core", ) if err != nil { t.Fatal(err) diff --git a/linode/instanceconfig/resource_test.go b/linode/instanceconfig/resource_test.go index 1fe960744..bf55c05da 100644 --- a/linode/instanceconfig/resource_test.go +++ b/linode/instanceconfig/resource_test.go @@ -21,7 +21,7 @@ import ( var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"vlans", "VPCs"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"vlans", "VPCs"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/instancedisk/resource_test.go b/linode/instancedisk/resource_test.go index a89db7ffb..9cf14d71e 100644 --- a/linode/instancedisk/resource_test.go +++ b/linode/instancedisk/resource_test.go @@ -21,7 +21,7 @@ import ( var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps(nil) + region, err := acceptance.GetRandomRegionWithCaps(nil, "core") if err != nil { log.Fatal(err) } diff --git a/linode/instanceip/resource_test.go b/linode/instanceip/resource_test.go index 284bd2283..5019e306a 100644 --- a/linode/instanceip/resource_test.go +++ b/linode/instanceip/resource_test.go @@ -18,7 +18,7 @@ const testInstanceIPResName = "linode_instance_ip.test" var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps(nil) + region, err := acceptance.GetRandomRegionWithCaps(nil, "core") if err != nil { log.Fatal(err) } diff --git a/linode/instancenetworking/datasource_test.go b/linode/instancenetworking/datasource_test.go index 58554c445..d09925106 100644 --- a/linode/instancenetworking/datasource_test.go +++ b/linode/instancenetworking/datasource_test.go @@ -18,7 +18,7 @@ const testInstanceNetworkResName = "data.linode_instance_networking.test" var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"VPCs", "Linodes"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"VPCs", "Linodes"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/ipv6ranges/datasource_test.go b/linode/ipv6ranges/datasource_test.go index 511bcace1..c25027454 100644 --- a/linode/ipv6ranges/datasource_test.go +++ b/linode/ipv6ranges/datasource_test.go @@ -15,7 +15,7 @@ import ( var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"Linodes"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Linodes"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/lke/cluster_test.go b/linode/lke/cluster_test.go index 297e18c4c..4e1d93200 100644 --- a/linode/lke/cluster_test.go +++ b/linode/lke/cluster_test.go @@ -38,10 +38,10 @@ func TestReconcileLKENodePoolSpecs(t *testing.T) { {ID: 123, Type: "g6-standard-1", Count: 2}, }, newSpecs: []lke.NodePoolSpec{ - {ID: 123, Type: "g6-standard-1", Count: 3}, + {ID: 123, Type: "g6-standard-1", Count: 3, Tags: []string{"example"}}, }, expectedToUpdate: map[int]linodego.LKENodePoolUpdateOptions{ - 123: {Count: 3}, + 123: {Count: 3, Tags: &[]string{"example"}}, }, expectedToCreate: []linodego.LKENodePoolCreateOptions{}, expectedToDelete: []int{}, @@ -67,15 +67,15 @@ func TestReconcileLKENodePoolSpecs(t *testing.T) { {ID: 124, Type: "g6-standard-1", Count: 10}, }, newSpecs: []lke.NodePoolSpec{ - {ID: 123, Type: "g6-standard-1", Count: 9}, // bumped from 1 to 9 - {ID: 124, Type: "g6-standard-2", Count: 10}, // type changed + {ID: 123, Type: "g6-standard-1", Count: 9, Tags: []string{"example"}}, // bumped from 1 to 9 + {ID: 124, Type: "g6-standard-2", Count: 10, Tags: []string{"example"}}, // type changed }, expectedToDelete: []int{124}, expectedToUpdate: map[int]linodego.LKENodePoolUpdateOptions{ - 123: {Count: 9}, + 123: {Count: 9, Tags: &[]string{"example"}}, }, expectedToCreate: []linodego.LKENodePoolCreateOptions{ - {Type: "g6-standard-2", Count: 10}, + {Type: "g6-standard-2", Count: 10, Tags: []string{"example"}}, }, }, { @@ -87,15 +87,16 @@ func TestReconcileLKENodePoolSpecs(t *testing.T) { {ID: 127, Type: "g6-standard-3", Count: 2}, }, newSpecs: []lke.NodePoolSpec{ - {ID: 123, Type: "g6-standard-3", Count: 2}, - {ID: 124, Type: "g6-standard-3", Count: 9}, - {ID: 126, Type: "g6-standard-3", Count: 8}, - {ID: 127, Type: "g6-standard-3", Count: 2}, + {ID: 123, Type: "g6-standard-3", Count: 2, Tags: []string{"example"}}, + {ID: 124, Type: "g6-standard-3", Count: 9, Tags: []string{"example"}}, + {ID: 126, Type: "g6-standard-3", Count: 8, Tags: []string{"example"}}, + {ID: 127, Type: "g6-standard-3", Count: 2, Tags: []string{"example"}}, }, expectedToUpdate: map[int]linodego.LKENodePoolUpdateOptions{ - 123: {Count: 2}, - 124: {Count: 9}, - 126: {Count: 8}, + 123: {Count: 2, Tags: &[]string{"example"}}, + 124: {Count: 9, Tags: &[]string{"example"}}, + 126: {Count: 8, Tags: &[]string{"example"}}, + 127: {Count: 2, Tags: &[]string{"example"}}, }, expectedToDelete: []int{}, expectedToCreate: []linodego.LKENodePoolCreateOptions{}, @@ -106,10 +107,10 @@ func TestReconcileLKENodePoolSpecs(t *testing.T) { {ID: 123, Type: "g6-standard-3", Count: 3}, }, newSpecs: []lke.NodePoolSpec{ - {ID: 123, Type: "g6-standard-3", Count: 3, AutoScalerEnabled: true, AutoScalerMin: 3, AutoScalerMax: 7}, + {ID: 123, Type: "g6-standard-3", Count: 3, AutoScalerEnabled: true, AutoScalerMin: 3, AutoScalerMax: 7, Tags: []string{"example"}}, }, expectedToUpdate: map[int]linodego.LKENodePoolUpdateOptions{ - 123: {Count: 3, Autoscaler: &linodego.LKENodePoolAutoscaler{Enabled: true, Min: 3, Max: 7}}, + 123: {Count: 3, Autoscaler: &linodego.LKENodePoolAutoscaler{Enabled: true, Min: 3, Max: 7}, Tags: &[]string{"example"}}, }, expectedToDelete: []int{}, expectedToCreate: []linodego.LKENodePoolCreateOptions{}, @@ -120,10 +121,10 @@ func TestReconcileLKENodePoolSpecs(t *testing.T) { {ID: 123, Type: "g6-standard-3", Count: 3, AutoScalerEnabled: true, AutoScalerMin: 3, AutoScalerMax: 7}, }, newSpecs: []lke.NodePoolSpec{ - {ID: 123, Type: "g6-standard-3", Count: 3, AutoScalerEnabled: false}, + {ID: 123, Type: "g6-standard-3", Count: 3, AutoScalerEnabled: false, Tags: []string{"example"}}, }, expectedToUpdate: map[int]linodego.LKENodePoolUpdateOptions{ - 123: {Count: 3, Autoscaler: &linodego.LKENodePoolAutoscaler{Enabled: false, Min: 0, Max: 0}}, + 123: {Count: 3, Autoscaler: &linodego.LKENodePoolAutoscaler{Enabled: false, Min: 0, Max: 0}, Tags: &[]string{"example"}}, }, expectedToDelete: []int{}, expectedToCreate: []linodego.LKENodePoolCreateOptions{}, @@ -134,10 +135,10 @@ func TestReconcileLKENodePoolSpecs(t *testing.T) { {ID: 123, Type: "g6-standard-3", Count: 3, AutoScalerEnabled: true, AutoScalerMin: 3, AutoScalerMax: 7}, }, newSpecs: []lke.NodePoolSpec{ - {ID: 123, Type: "g6-standard-3", Count: 3, AutoScalerEnabled: true, AutoScalerMin: 5, AutoScalerMax: 10}, + {ID: 123, Type: "g6-standard-3", Count: 3, AutoScalerEnabled: true, AutoScalerMin: 5, AutoScalerMax: 10, Tags: []string{"example"}}, }, expectedToUpdate: map[int]linodego.LKENodePoolUpdateOptions{ - 123: {Count: 3, Autoscaler: &linodego.LKENodePoolAutoscaler{Enabled: true, Min: 5, Max: 10}}, + 123: {Count: 3, Autoscaler: &linodego.LKENodePoolAutoscaler{Enabled: true, Min: 5, Max: 10}, Tags: &[]string{"example"}}, }, expectedToDelete: []int{}, expectedToCreate: []linodego.LKENodePoolCreateOptions{}, diff --git a/linode/lke/resource_test.go b/linode/lke/resource_test.go index e1b1dd70f..588af3e24 100644 --- a/linode/lke/resource_test.go +++ b/linode/lke/resource_test.go @@ -68,7 +68,7 @@ func init() { k8sVersionPrevious = k8sVersions[len(k8sVersions)-2] } - region, err := acceptance.GetRandomRegionWithCaps([]string{"kubernetes"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"kubernetes"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/lkeclusters/datasource_test.go b/linode/lkeclusters/datasource_test.go index a97f132db..ce4932463 100644 --- a/linode/lkeclusters/datasource_test.go +++ b/linode/lkeclusters/datasource_test.go @@ -44,7 +44,7 @@ func init() { k8sVersionLatest = k8sVersions[len(k8sVersions)-1] - region, err := acceptance.GetRandomRegionWithCaps([]string{"kubernetes"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"kubernetes"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/lkenodepool/framework_resource_test.go b/linode/lkenodepool/framework_resource_test.go index a26a679b4..cab315852 100644 --- a/linode/lkenodepool/framework_resource_test.go +++ b/linode/lkenodepool/framework_resource_test.go @@ -62,7 +62,7 @@ func init() { k8sVersion = k8sVersions[len(k8sVersions)-1] - region, err := acceptance.GetRandomRegionWithCaps([]string{"kubernetes"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"kubernetes"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/nb/resource_test.go b/linode/nb/resource_test.go index af516d452..a31f1a2f3 100644 --- a/linode/nb/resource_test.go +++ b/linode/nb/resource_test.go @@ -30,7 +30,7 @@ func init() { F: sweep, }) - region, err := acceptance.GetRandomRegionWithCaps([]string{"nodebalancers"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"nodebalancers"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/nbconfig/resource_test.go b/linode/nbconfig/resource_test.go index 2e59dba62..10d8571f7 100644 --- a/linode/nbconfig/resource_test.go +++ b/linode/nbconfig/resource_test.go @@ -24,7 +24,7 @@ import ( var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"nodebalancers"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"nodebalancers"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/nbconfigs/datasource_test.go b/linode/nbconfigs/datasource_test.go index b04c35d61..02175b225 100644 --- a/linode/nbconfigs/datasource_test.go +++ b/linode/nbconfigs/datasource_test.go @@ -19,7 +19,7 @@ func TestAccDataSourceNodeBalancerConfigs_basic(t *testing.T) { resourceName := "data.linode_nodebalancer_configs.foo" nbLabel := acctest.RandomWithPrefix("tf_test") - nbRegion, err := acceptance.GetRandomRegionWithCaps([]string{"NodeBalancers"}) + nbRegion, err := acceptance.GetRandomRegionWithCaps([]string{"NodeBalancers"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/nbnode/resource_test.go b/linode/nbnode/resource_test.go index 2d4fe7b74..9c5b35055 100644 --- a/linode/nbnode/resource_test.go +++ b/linode/nbnode/resource_test.go @@ -21,7 +21,7 @@ import ( var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"nodebalancers"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"nodebalancers"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/nbs/datasource_test.go b/linode/nbs/datasource_test.go index 665d8bbf7..f7c0c7093 100644 --- a/linode/nbs/datasource_test.go +++ b/linode/nbs/datasource_test.go @@ -18,7 +18,7 @@ func TestAccDataSourceNodeBalancers_basic(t *testing.T) { resourceName := "data.linode_nodebalancers.nbs" nbLabel := acctest.RandomWithPrefix("tf_test") - nbRegion, err := acceptance.GetRandomRegionWithCaps([]string{"NodeBalancers"}) + nbRegion, err := acceptance.GetRandomRegionWithCaps([]string{"NodeBalancers"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/networkingip/datasource_test.go b/linode/networkingip/datasource_test.go index c1079b04d..ae4b2e013 100644 --- a/linode/networkingip/datasource_test.go +++ b/linode/networkingip/datasource_test.go @@ -16,7 +16,7 @@ import ( var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"linodes"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"linodes"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/obj/resource_test.go b/linode/obj/resource_test.go index 805cff04b..95de2fa79 100644 --- a/linode/obj/resource_test.go +++ b/linode/obj/resource_test.go @@ -26,7 +26,7 @@ var ( ) func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"Object Storage"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Object Storage"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/objbucket/resource_test.go b/linode/objbucket/resource_test.go index 92fa3562d..2671a5b24 100644 --- a/linode/objbucket/resource_test.go +++ b/linode/objbucket/resource_test.go @@ -45,7 +45,7 @@ var ( ) func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"Object Storage"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Object Storage"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/objkey/frameowkr_resource_test.go b/linode/objkey/frameowkr_resource_test.go index dea0fc948..1ec80623d 100644 --- a/linode/objkey/frameowkr_resource_test.go +++ b/linode/objkey/frameowkr_resource_test.go @@ -30,7 +30,7 @@ func init() { F: sweep, }) - region, err := acceptance.GetRandomRegionWithCaps([]string{"Object Storage"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Object Storage"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/placementgroup/resource_test.go b/linode/placementgroup/resource_test.go index d3f5990b7..65dfb5fb3 100644 --- a/linode/placementgroup/resource_test.go +++ b/linode/placementgroup/resource_test.go @@ -27,7 +27,7 @@ func init() { }) var err error - testRegion, err = acceptance.GetRandomRegionWithCaps([]string{"Placement Group"}) + testRegion, err = acceptance.GetRandomRegionWithCaps([]string{"Placement Group"}, "core") if err != nil { log.Fatal(fmt.Errorf("Error getting region: %s", err)) } diff --git a/linode/placementgroupassignment/resource_test.go b/linode/placementgroupassignment/resource_test.go index 9027d9ad8..5431faddf 100644 --- a/linode/placementgroupassignment/resource_test.go +++ b/linode/placementgroupassignment/resource_test.go @@ -19,7 +19,7 @@ import ( var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"Placement Group"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Placement Group"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/placementgroups/datasource_test.go b/linode/placementgroups/datasource_test.go index 6d36b521e..7a5865b91 100644 --- a/linode/placementgroups/datasource_test.go +++ b/linode/placementgroups/datasource_test.go @@ -21,7 +21,7 @@ func TestAccDataSourcePlacementGroups_basic(t *testing.T) { baseLabel := acctest.RandomWithPrefix("tf-test") - testRegion, err := acceptance.GetRandomRegionWithCaps([]string{"Placement Group"}) + testRegion, err := acceptance.GetRandomRegionWithCaps([]string{"Placement Group"}, "core") if err != nil { t.Error(fmt.Errorf("failed to get region with PG capability: %w", err)) } diff --git a/linode/rdns/resource_test.go b/linode/rdns/resource_test.go index 45ecc410a..0b0ab9a2a 100644 --- a/linode/rdns/resource_test.go +++ b/linode/rdns/resource_test.go @@ -25,7 +25,7 @@ func init() { F: sweep, }) - region, err := acceptance.GetRandomRegionWithCaps([]string{"linodes"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"linodes"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/region/datasource_test.go b/linode/region/datasource_test.go index 95b301842..a379ed68a 100644 --- a/linode/region/datasource_test.go +++ b/linode/region/datasource_test.go @@ -18,7 +18,7 @@ var ( ) func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"linodes"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"linodes"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/vlan/datasource_test.go b/linode/vlan/datasource_test.go index 5a874de44..0143fd516 100644 --- a/linode/vlan/datasource_test.go +++ b/linode/vlan/datasource_test.go @@ -20,7 +20,7 @@ import ( var testRegion string func init() { - region, err := acceptance.GetRandomRegionWithCaps([]string{"vlans"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"vlans"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/volume/resource_test.go b/linode/volume/resource_test.go index 232fcc0a3..c117f4f6b 100644 --- a/linode/volume/resource_test.go +++ b/linode/volume/resource_test.go @@ -24,7 +24,7 @@ func init() { F: sweep, }) - region, err := acceptance.GetRandomRegionWithCaps([]string{"Block Storage"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Block Storage"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/volumes/datasource_test.go b/linode/volumes/datasource_test.go index b5f1ccd16..baacaa094 100644 --- a/linode/volumes/datasource_test.go +++ b/linode/volumes/datasource_test.go @@ -22,7 +22,7 @@ func init() { F: sweep, }) - region, err := acceptance.GetRandomRegionWithCaps([]string{"Block Storage"}) + region, err := acceptance.GetRandomRegionWithCaps([]string{"Block Storage"}, "core") if err != nil { log.Fatal(err) } diff --git a/linode/vpc/resource_test.go b/linode/vpc/resource_test.go index 22afc82d8..31a884941 100644 --- a/linode/vpc/resource_test.go +++ b/linode/vpc/resource_test.go @@ -29,7 +29,7 @@ func init() { var err error - testRegion, err = acceptance.GetRandomRegionWithCaps([]string{"VPCs"}) + testRegion, err = acceptance.GetRandomRegionWithCaps([]string{"VPCs"}, "core") if err != nil { log.Fatal(fmt.Errorf("Error getting region: %s", err)) } diff --git a/linode/vpcs/datasource_test.go b/linode/vpcs/datasource_test.go index f2cc6726e..075e6e55e 100644 --- a/linode/vpcs/datasource_test.go +++ b/linode/vpcs/datasource_test.go @@ -18,7 +18,7 @@ func TestAccDataSourceVPCs_basic_smoke(t *testing.T) { resourceName := "data.linode_vpcs.foobar" vpcLabel := acctest.RandomWithPrefix("tf-test") - testRegion, err := acceptance.GetRandomRegionWithCaps([]string{"VPCs"}) + testRegion, err := acceptance.GetRandomRegionWithCaps([]string{"VPCs"}, "core") if err != nil { t.Error(fmt.Errorf("failed to get region with VPC capability: %w", err)) } @@ -46,7 +46,7 @@ func TestAccDataSourceVPCs_filterByLabel(t *testing.T) { resourceName := "data.linode_vpcs.foobar" vpcLabel := acctest.RandomWithPrefix("tf-test") - testRegion, err := acceptance.GetRandomRegionWithCaps([]string{"VPCs"}) + testRegion, err := acceptance.GetRandomRegionWithCaps([]string{"VPCs"}, "core") if err != nil { log.Fatal(fmt.Errorf("Error getting region: %s", err)) } diff --git a/linode/vpcsubnet/resource_test.go b/linode/vpcsubnet/resource_test.go index 58f60b80f..4fea47abc 100644 --- a/linode/vpcsubnet/resource_test.go +++ b/linode/vpcsubnet/resource_test.go @@ -22,7 +22,7 @@ import ( var testRegion string func init() { - r, err := acceptance.GetRandomRegionWithCaps([]string{"VPCs"}) + r, err := acceptance.GetRandomRegionWithCaps([]string{"VPCs"}, "core") if err != nil { log.Fatal(fmt.Errorf("Error getting region: %s", err)) } diff --git a/linode/vpcsubnets/datasource_test.go b/linode/vpcsubnets/datasource_test.go index 444957a8b..8d1b6f249 100644 --- a/linode/vpcsubnets/datasource_test.go +++ b/linode/vpcsubnets/datasource_test.go @@ -18,7 +18,7 @@ func TestAccDataSourceVPCSubnets_basic_smoke(t *testing.T) { resourceName := "data.linode_vpc_subnets.foobar" vpcLabel := acctest.RandomWithPrefix("tf-test") - testRegion, err := acceptance.GetRandomRegionWithCaps([]string{"VPCs"}) + testRegion, err := acceptance.GetRandomRegionWithCaps([]string{"VPCs"}, "core") if err != nil { log.Fatal(fmt.Errorf("Error getting region: %s", err)) } @@ -51,7 +51,7 @@ func TestAccDataSourceVPCSubnets_filterByLabel(t *testing.T) { resourceName := "data.linode_vpc_subnets.foobar" vpcLabel := acctest.RandomWithPrefix("tf-test") - testRegion, err := acceptance.GetRandomRegionWithCaps([]string{"VPCs"}) + testRegion, err := acceptance.GetRandomRegionWithCaps([]string{"VPCs"}, "core") if err != nil { log.Fatal(fmt.Errorf("Error getting region: %s", err)) }