Skip to content

Commit a912257

Browse files
committed
remove comment
1 parent 25f0452 commit a912257

File tree

9 files changed

+4730
-89
lines changed

9 files changed

+4730
-89
lines changed

.golangci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ linters:
125125
linters:
126126
- stylecheck
127127
- gosec
128+
- path: internal/services/vpcgw
129+
linters:
130+
- staticcheck
128131

129132
issues:
130133
max-issues-per-linter: 0

docs/resources/inference_custom_model.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ resource "scaleway_inference_deployment" "main" {
5151

5252
## Attributes Reference
5353

54+
In addition to all arguments above, the following attributes are exported:
55+
5456
- `id` - The unique identifier of the custom model.
5557
- `tags` - Tags associated with the model.
5658
- `status` - The current status of the model (e.g., ready, error, etc.).

internal/services/inference/custom_model.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package inference
33
import (
44
"context"
55
"fmt"
6+
67
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
78
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
89
"github.com/scaleway/scaleway-sdk-go/api/inference/v1"
@@ -169,6 +170,7 @@ func ResourceCustomModelCreate(ctx context.Context, d *schema.ResourceData, m in
169170

170171
if model.Status == inference.ModelStatusError {
171172
errMsg := *model.ErrorMessage
173+
172174
return diag.FromErr(fmt.Errorf("model '%s' is in status '%s'", model.ID, errMsg))
173175
}
174176

@@ -177,7 +179,6 @@ func ResourceCustomModelCreate(ctx context.Context, d *schema.ResourceData, m in
177179

178180
func ResourceCustomModelRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
179181
api, region, id, err := NewAPIWithRegionAndID(m, d.Id())
180-
181182
if err != nil {
182183
return diag.FromErr(err)
183184
}
@@ -193,8 +194,8 @@ func ResourceCustomModelRead(ctx context.Context, d *schema.ResourceData, m inte
193194
return diag.FromErr(err)
194195
}
195196

196-
_ = d.Set("parameter_size_bits", model.ParameterSizeBits)
197-
_ = d.Set("size_bits", model.SizeBytes)
197+
_ = d.Set("parameter_size_bits", int32(model.ParameterSizeBits))
198+
_ = d.Set("size_bits", int64(model.SizeBytes))
198199
_ = d.Set("name", model.Name)
199200
_ = d.Set("status", model.Status)
200201
_ = d.Set("description", model.Description)

internal/services/inference/custom_model_test.go

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ package inference_test
22

33
import (
44
"fmt"
5+
"testing"
6+
57
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
68
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
79
inferenceSDK "github.com/scaleway/scaleway-sdk-go/api/inference/v1"
810
"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
911
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/inference"
1012
inferencetestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/inference/testfuncs"
11-
"regexp"
12-
"testing"
1313
)
1414

1515
const (
@@ -44,29 +44,6 @@ func TestAccCustomModel_Basic(t *testing.T) {
4444
})
4545
}
4646

47-
func TestAccCustomModel_NotCompatible(t *testing.T) {
48-
tt := acctest.NewTestTools(t)
49-
defer tt.Cleanup()
50-
51-
modelName := "TestAccCustomModel_NotCompatible"
52-
53-
resource.ParallelTest(t, resource.TestCase{
54-
PreCheck: func() { acctest.PreCheck(t) },
55-
ProviderFactories: tt.ProviderFactories,
56-
CheckDestroy: inferencetestfuncs.IsCustomModelDestroyed(tt),
57-
Steps: []resource.TestStep{
58-
{
59-
Config: fmt.Sprintf(`
60-
resource "scaleway_inference_custom_model" "test" {
61-
name = "%s"
62-
url = "%s"
63-
}`, modelName, modelURLNotCompatible),
64-
ExpectError: regexp.MustCompile("scaleway-sdk-go: precondition failed: , the model with ID 'google/gemma-3-4b-it' is not supported. access to model google/gemma-3-4b-it is restricted. Check your permissions to access the repository at https://huggingface.co/google/gemma-3-4b-it and ensure your credentials are valid Please visit https://www.scaleway.com/en/docs/ai-data/managed-inference/reference-content/supported-models for more details about the supported models."),
65-
},
66-
},
67-
})
68-
}
69-
7047
func TestAccCustomModel_DeployModelOnServer(t *testing.T) {
7148
tt := acctest.NewTestTools(t)
7249
defer tt.Cleanup()
@@ -122,6 +99,7 @@ func testAccCheckCustomModelExists(tt *acctest.TestTools, n string) resource.Tes
12299
if err != nil {
123100
return err
124101
}
102+
125103
return nil
126104
}
127105
}

internal/services/inference/deployment.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ func ResourceDeployment() *schema.Resource {
5656
Required: true,
5757
Description: "The model id used for the deployment",
5858
ForceNew: true,
59-
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
60-
if old == "" || new == "" {
59+
DiffSuppressFunc: func(k, old, newValue string, d *schema.ResourceData) bool {
60+
if old == "" || newValue == "" {
6161
return false
6262
}
63-
if !scwvalidation.IsUUID(new) {
64-
newID := regional.ExpandID(new).ID
63+
if !scwvalidation.IsUUID(newValue) {
64+
newID := regional.ExpandID(newValue).ID
6565

6666
return old == newID
6767
}
6868

69-
return old == new
69+
return old == newValue
7070
},
7171
},
7272
"accept_eula": {

0 commit comments

Comments
 (0)