Skip to content

Commit f2f78ba

Browse files
authored
fix(container): use cpu_limit (#1952)
1 parent 5a8cf82 commit f2f78ba

4 files changed

+248
-339
lines changed

scaleway/helpers_container.go

+4
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ func setCreateContainerRequest(d *schema.ResourceData, region scw.Region) (*cont
8383
req.MemoryLimit = scw.Uint32Ptr(uint32(memoryLimit.(int)))
8484
}
8585

86+
if cpuLimit, ok := d.GetOk("cpu_limit"); ok {
87+
req.CPULimit = scw.Uint32Ptr(uint32(cpuLimit.(int)))
88+
}
89+
8690
if timeout, ok := d.GetOk("timeout"); ok {
8791
timeInt := timeout.(int)
8892
req.Timeout = &scw.Duration{Seconds: int64(timeInt)}

scaleway/resource_container.go

+4
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,10 @@ func resourceScalewayContainerUpdate(ctx context.Context, d *schema.ResourceData
330330
req.MemoryLimit = scw.Uint32Ptr(uint32(d.Get("memory_limit").(int)))
331331
}
332332

333+
if d.HasChanges("cpu_limit") {
334+
req.CPULimit = scw.Uint32Ptr(uint32(d.Get("cpu_limit").(int)))
335+
}
336+
333337
if d.HasChanges("timeout") {
334338
req.Timeout = &scw.Duration{Seconds: int64(d.Get("timeout").(int))}
335339
}

scaleway/resource_container_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func TestAccScalewayContainer_Basic(t *testing.T) {
135135
max_scale = 2
136136
max_concurrency = 80
137137
memory_limit = 256
138-
cpu_limit = 140
138+
cpu_limit = 280
139139
deploy = false
140140
}
141141
`,
@@ -144,7 +144,7 @@ func TestAccScalewayContainer_Basic(t *testing.T) {
144144
testCheckResourceAttrUUID("scaleway_container.main", "id"),
145145
resource.TestCheckResourceAttr("scaleway_container.main", "name", "my-container-tf"),
146146
resource.TestCheckResourceAttr("scaleway_container.main", "port", "5000"),
147-
resource.TestCheckResourceAttr("scaleway_container.main", "cpu_limit", "140"),
147+
resource.TestCheckResourceAttr("scaleway_container.main", "cpu_limit", "280"),
148148
resource.TestCheckResourceAttr("scaleway_container.main", "memory_limit", "256"),
149149
resource.TestCheckResourceAttr("scaleway_container.main", "min_scale", "1"),
150150
resource.TestCheckResourceAttr("scaleway_container.main", "max_scale", "2"),

0 commit comments

Comments
 (0)