Skip to content

Commit 9bf187b

Browse files
committed
updating test dependency
1 parent f97c216 commit 9bf187b

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

oci/file_storage_file_system_resource_test.go

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,17 @@ import (
1515
)
1616

1717
var (
18+
fileSystemDataSourceRepresentationKMSKey = map[string]interface{}{
19+
"availability_domain": Representation{repType: Required, create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
20+
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
21+
"display_name": Representation{repType: Optional, create: `media-files-1`, update: `displayName2`},
22+
"id": Representation{repType: Optional, create: `${oci_file_storage_file_system.test_file_system.id}`},
23+
"state": Representation{repType: Optional, create: `ACTIVE`},
24+
"filter": RepresentationGroup{Required, fileSystemDataSourceFilterRepresentationKMSKey}}
25+
fileSystemDataSourceFilterRepresentationKMSKey = map[string]interface{}{
26+
"name": Representation{repType: Required, create: `id`},
27+
"values": Representation{repType: Required, create: []string{`${oci_file_storage_file_system.test_file_system.id}`}},
28+
}
1829
fileSystemRepresentationKMSKey = map[string]interface{}{
1930
"availability_domain": Representation{repType: Required, create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
2031
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
@@ -77,7 +88,8 @@ func TestFileStorageFileSystemResource_removeKMSKey(t *testing.T) {
7788
Steps: []resource.TestStep{
7889
// verify create with optionals
7990
{
80-
Config: config + compartmentIdVariableStr + FileSystemResourceDependencies +
91+
Config: config + compartmentIdVariableStr + AvailabilityDomainConfig + DefinedTagsDependencies +
92+
KeyResourceDependencyConfig + kmsKeyIdCreateVariableStr + kmsKeyIdUpdateVariableStr +
8193
generateResourceFromRepresentationMap("oci_file_storage_file_system", "test_file_system", Optional, Create, fileSystemRepresentationKMSKey),
8294
Check: resource.ComposeAggregateTestCheckFunc(
8395
resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
@@ -99,7 +111,8 @@ func TestFileStorageFileSystemResource_removeKMSKey(t *testing.T) {
99111
},
100112
// verify updates to updatable parameters
101113
{
102-
Config: config + compartmentIdVariableStr + FileSystemResourceDependencies +
114+
Config: config + compartmentIdVariableStr + AvailabilityDomainConfig + DefinedTagsDependencies +
115+
KeyResourceDependencyConfig + kmsKeyIdCreateVariableStr + kmsKeyIdUpdateVariableStr +
103116
generateResourceFromRepresentationMap("oci_file_storage_file_system", "test_file_system", Optional, Update, fileSystemRepresentationKMSKey),
104117
Check: resource.ComposeAggregateTestCheckFunc(
105118
resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
@@ -125,8 +138,9 @@ func TestFileStorageFileSystemResource_removeKMSKey(t *testing.T) {
125138
// verify datasource
126139
{
127140
Config: config +
128-
generateDataSourceFromRepresentationMap("oci_file_storage_file_systems", "test_file_systems", Optional, Update, fileSystemDataSourceRepresentation) +
129-
compartmentIdVariableStr + FileSystemResourceDependencies +
141+
generateDataSourceFromRepresentationMap("oci_file_storage_file_systems", "test_file_systems", Optional, Update, fileSystemDataSourceRepresentationKMSKey) +
142+
compartmentIdVariableStr + AvailabilityDomainConfig + DefinedTagsDependencies +
143+
KeyResourceDependencyConfig + kmsKeyIdCreateVariableStr + kmsKeyIdUpdateVariableStr +
130144
generateResourceFromRepresentationMap("oci_file_storage_file_system", "test_file_system", Optional, Update, fileSystemRepresentationKMSKey),
131145
Check: resource.ComposeAggregateTestCheckFunc(
132146
resource.TestCheckResourceAttrSet(datasourceName, "availability_domain"),

oci/file_storage_file_system_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var (
5050
generateResourceFromRepresentationMap("oci_file_storage_snapshot", "test_snapshot", Required, Create, snapshotRepresentation) +
5151
AvailabilityDomainConfig +
5252
DefinedTagsDependencies +
53-
KeyResourceDependencyConfig
53+
KeyResourceDependencyConfig + kmsKeyIdCreateVariableStr + kmsKeyIdUpdateVariableStr
5454
)
5555

5656
func TestFileStorageFileSystemResource_basic(t *testing.T) {

0 commit comments

Comments
 (0)