Merge branch 'master' into container_vpc_integration

Author: remyleone

.golangci.yml

@@ -70,6 +70,7 @@ linters:
     - promlinter # Check Prometheus metrics naming via promlint [fast: true, auto-fix: false]
     - protogetter # Reports direct reads from proto message fields when getters should be used [fast: false, auto-fix: true]
     - reassign # Checks that package variables are not reassigned [fast: false, auto-fix: false]
+    - recvcheck # Checks for receiver type consistency.
     - revive # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint. [fast: false, auto-fix: false]
     - rowserrcheck # checks whether Err of rows is checked successfully [fast: false, auto-fix: false]
     - sloglint # ensure consistent code style when using log/slog [fast: false, auto-fix: false]

docs/resources/function.md

@@ -99,6 +99,9 @@ The following arguments are supported:
 
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the functions namespace is associated with.
 
+- `private_network_id` (Optional) The ID of the Private Network the function is connected to.
+
+~> **Important** This feature is currently in beta and requires a namespace with VPC integration activated by setting the `activate_vpc_integration` attribute to `true`.
 
 ## Attributes Reference
 

docs/resources/function_namespace.md

@@ -40,6 +40,10 @@ The following arguments are supported:
 
 - `secret_environment_variables` - (Optional) The secret environment variables of the namespace.
 
+- `activate_vpc_integration` - (Optional) Activates VPC integration for the namespace. Functions of a namespace with VPC integration activated will be able to connect to a Private Network.
+
+~> **Important** Updates to `activate_vpc_integration` will recreate the namespace.
+
 ## Attributes Reference
 
 The `scaleway_function_namespace` resource exports certain attributes once the Functions namespace has been created. These attributes can be referenced in other parts of your Terraform configuration.

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/nats-io/jwt/v2 v2.7.4
 	github.com/nats-io/nats.go v1.38.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250604134054-a06406d42247
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250613133518-6987cd48643b
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/crypto v0.38.0
 	gopkg.in/dnaeon/go-vcr.v3 v3.2.0

go.sum

@@ -447,8 +447,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250604134054-a06406d42247 h1:wlIvcSpGl3mGDpQmwrZHnYMIlB7Mwx3bhg151LG22Ws=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250604134054-a06406d42247/go.mod h1:qiGzapFyNPFwBBLJ+hTFykKSnU95n1zL64+o1ubmwf0=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250613133518-6987cd48643b h1:7V7T9XzUl+B/6zHeNxyX0DV3OVjCSedA0stHo0BNKZw=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250613133518-6987cd48643b/go.mod h1:zFWiHphneiey3s8HOtAEnGrRlWivNaxW5T6d5Xfco7g=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=

internal/acctest/acctest.go

@@ -102,65 +102,6 @@ func extractGeneratedNamePrefix(name string) string {
 	return name
 }
 
-// compareJSONFieldsStrings compare two strings from request JSON bodies
-// has special case when string are terraform generated names
-func compareJSONFieldsStrings(expected, actual string) bool {
-	expectedHandled := expected
-	actualHandled := actual
-
-	// Remove s3 url suffix to allow comparison
-	if strings.HasSuffix(actual, ".s3-website.fr-par.scw.cloud") {
-		actual = strings.TrimSuffix(actual, ".s3-website.fr-par.scw.cloud")
-		expected = strings.TrimSuffix(expected, ".s3-website.fr-par.scw.cloud")
-	}
-
-	// Try to parse test generated name
-	if strings.Contains(actual, "-") {
-		expectedHandled = extractTestGeneratedNamePrefix(expected)
-		actualHandled = extractTestGeneratedNamePrefix(actual)
-	}
-
-	// Try provider generated name
-	if actualHandled == actual && strings.HasPrefix(actual, "tf-") {
-		expectedHandled = extractGeneratedNamePrefix(expected)
-		actualHandled = extractGeneratedNamePrefix(actual)
-	}
-
-	return expectedHandled == actualHandled
-}
-
-// compareJSONBodies compare two given maps that represent json bodies
-// returns true if both json are equivalent
-func compareJSONBodies(expected, actual map[string]any) bool {
-	// Check for each key in actual requests
-	// Compare its value to cassette content if marshal-able to string
-	for key := range actual {
-		expectedValue, exists := expected[key]
-		if !exists {
-			// Actual request may contain a field that does not exist in cassette
-			// New fields can appear in requests with new api features
-			// We do not want to generate new cassettes for each new features
-			continue
-		}
-
-		if !compareJSONFields(expectedValue, actual[key]) {
-			return false
-		}
-	}
-
-	for key := range expected {
-		_, exists := actual[key]
-		if !exists && expected[key] != nil {
-			// Fails match if cassettes contains a field not in actual requests
-			// Fields should not disappear from requests unless a sdk breaking change
-			// We ignore if field is nil in cassette as it could be an old deprecated and unused field
-			return false
-		}
-	}
-
-	return true
-}
-
 // IsTestResource returns true if given resource identifier is from terraform test
 // identifier should be resource name but some resource don't have names
 // return true if identifier match regex "tf[-_]test"