Fix rebase issue. Sorry -_-'

Author: remyleone

docs/data-sources/container.md

@@ -93,20 +93,16 @@ In addition to all arguments above, the following attributes are exported:
 
 - `sandbox` - Execution environment of the container.
 
-<<<<<<< HEAD
 - `heath_check` - Health check configuration block of the container.
     - `http` - HTTP health check configuration.
         - `path` - Path to use for the HTTP health check.
     - `failure_threshold` - Number of consecutive health check failures before considering the container unhealthy.
     - `interval`- Period between health checks (in seconds).
-||||||| parent of d04ca3f0 (feat(container/serverless): add scaling_option block)
 - `sandbox` - (Optional) Execution environment of the container.
-=======
 - `scaling_option` - Configuration block used to decide when to scale up or down. Possible values:
     - `concurrent_requests_threshold` - Scale depending on the number of concurrent requests being processed per container instance.
     - `cpu_usage_threshold` - Scale depending on the CPU usage of a container instance.
     - `memory_usage_threshold`- Scale depending on the memory usage of a container instance.
->>>>>>> d04ca3f0 (feat(container/serverless): add scaling_option block)
 
 - `status` - The container status.
 

docs/resources/container.md

@@ -84,19 +84,16 @@ The following arguments are supported:
 
 - `sandbox` - (Optional) Execution environment of the container.
 
-<<<<<<< HEAD
 - `heath_check` - (Optional) Health check configuration block of the container.
     - `http` - HTTP health check configuration.
         - `path` - Path to use for the HTTP health check.
     - `failure_threshold` - Number of consecutive health check failures before considering the container unhealthy.
     - `interval`- Period between health checks (in seconds).
-||||||| parent of d04ca3f0 (feat(container/serverless): add scaling_option block)
-=======
+
 - `scaling_option` - (Optional) Configuration block used to decide when to scale up or down. Possible values:
     - `concurrent_requests_threshold` - Scale depending on the number of concurrent requests being processed per container instance.
     - `cpu_usage_threshold` - Scale depending on the CPU usage of a container instance.
     - `memory_usage_threshold`- Scale depending on the memory usage of a container instance.
->>>>>>> d04ca3f0 (feat(container/serverless): add scaling_option block)
 
 - `port` - (Optional) The port to expose the container.
 
