Skip to content

Commit dbf2458

Browse files
PraveenKumar Shanmugamravinitp
PraveenKumar Shanmugam
authored and
ravinitp
committed
Model Version Set - DataScience BugFix
1 parent 300b79f commit dbf2458

File tree

4 files changed

+52
-204
lines changed

4 files changed

+52
-204
lines changed

‎examples/datascience/model_catalog/model.tf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ provider "oci" {
6464
fingerprint = var.fingerprint
6565
private_key_path = var.private_key_path
6666
region = var.region
67-
#version = "6.0.0"
6867
}
6968

7069
resource "oci_datascience_project" "tf_project" {

‎internal/integrationtest/datascience_model_test.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ var (
8383
"value": acctest.Representation{RepType: acctest.Optional, Create: `ner`, Update: `ner`},
8484
}
8585
DatascienceModelRetentionSettingRepresentation = map[string]interface{}{
86-
"archive_after_days": acctest.Representation{RepType: acctest.Required, Create: `40`, Update: `41`},
86+
"archive_after_days": acctest.Representation{RepType: acctest.Required, Create: `40`, Update: `40`},
8787
"customer_notification_type": acctest.Representation{RepType: acctest.Optional, Create: `NONE`, Update: `ALL`},
88-
"delete_after_days": acctest.Representation{RepType: acctest.Optional, Create: `45`, Update: `46`},
88+
"delete_after_days": acctest.Representation{RepType: acctest.Optional, Create: `45`, Update: `45`},
8989
}
9090

9191
DatascienceModelResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_datascience_project", "test_project", acctest.Required, acctest.Create, DatascienceProjectRepresentation) +
@@ -226,9 +226,9 @@ func TestDatascienceModelResource_basic(t *testing.T) {
226226
resource.TestCheckResourceAttrSet(resourceName, "project_id"),
227227
resource.TestCheckResourceAttr(resourceName, "retention_operation_details.#", "1"),
228228
resource.TestCheckResourceAttr(resourceName, "retention_setting.#", "1"),
229-
resource.TestCheckResourceAttr(resourceName, "retention_setting.0.archive_after_days", "10"),
229+
resource.TestCheckResourceAttr(resourceName, "retention_setting.0.archive_after_days", "40"),
230230
resource.TestCheckResourceAttr(resourceName, "retention_setting.0.customer_notification_type", "NONE"),
231-
resource.TestCheckResourceAttr(resourceName, "retention_setting.0.delete_after_days", "10"),
231+
resource.TestCheckResourceAttr(resourceName, "retention_setting.0.delete_after_days", "45"),
232232
//resource.TestCheckResourceAttr(resourceName, "state", ACTIVE),
233233
resource.TestCheckResourceAttrSet(resourceName, "state"),
234234
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
@@ -272,9 +272,9 @@ func TestDatascienceModelResource_basic(t *testing.T) {
272272
resource.TestCheckResourceAttrSet(resourceName, "project_id"),
273273
resource.TestCheckResourceAttr(resourceName, "retention_operation_details.#", "1"),
274274
resource.TestCheckResourceAttr(resourceName, "retention_setting.#", "1"),
275-
resource.TestCheckResourceAttr(resourceName, "retention_setting.0.archive_after_days", "11"),
275+
resource.TestCheckResourceAttr(resourceName, "retention_setting.0.archive_after_days", "40"),
276276
resource.TestCheckResourceAttr(resourceName, "retention_setting.0.customer_notification_type", "ALL"),
277-
resource.TestCheckResourceAttr(resourceName, "retention_setting.0.delete_after_days", "11"),
277+
resource.TestCheckResourceAttr(resourceName, "retention_setting.0.delete_after_days", "45"),
278278
//resource.TestCheckResourceAttr(resourceName, "state", ACTIVE),
279279
resource.TestCheckResourceAttrSet(resourceName, "state"),
280280
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
@@ -309,8 +309,7 @@ func TestDatascienceModelResource_basic(t *testing.T) {
309309
resource.TestCheckResourceAttrSet(datasourceName, "models.0.project_id"),
310310
resource.TestCheckResourceAttrSet(datasourceName, "models.0.state"),
311311
resource.TestCheckResourceAttrSet(datasourceName, "models.0.time_created"),
312-
resource.TestCheckResourceAttrSet(datasourceName, "models.0.version_id"),
313-
resource.TestCheckResourceAttr(datasourceName, "models.0.version_label", "versionLabel2"),
312+
resource.TestCheckResourceAttr(datasourceName, "models.0.version_label", ""),
314313
),
315314
},
316315

‎internal/service/datascience/datascience_model_resource.go‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,21 @@ func DatascienceModelResource() *schema.Resource {
5656
Required: true,
5757
ForceNew: true,
5858
},
59+
"model_version_set_name": {
60+
Type: schema.TypeString,
61+
Optional: true,
62+
Computed: true,
63+
},
64+
"model_version_set_id": {
65+
Type: schema.TypeString,
66+
Optional: true,
67+
Computed: true,
68+
},
69+
"version_label": {
70+
Type: schema.TypeString,
71+
Optional: true,
72+
Computed: true,
73+
},
5974

6075
// Optional
6176
"backup_setting": {
@@ -253,10 +268,6 @@ func DatascienceModelResource() *schema.Resource {
253268
Type: schema.TypeString,
254269
Computed: true,
255270
},
256-
"model_version_set_name": {
257-
Type: schema.TypeString,
258-
Computed: true,
259-
},
260271
"retention_operation_details": {
261272
Type: schema.TypeList,
262273
Computed: true,
@@ -751,6 +762,18 @@ func (s *DatascienceModelResourceCrud) SetData() error {
751762
s.D.Set("description", *s.Res.Description)
752763
}
753764

765+
if s.Res.ModelVersionSetName != nil {
766+
s.D.Set("model_version_set_name", *s.Res.ModelVersionSetName)
767+
}
768+
769+
if s.Res.ModelVersionSetId != nil {
770+
s.D.Set("model_version_set_id", *s.Res.ModelVersionSetId)
771+
}
772+
773+
if s.Res.VersionLabel != nil {
774+
s.D.Set("version_label", *s.Res.VersionLabel)
775+
}
776+
754777
if s.Res.DisplayName != nil {
755778
s.D.Set("display_name", *s.Res.DisplayName)
756779
}
@@ -765,14 +788,6 @@ func (s *DatascienceModelResourceCrud) SetData() error {
765788
s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
766789
}
767790

768-
if s.Res.ModelVersionSetId != nil {
769-
s.D.Set("model_version_set_id", *s.Res.ModelVersionSetId)
770-
}
771-
772-
if s.Res.ModelVersionSetName != nil {
773-
s.D.Set("model_version_set_name", *s.Res.ModelVersionSetName)
774-
}
775-
776791
if s.Res.OutputSchema != nil {
777792
s.D.Set("output_schema", *s.Res.OutputSchema)
778793
}

‎internal/service/datascience/datascience_models_data_source.go‎

Lines changed: 18 additions & 183 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package datascience
55

66
import (
77
"context"
8+
89
oci_datascience "github.com/oracle/oci-go-sdk/v65/datascience"
910

1011
"github.com/oracle/terraform-provider-oci/internal/client"
@@ -22,6 +23,18 @@ func DatascienceModelsDataSource() *schema.Resource {
2223
Type: schema.TypeString,
2324
Required: true,
2425
},
26+
"model_version_set_name": {
27+
Type: schema.TypeString,
28+
Optional: true,
29+
},
30+
"model_version_set_id": {
31+
Type: schema.TypeString,
32+
Optional: true,
33+
},
34+
"version_label": {
35+
Type: schema.TypeString,
36+
Optional: true,
37+
},
2538
"created_by": {
2639
Type: schema.TypeString,
2740
Optional: true,
@@ -45,185 +58,7 @@ func DatascienceModelsDataSource() *schema.Resource {
4558
"models": {
4659
Type: schema.TypeList,
4760
Computed: true,
48-
Elem: &schema.Resource{
49-
Schema: map[string]*schema.Schema{
50-
// Required
51-
"artifact_content_length": {
52-
Type: schema.TypeString,
53-
Required: true,
54-
ForceNew: true,
55-
ValidateFunc: tfresource.ValidateInt64TypeString,
56-
DiffSuppressFunc: tfresource.Int64StringDiffSuppressFunction,
57-
},
58-
"model_artifact": {
59-
Type: schema.TypeString,
60-
Required: true,
61-
ForceNew: true,
62-
},
63-
"compartment_id": {
64-
Type: schema.TypeString,
65-
Required: true,
66-
},
67-
"project_id": {
68-
Type: schema.TypeString,
69-
Required: true,
70-
ForceNew: true,
71-
},
72-
"model_version_set_id": {
73-
Type: schema.TypeString,
74-
Optional: true,
75-
Computed: true,
76-
},
77-
"model_version_set_name": {
78-
Type: schema.TypeString,
79-
Optional: true,
80-
Computed: true,
81-
},
82-
"version_id": {
83-
Type: schema.TypeString,
84-
Optional: true,
85-
Computed: true,
86-
},
87-
"version_label": {
88-
Type: schema.TypeString,
89-
Optional: true,
90-
Computed: true,
91-
},
92-
93-
// Optional
94-
"custom_metadata_list": {
95-
Type: schema.TypeList,
96-
Optional: true,
97-
Computed: true,
98-
Elem: &schema.Resource{
99-
Schema: map[string]*schema.Schema{
100-
// Required
101-
102-
// Optional
103-
"category": {
104-
Type: schema.TypeString,
105-
Optional: true,
106-
Computed: true,
107-
},
108-
"description": {
109-
Type: schema.TypeString,
110-
Optional: true,
111-
Computed: true,
112-
},
113-
"key": {
114-
Type: schema.TypeString,
115-
Optional: true,
116-
Computed: true,
117-
},
118-
"value": {
119-
Type: schema.TypeString,
120-
Optional: true,
121-
Computed: true,
122-
},
123-
124-
// Computed
125-
},
126-
},
127-
},
128-
"defined_metadata_list": {
129-
Type: schema.TypeList,
130-
Optional: true,
131-
Computed: true,
132-
Elem: &schema.Resource{
133-
Schema: map[string]*schema.Schema{
134-
// Required
135-
136-
// Optional
137-
"category": {
138-
Type: schema.TypeString,
139-
Optional: true,
140-
Computed: true,
141-
},
142-
"description": {
143-
Type: schema.TypeString,
144-
Optional: true,
145-
Computed: true,
146-
},
147-
"key": {
148-
Type: schema.TypeString,
149-
Optional: true,
150-
Computed: true,
151-
},
152-
"value": {
153-
Type: schema.TypeString,
154-
Optional: true,
155-
Computed: true,
156-
},
157-
158-
// Computed
159-
},
160-
},
161-
},
162-
"artifact_content_disposition": {
163-
Type: schema.TypeString,
164-
Optional: true,
165-
Computed: true,
166-
ForceNew: true,
167-
},
168-
"defined_tags": {
169-
Type: schema.TypeMap,
170-
Optional: true,
171-
Computed: true,
172-
DiffSuppressFunc: tfresource.DefinedTagsDiffSuppressFunction,
173-
Elem: schema.TypeString,
174-
},
175-
"description": {
176-
Type: schema.TypeString,
177-
Optional: true,
178-
Computed: true,
179-
},
180-
"display_name": {
181-
Type: schema.TypeString,
182-
Optional: true,
183-
Computed: true,
184-
},
185-
"freeform_tags": {
186-
Type: schema.TypeMap,
187-
Optional: true,
188-
Computed: true,
189-
Elem: schema.TypeString,
190-
},
191-
"input_schema": {
192-
Type: schema.TypeString,
193-
Optional: true,
194-
Computed: true,
195-
ForceNew: true,
196-
},
197-
"output_schema": {
198-
Type: schema.TypeString,
199-
Optional: true,
200-
Computed: true,
201-
ForceNew: true,
202-
},
203-
204-
// Computed
205-
"artifact_content_md5": {
206-
Type: schema.TypeString,
207-
Computed: true,
208-
},
209-
"artifact_last_modified": {
210-
Type: schema.TypeString,
211-
Computed: true,
212-
},
213-
"created_by": {
214-
Type: schema.TypeString,
215-
Computed: true,
216-
},
217-
"empty_model": {
218-
Type: schema.TypeBool,
219-
Computed: true,
220-
},
221-
"time_created": {
222-
Type: schema.TypeString,
223-
Computed: true,
224-
},
225-
},
226-
},
61+
Elem: tfresource.GetDataSourceItemSchema(DatascienceModelResource()),
22762
},
22863
},
22964
}
@@ -347,10 +182,6 @@ func (s *DatascienceModelsDataSourceCrud) SetData() error {
347182
model["lifecycle_details"] = *r.LifecycleDetails
348183
}
349184

350-
if r.ModelVersionSetId != nil {
351-
model["model_version_set_id"] = *r.ModelVersionSetId
352-
}
353-
354185
if r.ProjectId != nil {
355186
model["project_id"] = *r.ProjectId
356187
}
@@ -359,6 +190,10 @@ func (s *DatascienceModelsDataSourceCrud) SetData() error {
359190
model["model_version_set_name"] = *r.ModelVersionSetName
360191
}
361192

193+
if r.ModelVersionSetId != nil {
194+
model["model_version_set_id"] = *r.ModelVersionSetId
195+
}
196+
362197
if r.VersionLabel != nil {
363198
model["version_label"] = *r.VersionLabel
364199
}

0 commit comments

Comments
 (0)