Skip to content

Commit 579647c

Browse files
GnoaleyfodilMia-Crossremyleone
authored
chore(container): simplify Container testing and remove image push (#3155)
* fix(tests): remove check / fixture test function causing side effects * update IPAM cassettes * record instance tests --------- Co-authored-by: Yacine FODIL <[email protected]> Co-authored-by: Leïla Marabese <[email protected]> Co-authored-by: Rémy Léone <[email protected]>
1 parent ba0d3a3 commit 579647c

File tree

84 files changed

+39768
-43922
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+39768
-43922
lines changed

internal/services/container/container_test.go

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
1313
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1414
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/container"
15-
containerchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/container/testfuncs"
1615
)
1716

1817
func TestAccContainer_Basic(t *testing.T) {
@@ -226,25 +225,6 @@ func TestAccContainer_WithIMG(t *testing.T) {
226225
ProviderFactories: tt.ProviderFactories,
227226
CheckDestroy: isContainerDestroyed(tt),
228227
Steps: []resource.TestStep{
229-
{
230-
Config: fmt.Sprintf(`
231-
resource scaleway_container_namespace main {
232-
name = "%s"
233-
description = "test container"
234-
}
235-
`, containerNamespace),
236-
},
237-
{
238-
Config: fmt.Sprintf(`
239-
resource scaleway_container_namespace main {
240-
name = "%s"
241-
description = "test container"
242-
}
243-
`, containerNamespace),
244-
Check: resource.ComposeTestCheckFunc(
245-
containerchecks.TestConfigContainerNamespace(tt, "scaleway_container_namespace.main"),
246-
),
247-
},
248228
{
249229
Config: fmt.Sprintf(`
250230
resource scaleway_container_namespace main {
@@ -256,7 +236,7 @@ func TestAccContainer_WithIMG(t *testing.T) {
256236
name = "my-container-02"
257237
description = "environment variables test"
258238
namespace_id = scaleway_container_namespace.main.id
259-
registry_image = "${scaleway_container_namespace.main.registry_endpoint}/nginx:test"
239+
registry_image = "nginx:latest"
260240
port = 80
261241
cpu_limit = 140
262242
memory_limit = 256
@@ -501,7 +481,7 @@ func TestAccContainer_ScalingOption(t *testing.T) {
501481
{
502482
Config: `
503483
resource scaleway_container_namespace main {}
504-
484+
505485
resource scaleway_container main {
506486
namespace_id = scaleway_container_namespace.main.id
507487
deploy = false
@@ -520,7 +500,7 @@ func TestAccContainer_ScalingOption(t *testing.T) {
520500
{
521501
Config: `
522502
resource scaleway_container_namespace main {}
523-
503+
524504
resource scaleway_container main {
525505
namespace_id = scaleway_container_namespace.main.id
526506
deploy = false
@@ -542,7 +522,7 @@ func TestAccContainer_ScalingOption(t *testing.T) {
542522
{
543523
Config: `
544524
resource scaleway_container_namespace main {}
545-
525+
546526
resource scaleway_container main {
547527
namespace_id = scaleway_container_namespace.main.id
548528
deploy = false

internal/services/container/domain_test.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1212
"github.com/scaleway/terraform-provider-scaleway/v2/internal/logging"
1313
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/container"
14-
containerchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/container/testfuncs"
1514
)
1615

1716
func TestAccDomain_Basic(t *testing.T) {
@@ -26,18 +25,12 @@ func TestAccDomain_Basic(t *testing.T) {
2625
ProviderFactories: tt.ProviderFactories,
2726
CheckDestroy: isDomainDestroyed(tt),
2827
Steps: []resource.TestStep{
29-
{
30-
Config: `
31-
resource scaleway_container_namespace main {}
32-
`,
33-
Check: containerchecks.TestConfigContainerNamespace(tt, "scaleway_container_namespace.main"),
34-
},
3528
{
3629
Config: fmt.Sprintf(`
3730
resource scaleway_container_namespace main {}
3831
3932
resource scaleway_container app {
40-
registry_image = "${scaleway_container_namespace.main.registry_endpoint}/nginx:test"
33+
registry_image = "nginx:latest"
4134
namespace_id = scaleway_container_namespace.main.id
4235
port = 80
4336
deploy = true

internal/services/container/testdata/container-basic.cassette.yaml

Lines changed: 349 additions & 594 deletions
Large diffs are not rendered by default.

internal/services/container/testdata/container-with-img.cassette.yaml

Lines changed: 224 additions & 273 deletions
Large diffs are not rendered by default.

internal/services/container/testdata/domain-basic.cassette.yaml

Lines changed: 489 additions & 2988 deletions
Large diffs are not rendered by default.

internal/services/container/testfuncs/checks.go

Lines changed: 0 additions & 143 deletions
This file was deleted.

internal/services/function/domain_test.go

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
1111
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1212
"github.com/scaleway/terraform-provider-scaleway/v2/internal/logging"
13-
containerchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/container/testfuncs"
1413
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/function"
1514
)
1615

@@ -26,21 +25,6 @@ func TestAccFunctionDomain_Basic(t *testing.T) {
2625
ProviderFactories: tt.ProviderFactories,
2726
CheckDestroy: testAccCheckFunctionDomainDestroy(tt),
2827
Steps: []resource.TestStep{
29-
{
30-
Config: `
31-
resource scaleway_function_namespace main {}
32-
33-
resource scaleway_function main {
34-
namespace_id = scaleway_function_namespace.main.id
35-
runtime = "go122"
36-
privacy = "private"
37-
handler = "Handle"
38-
zip_file = "testfixture/gofunction.zip"
39-
deploy = true
40-
}
41-
`,
42-
Check: containerchecks.TestConfigContainerNamespace(tt, "scaleway_function_namespace.main"),
43-
},
4428
{
4529
Config: fmt.Sprintf(`
4630
resource scaleway_function_namespace main {}
@@ -56,7 +40,7 @@ func TestAccFunctionDomain_Basic(t *testing.T) {
5640
5741
resource scaleway_domain_record "function" {
5842
dns_zone = "%s"
59-
name = "container"
43+
name = "function"
6044
type = "CNAME"
6145
data = "${scaleway_function.main.domain_name}."
6246
ttl = 60
@@ -69,6 +53,7 @@ func TestAccFunctionDomain_Basic(t *testing.T) {
6953
`, testDNSZone),
7054
Check: resource.ComposeTestCheckFunc(
7155
testAccCheckFunctionDomainExists(tt, "scaleway_function_domain.main"),
56+
resource.TestCheckResourceAttr("scaleway_function_domain.main", "hostname", fmt.Sprintf("%s.%s", "function", testDNSZone)),
7257
),
7358
},
7459
},

0 commit comments

Comments
 (0)