Skip to content

Commit 7d0bca0

Browse files
Terraform Team AutomationNagendraNigade
authored andcommitted
Bug Fix - Enabling resource discovery for core - Compute Imaging CP resources
1 parent f83d66b commit 7d0bca0

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

internal/integrationtest/core_compute_global_image_capability_schema_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616

1717
var (
1818
CoreCoreComputeGlobalImageCapabilitySchemaSingularDataSourceRepresentation = map[string]interface{}{
19+
1920
"compute_global_image_capability_schema_id": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_core_compute_global_image_capability_schemas.test_compute_global_image_capability_schemas.compute_global_image_capability_schemas.0.id}`},
2021
}
2122

@@ -26,7 +27,9 @@ var (
2627

2728
// issue-routing-tag: core/computeImaging
2829
func TestCoreComputeGlobalImageCapabilitySchemaResource_basic(t *testing.T) {
30+
2931
httpreplay.SetScenario("TestCoreComputeGlobalImageCapabilitySchemaResource_basic")
32+
3033
defer httpreplay.SaveScenario()
3134

3235
config := acctest.ProviderTestConfig()

internal/integrationtest/core_compute_global_image_capability_schemas_version_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ import (
1616

1717
var (
1818
CoreCoreComputeGlobalImageCapabilitySchemasVersionSingularDataSourceRepresentation = map[string]interface{}{
19+
1920
"compute_global_image_capability_schema_id": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_core_compute_global_image_capability_schemas.test_compute_global_image_capability_schemas.compute_global_image_capability_schemas.0.id}`},
2021
"compute_global_image_capability_schema_version_name": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_core_compute_global_image_capability_schemas_versions.test_compute_global_image_capability_schemas_versions.compute_global_image_capability_schema_versions.0.name}`},
2122
}
2223

2324
CoreCoreComputeGlobalImageCapabilitySchemasVersionDataSourceRepresentation = map[string]interface{}{
25+
2426
"compute_global_image_capability_schema_id": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_core_compute_global_image_capability_schemas.test_compute_global_image_capability_schemas.compute_global_image_capability_schemas.0.id}`},
2527
"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`},
2628
}

internal/integrationtest/core_compute_image_capability_schema_test.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,16 @@ var (
3232

3333
CoreCoreComputeImageCapabilitySchemaSingularDataSourceRepresentation = map[string]interface{}{
3434
"compute_image_capability_schema_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_core_compute_image_capability_schema.test_compute_image_capability_schema.id}`},
35-
"is_merge_enabled": acctest.Representation{RepType: acctest.Required, Create: `false`},
35+
36+
"is_merge_enabled": acctest.Representation{RepType: acctest.Required, Create: `false`},
3637
}
3738

3839
CoreCoreComputeImageCapabilitySchemaDataSourceRepresentation = map[string]interface{}{
3940
"compartment_id": acctest.Representation{RepType: acctest.Optional, Create: `${var.compartment_id}`},
40-
"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
41-
"image_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_compute_image_capability_schema.test_compute_image_capability_schema.image_id}`},
42-
"filter": acctest.RepresentationGroup{RepType: acctest.Required, Group: CoreComputeImageCapabilitySchemaDataSourceFilterRepresentation}}
41+
42+
"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
43+
"image_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_compute_image_capability_schema.test_compute_image_capability_schema.image_id}`},
44+
"filter": acctest.RepresentationGroup{RepType: acctest.Required, Group: CoreComputeImageCapabilitySchemaDataSourceFilterRepresentation}}
4345
CoreComputeImageCapabilitySchemaDataSourceFilterRepresentation = map[string]interface{}{
4446
"name": acctest.Representation{RepType: acctest.Required, Create: `id`},
4547
"values": acctest.Representation{RepType: acctest.Required, Create: []string{`${oci_core_compute_image_capability_schema.test_compute_image_capability_schema.id}`}},
@@ -92,6 +94,7 @@ resource "oci_core_image" "custom_image" {
9294

9395
// issue-routing-tag: core/computeImaging
9496
func TestCoreComputeImageCapabilitySchemaResource_basic(t *testing.T) {
97+
9598
t.Skip("Skip test for Windows image")
9699
httpreplay.SetScenario("TestCoreComputeImageCapabilitySchemaResource_basic")
97100
defer httpreplay.SaveScenario()

internal/service/core/core_compute_image_capability_schemas_data_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func (s *CoreComputeImageCapabilitySchemasDataSourceCrud) SetData() error {
135135
computeImageCapabilitySchema["image_id"] = *r.ImageId
136136
}
137137

138-
computeImageCapabilitySchema["schema_data"] = r.SchemaData
138+
computeImageCapabilitySchema["schema_data"] = schemaDataToMap(r.SchemaData)
139139

140140
if r.TimeCreated != nil {
141141
computeImageCapabilitySchema["time_created"] = r.TimeCreated.String()

0 commit comments

Comments
 (0)