wip

Author: Gnoale

internal/acctest/acctest.go

@@ -35,7 +35,7 @@ func NewTestTools(t *testing.T) *TestTools {
 	}
 
 	// Create a http client with recording capabilities
-	httpClient, cleanup, err := getHTTPRecoder(t, folder, *UpdateCassettes)
+	httpClient, cleanup, err := getHTTPRecoder(t, folder, *UpdateCassettes, cassetteMatcher)
 	require.NoError(t, err)
 
 	// Create meta that will be passed in the provider config
@@ -65,6 +65,45 @@ func NewTestTools(t *testing.T) *TestTools {
 	}
 }
 
+func NewTestToolsWithoutRequestProjectID(t *testing.T) *TestTools {
+	t.Helper()
+
+	ctx := t.Context()
+
+	folder, err := os.Getwd()
+	if err != nil {
+		t.Fatalf("cannot detect working directory for testing")
+	}
+
+	// Create a http client with recording capabilities
+	httpClient, cleanup, err := getHTTPRecoder(t, folder, *UpdateCassettes, cassetteMatcherWithoutProjectID)
+	require.NoError(t, err)
+
+	// Create meta that will be passed in the provider config
+	m, err := meta.NewMeta(ctx, &meta.Config{
+		ProviderSchema:   nil,
+		TerraformVersion: "terraform-tests",
+		HTTPClient:       httpClient,
+	})
+	require.NoError(t, err)
+
+	if !*UpdateCassettes {
+		tmp := 0 * time.Second
+		transport.DefaultWaitRetryInterval = &tmp
+	}
+
+	return &TestTools{
+		T:    t,
+		Meta: m,
+		ProviderFactories: map[string]func() (*schema.Provider, error){
+			"scaleway": func() (*schema.Provider, error) {
+				return provider.Provider(&provider.Config{Meta: m})(), nil
+			},
+		},
+		Cleanup: cleanup,
+	}
+}
+
 // Test Generated name has format: "{prefix}-{generated_number}
 // example: test-acc-scaleway-project-3723338038624371236
 func extractTestGeneratedNamePrefix(name string) string {

internal/acctest/vcr.go

@@ -35,7 +35,6 @@ var SensitiveFields = map[string]interface{}{
 // QueryMatcherIgnore contains the list of query value that should be ignored when matching requests with cassettes
 var QueryMatcherIgnore = []string{
 	"organization_id",
-	"project_id",
 }
 
 // BodyMatcherIgnore contains the list of json body keys that should be ignored when matching requests with cassettes
@@ -236,6 +235,30 @@ func cassetteMatcher(actual *http.Request, expected cassette.Request) bool {
 		cassetteBodyMatcher(actual, expected)
 }
 
+// cassetteMatcherWithoutProjectID is a custom matcher that check equivalence of a played request against a recorded one
+// It compares method, path and query but will remove unwanted values from query
+func cassetteMatcherWithoutProjectID(actual *http.Request, expected cassette.Request) bool {
+	expectedURL, _ := url.Parse(expected.URL)
+	actualURL := actual.URL
+	actualURLValues := actualURL.Query()
+	expectedURLValues := expectedURL.Query()
+
+	for _, query := range QueryMatcherIgnore {
+		actualURLValues.Del(query)
+		expectedURLValues.Del(query)
+	}
+	actualURLValues.Del("project_id")
+	expectedURLValues.Del("project_id")
+
+	actualURL.RawQuery = actualURLValues.Encode()
+	expectedURL.RawQuery = expectedURLValues.Encode()
+
+	return actual.Method == expected.Method &&
+		actual.URL.Path == expectedURL.Path &&
+		actualURL.RawQuery == expectedURL.RawQuery &&
+		cassetteBodyMatcher(actual, expected)
+}
+
 func cassetteSensitiveFieldsAnonymizer(i *cassette.Interaction) error {
 	var jsonBody map[string]interface{}
 
@@ -267,7 +290,7 @@ func cassetteSensitiveFieldsAnonymizer(i *cassette.Interaction) error {
 //
 // It is important to add a `defer cleanup()` so the given cassette files are correctly
 // closed and saved after the requests.
-func getHTTPRecoder(t *testing.T, pkgFolder string, update bool) (client *http.Client, cleanup func(), err error) {
+func getHTTPRecoder(t *testing.T, pkgFolder string, update bool, matcherFunc cassette.MatcherFunc) (client *http.Client, cleanup func(), err error) {
 	t.Helper()
 
 	recorderMode := recorder.ModeReplayOnly
@@ -298,7 +321,7 @@ func getHTTPRecoder(t *testing.T, pkgFolder string, update bool) (client *http.C
 	}(r)
 
 	// Add custom matcher for requests and cassettes
-	r.SetMatcher(cassetteMatcher)
+	r.SetMatcher(matcherFunc)
 
 	// Add a filter which removes Authorization headers from all requests:
 	r.AddHook(func(i *cassette.Interaction) error {

internal/services/container/container_data_source_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestAccDataSourceContainer_Basic(t *testing.T) {
-	tt := acctest.NewTestTools(t)
+	tt := acctest.NewTestToolsWithoutRequestProjectID(t)
 	defer tt.Cleanup()
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -30,7 +30,7 @@ func TestAccDataSourceContainer_Basic(t *testing.T) {
 						namespace_id = scaleway_container_namespace.main.id
 						name = scaleway_container.main.name
 					}
-					
+
 					data "scaleway_container" "by_id" {
 						namespace_id = scaleway_container_namespace.main.id
 						container_id = scaleway_container.main.id

internal/services/container/container_test.go

@@ -208,7 +208,7 @@ func TestAccContainer_Env(t *testing.T) {
 }
 
 func TestAccContainer_WithIMG(t *testing.T) {
-	tt := acctest.NewTestTools(t)
+	tt := acctest.NewTestToolsWithoutRequestProjectID(t)
 	defer tt.Cleanup()
 
 	containerNamespace := "test-cr-ns-02"

internal/services/container/namespace_data_source_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestAccDataSourceNamespace_Basic(t *testing.T) {
-	tt := acctest.NewTestTools(t)
+	tt := acctest.NewTestToolsWithoutRequestProjectID(t)
 	defer tt.Cleanup()
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -21,11 +21,11 @@ func TestAccDataSourceNamespace_Basic(t *testing.T) {
 					resource "scaleway_container_namespace" "main" {
 						name = "test-cr-data"
 					}
-					
+
 					data "scaleway_container_namespace" "by_name" {
 						name = scaleway_container_namespace.main.name
 					}
-					
+
 					data "scaleway_container_namespace" "by_id" {
 						namespace_id = scaleway_container_namespace.main.id
 					}