diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_instance.go.tmpl index e8450a008c36..89c96288b638 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance.go.tmpl @@ -345,7 +345,6 @@ func ResourceComputeInstance() *schema.Resource { Computed: true, ForceNew: true, DiffSuppressFunc: DiskImageDiffSuppress, - ConflictsWith: []string{"boot_disk.0.initialize_params.0.snapshot", "boot_disk.0.initialize_params.0.source_snapshot_encryption_key"}, Description: `The image from which this disk was initialised.`, }, @@ -354,7 +353,6 @@ func ResourceComputeInstance() *schema.Resource { Optional: true, AtLeastOneOf: initializeParamsKeys, MaxItems: 1, - ConflictsWith: []string{"boot_disk.0.initialize_params.0.snapshot", "boot_disk.0.initialize_params.0.source_snapshot_encryption_key"}, Description: `The encryption key used to decrypt the source image.`, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -409,7 +407,6 @@ func ResourceComputeInstance() *schema.Resource { Computed: true, ForceNew: true, DiffSuppressFunc: tpgresource.CompareSelfLinkOrResourceName, - ConflictsWith: []string{"boot_disk.0.initialize_params.0.image", "boot_disk.0.initialize_params.0.source_image_encryption_key"}, Description: `The snapshot from which this disk was initialised.`, }, @@ -418,7 +415,6 @@ func ResourceComputeInstance() *schema.Resource { Optional: true, AtLeastOneOf: initializeParamsKeys, MaxItems: 1, - ConflictsWith: []string{"boot_disk.0.initialize_params.0.image", "boot_disk.0.initialize_params.0.source_image_encryption_key"}, Description: `The encryption key used to decrypt the source snapshot.`, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{