Skip to content

Commit 18ab42e

Browse files
committed
ConflictsWith generated
1 parent cf740ec commit 18ab42e

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

oci/containerengine_node_pool_resource.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ func ContainerengineNodePoolResource() *schema.Resource {
8181
Type: schema.TypeList,
8282
Optional: true,
8383
Computed: true,
84-
ConflictsWith: []string{"quantity_per_subnet", "subnet_ids"},
8584
MaxItems: 1,
8685
MinItems: 1,
86+
ConflictsWith: []string{"quantity_per_subnet", "subnet_ids"},
8787
Elem: &schema.Resource{
8888
Schema: map[string]*schema.Schema{
8989
// Required
@@ -123,15 +123,15 @@ func ContainerengineNodePoolResource() *schema.Resource {
123123
"node_image_id": {
124124
Type: schema.TypeString,
125125
Optional: true,
126-
ForceNew: true,
127126
Computed: true,
127+
ForceNew: true,
128128
ConflictsWith: []string{"node_image_name"},
129129
},
130130
"node_image_name": {
131131
Type: schema.TypeString,
132132
Optional: true,
133-
ForceNew: true,
134133
Computed: true,
134+
ForceNew: true,
135135
ConflictsWith: []string{"node_image_id"},
136136
},
137137
"node_metadata": {

oci/core_virtual_circuit_resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ func CoreVirtualCircuitResource() *schema.Resource {
106106
Type: schema.TypeInt,
107107
Optional: true,
108108
Computed: true,
109-
Deprecated: FieldDeprecatedForAnother("customer_bgp_asn", "customer_asn"),
110109
ConflictsWith: []string{"customer_asn"},
110+
Deprecated: FieldDeprecatedForAnother("customer_bgp_asn", "customer_asn"),
111111
},
112112
"defined_tags": {
113113
Type: schema.TypeMap,

oci/core_volume_backup_resource.go

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,18 @@ func CoreVolumeBackupResource() *schema.Resource {
2626
Schema: map[string]*schema.Schema{
2727
// Optional
2828
"volume_id": {
29-
Type: schema.TypeString,
30-
Optional: true,
31-
ForceNew: true,
32-
Computed: true,
33-
ConflictsWith: []string{"source_details"},
29+
Type: schema.TypeString,
30+
Optional: true,
31+
ForceNew: true,
32+
Computed: true,
3433
},
3534
"source_details": {
3635
Type: schema.TypeList,
3736
Optional: true,
3837
ForceNew: true,
3938
MaxItems: 1,
4039
MinItems: 1,
41-
ConflictsWith: []string{"volume_id"},
40+
ConflictsWith: []string{"volume_id", "defined_tags", "freeform_tags", "type"},
4241
Elem: &schema.Resource{
4342
Schema: map[string]*schema.Schema{
4443
// Required
@@ -75,26 +74,23 @@ func CoreVolumeBackupResource() *schema.Resource {
7574
Computed: true,
7675
DiffSuppressFunc: definedTagsDiffSuppressFunction,
7776
Elem: schema.TypeString,
78-
ConflictsWith: []string{"source_details"},
7977
},
8078
"display_name": {
8179
Type: schema.TypeString,
8280
Optional: true,
8381
Computed: true,
8482
},
8583
"freeform_tags": {
86-
Type: schema.TypeMap,
87-
Optional: true,
88-
Computed: true,
89-
Elem: schema.TypeString,
90-
ConflictsWith: []string{"source_details"},
84+
Type: schema.TypeMap,
85+
Optional: true,
86+
Computed: true,
87+
Elem: schema.TypeString,
9188
},
9289
"type": {
93-
Type: schema.TypeString,
94-
Optional: true,
95-
Computed: true,
96-
ForceNew: true,
97-
ConflictsWith: []string{"source_details"},
90+
Type: schema.TypeString,
91+
Optional: true,
92+
Computed: true,
93+
ForceNew: true,
9894
},
9995

10096
// Computed

0 commit comments

Comments
 (0)