@@ -168,7 +165,6 @@ The `memory_limit` (in MB) must correspond with the right amount of vCPU. Refer
 ~>**Important:** Make sure to select the right resources, as you will be billed based on compute usage over time and the number of Containers executions.
 Refer to the [Serverless Containers pricing](https://www.scaleway.com/en/docs/faq/serverless-containers/#prices) for more information.
 
-<<<<<<< HEAD
 ## Health check configuration
 
 Custom health checks can be configured on the container.
@@ -197,9 +193,8 @@ resource scaleway_container main {
 
 ~>**Important:** Another probe type can be set to TCP with the API, but currently the SDK has not been updated with this parameter.
 This is why the only probe that can be used here is the HTTP probe.
-||||||| parent of d04ca3f0 (feat(container/serverless): add scaling_option block)
 Refer to the [Serverless Containers pricing](https://www.scaleway.com/en/docs/faq/serverless-containers/#prices) for more information.
-=======
+
 ## Scaling option configuration
 
 Scaling option block configuration allows you to choose which parameter will scale up/down containers.
@@ -220,5 +215,4 @@ resource scaleway_container main {
 ```
 
 ~>**Important**: A maximum of one of these parameters may be set. Also, when `cpu_usage_threshold` or `memory_usage_threshold` are used, `min_scale` can't be set to 0.
->>>>>>> d04ca3f0 (feat(container/serverless): add scaling_option block)
-Refer to the [API Reference](https://www.scaleway.com/en/developers/api/serverless-containers/#path-containers-create-a-new-container) for more information.
+Refer to the [API Reference](https://www.scaleway.com/en/developers/api/serverless-containers/#path-containers-create-a-new-container) for more information.

internal/services/container/container.go

@@ -172,7 +172,6 @@ func ResourceContainer() *schema.Resource {
 				Description:      "Execution environment of the container.",
 				ValidateDiagFunc: verify.ValidateEnum[container.ContainerSandbox](),
 			},
-<<<<<<< HEAD
 			"health_check": {
 				Type:        schema.TypeSet,
 				Optional:    true,
@@ -207,8 +206,10 @@ func ResourceContainer() *schema.Resource {
 							DiffSuppressFunc: dsf.Duration,
 							ValidateDiagFunc: verify.IsDuration(),
 							Required:         true,
-||||||| parent of d04ca3f0 (feat(container/serverless): add scaling_option block)
-=======
+						},
+					},
+				},
+			},
 			"scaling_option": {
 				Type:        schema.TypeSet,
 				Optional:    true,
@@ -230,7 +231,6 @@ func ResourceContainer() *schema.Resource {
 							Type:        schema.TypeInt,
 							Description: "Scale depending on the memory usage of a container instance.",
 							Optional:    true,
->>>>>>> d04ca3f0 (feat(container/serverless): add scaling_option block)
 						},
 					},
 				},
@@ -348,12 +348,8 @@ func ResourceContainerRead(ctx context.Context, d *schema.ResourceData, m interf
 	_ = d.Set("deploy", scw.BoolPtr(*types.ExpandBoolPtr(d.Get("deploy"))))
 	_ = d.Set("http_option", co.HTTPOption)
 	_ = d.Set("sandbox", co.Sandbox)
-<<<<<<< HEAD
 	_ = d.Set("health_check", flattenHealthCheck(co.HealthCheck))
-||||||| parent of d04ca3f0 (feat(container/serverless): add scaling_option block)
-=======
 	_ = d.Set("scaling_option", flattenScalingOption(co.ScalingOption))
->>>>>>> d04ca3f0 (feat(container/serverless): add scaling_option block)
 	_ = d.Set("region", co.Region.String())
 
 	return nil
@@ -449,7 +445,6 @@ func ResourceContainerUpdate(ctx context.Context, d *schema.ResourceData, m inte
 		req.Sandbox = container.ContainerSandbox(d.Get("sandbox").(string))
 	}
 
-<<<<<<< HEAD
 	if d.HasChanges("health_check") {
 		healthCheck := d.Get("health_check")
 
@@ -459,8 +454,8 @@ func ResourceContainerUpdate(ctx context.Context, d *schema.ResourceData, m inte
 		}
 
 		req.HealthCheck = healthCheckReq
-||||||| parent of d04ca3f0 (feat(container/serverless): add scaling_option block)
-=======
+	}
+
 	if d.HasChanges("scaling_option") {
 		scalingOption := d.Get("scaling_option")
 
@@ -470,7 +465,6 @@ func ResourceContainerUpdate(ctx context.Context, d *schema.ResourceData, m inte
 		}
 
 		req.ScalingOption = scalingOptionReq
->>>>>>> d04ca3f0 (feat(container/serverless): add scaling_option block)
 	}
 
 	imageHasChanged := d.HasChanges("registry_sha256")

internal/services/container/container_data_source_test.go

@@ -50,7 +50,6 @@ func TestAccDataSourceContainer_Basic(t *testing.T) {
 	})
 }
 
-<<<<<<< HEAD
 func TestAccDataSourceContainer_HealthCheck(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
@@ -83,8 +82,11 @@ func TestAccDataSourceContainer_HealthCheck(t *testing.T) {
 					resource.TestCheckResourceAttr("data.scaleway_container.main", "health_check.#", "1"),
 					resource.TestCheckResourceAttr("data.scaleway_container.main", "health_check.0.failure_threshold", "30"),
 					resource.TestCheckResourceAttr("data.scaleway_container.main", "health_check.0.interval", "10s"),
-||||||| parent of d04ca3f0 (feat(container/serverless): add scaling_option block)
-=======
+			},
+		},
+	}
+}
+
 func TestAccDataSourceContainer_ScalingOption(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
@@ -114,7 +116,6 @@ func TestAccDataSourceContainer_ScalingOption(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_container.main", "scaling_option.0.concurrent_requests_threshold", "50"),
 					resource.TestCheckResourceAttr("data.scaleway_container.main", "scaling_option.#", "1"),
 					resource.TestCheckResourceAttr("data.scaleway_container.main", "scaling_option.0.concurrent_requests_threshold", "50"),
->>>>>>> d04ca3f0 (feat(container/serverless): add scaling_option block)
 				),
 			},
 		},

internal/services/container/container_test.go

@@ -400,7 +400,6 @@ func TestAccContainer_Sandbox(t *testing.T) {
 	})
 }
 
-<<<<<<< HEAD
 func TestAccContainer_HealthCheck(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
@@ -449,8 +448,12 @@ func TestAccContainer_HealthCheck(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_container.main", "health_check.0.http.0.path", "/test"),
 					resource.TestCheckResourceAttr("scaleway_container.main", "health_check.0.failure_threshold", "40"),
 					resource.TestCheckResourceAttr("scaleway_container.main", "health_check.0.interval", "12s"),
-||||||| parent of d04ca3f0 (feat(container/serverless): add scaling_option block)
-=======
+				),
+			},
+		},
+	})
+}
+
 func TestAccContainer_ScalingOption(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
@@ -534,7 +537,6 @@ func TestAccContainer_ScalingOption(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					isContainerPresent(tt, "scaleway_container.main"),
 					resource.TestCheckResourceAttr("scaleway_container.main", "scaling_option.0.memory_usage_threshold", "66"),
->>>>>>> d04ca3f0 (feat(container/serverless): add scaling_option block)
 				),
 			},
 		},