From 29f35af723e1f9f4bdf3da7a38cfde5fa81fa0ae Mon Sep 17 00:00:00 2001 From: Michael Engel Date: Fri, 22 Jul 2022 09:00:39 +0200 Subject: [PATCH] updated go-ovirt-client --- CONTRIBUTING.md | 4 +--- examples/examples_test.go | 2 +- go.mod | 2 +- go.sum | 6 ++---- internal/ovirt/data_source_affinity_group.go | 2 +- internal/ovirt/data_source_ovirt_blank_template_test.go | 2 +- internal/ovirt/data_source_ovirt_disk_attachments.go | 2 +- .../ovirt/data_source_ovirt_template_disk_attachments.go | 2 +- internal/ovirt/data_source_ovirt_wait_for_ip.go | 2 +- internal/ovirt/data_source_ovirt_wait_for_ip_test.go | 2 +- internal/ovirt/provider.go | 2 +- internal/ovirt/resource_ovirt_affinity_group.go | 2 +- internal/ovirt/resource_ovirt_disk.go | 2 +- internal/ovirt/resource_ovirt_disk_attachment.go | 2 +- internal/ovirt/resource_ovirt_disk_attachment_test.go | 2 +- internal/ovirt/resource_ovirt_disk_attachments.go | 2 +- internal/ovirt/resource_ovirt_disk_attachments_test.go | 2 +- internal/ovirt/resource_ovirt_disk_from_image.go | 2 +- internal/ovirt/resource_ovirt_disk_resize.go | 2 +- internal/ovirt/resource_ovirt_disk_resize_test.go | 2 +- internal/ovirt/resource_ovirt_disk_test.go | 2 +- internal/ovirt/resource_ovirt_nic.go | 2 +- internal/ovirt/resource_ovirt_nic_test.go | 2 +- internal/ovirt/resource_ovirt_tag.go | 2 +- internal/ovirt/resource_ovirt_template.go | 2 +- internal/ovirt/resource_ovirt_vm.go | 2 +- internal/ovirt/resource_ovirt_vm_affinity_group.go | 2 +- internal/ovirt/resource_ovirt_vm_disks_resize.go | 2 +- internal/ovirt/resource_ovirt_vm_disks_resize_test.go | 2 +- internal/ovirt/resource_ovirt_vm_graphics_consoles.go | 2 +- internal/ovirt/resource_ovirt_vm_optimize_cpu_settings.go | 2 +- internal/ovirt/resource_ovirt_vm_start.go | 2 +- internal/ovirt/resource_ovirt_vm_tag.go | 2 +- internal/ovirt/resource_ovirt_vm_tag_test.go | 2 +- internal/ovirt/resource_ovirt_vm_test.go | 2 +- internal/ovirt/util.go | 2 +- internal/ovirt/validation.go | 2 +- 37 files changed, 38 insertions(+), 42 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2f8e3c0d..acc4948e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,11 +29,9 @@ You may run into a situation where you don't have the necessary API calls you ne Once your change to go-ovirt-client has been merged, you can start developing against it in this Terraform provider by running: ``` -go get github.com/ovirt/go-ovirt-client@main +go get github.com/ovirt/go-ovirt-client/v2@ ``` -Remember, once this provider hits 1.0, your change will need to be released in order for your PR to be merged. Having it in the main branch will not be enough. - ## Creating a resource **👉 Tip:** Even if you don't want to create a new resource, this section is worth reading through. diff --git a/examples/examples_test.go b/examples/examples_test.go index 01d8c6cc..15aa8669 100644 --- a/examples/examples_test.go +++ b/examples/examples_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - ovirtclient "github.com/ovirt/go-ovirt-client" ovirtclientlog "github.com/ovirt/go-ovirt-client-log/v3" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func TestExamples(t *testing.T) { diff --git a/go.mod b/go.mod index a3ba9f9a..391eb1dc 100644 --- a/go.mod +++ b/go.mod @@ -12,8 +12,8 @@ require ( github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/oklog/run v1.1.0 // indirect - github.com/ovirt/go-ovirt-client v1.0.2-0.20220721105958-a2e1928c6565 github.com/ovirt/go-ovirt-client-log/v3 v3.0.0 + github.com/ovirt/go-ovirt-client/v2 v2.0.0-alpha02 github.com/vmihailenco/tagparser v0.1.2 // indirect golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index 86189ca4..f358d6d7 100644 --- a/go.sum +++ b/go.sum @@ -227,12 +227,10 @@ github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/ovirt/go-ovirt v0.0.0-20220427092237-114c47f2835c h1:jXRFpl7+W0YZj/fghoYuE4vJWW/KeQGvdrhnRwRGtAY= github.com/ovirt/go-ovirt v0.0.0-20220427092237-114c47f2835c/go.mod h1:Zkdj9/rW6eyuw0uOeEns6O3pP5G2ak+bI/tgkQ/tEZI= -github.com/ovirt/go-ovirt-client v1.0.1 h1:V8e0C2TrMEW85X70qZ8RTexESun8QpSFYg8H4vj6xks= -github.com/ovirt/go-ovirt-client v1.0.1/go.mod h1:tv8E2pxUkggayDAgMLuQHzcNtzt8RFvnhO5V5b/5X4U= -github.com/ovirt/go-ovirt-client v1.0.2-0.20220721105958-a2e1928c6565 h1:NQqUginRZxgrqIeBzbTs8dhaajFhkXeyDREDjctDrs0= -github.com/ovirt/go-ovirt-client v1.0.2-0.20220721105958-a2e1928c6565/go.mod h1:tv8E2pxUkggayDAgMLuQHzcNtzt8RFvnhO5V5b/5X4U= github.com/ovirt/go-ovirt-client-log/v3 v3.0.0 h1:uvACVHYhYPMkNJrrgWiABcfELB6qoFfsDDUTbpb4Jv4= github.com/ovirt/go-ovirt-client-log/v3 v3.0.0/go.mod h1:chKKxCv4lRjxezrTG+EIhkWXGhDAWByglPVXh/iYdnQ= +github.com/ovirt/go-ovirt-client/v2 v2.0.0-alpha02 h1:OYa0nbgahE0TfI30FHEa5ZXktP9biyIWoD50Nb60JiQ= +github.com/ovirt/go-ovirt-client/v2 v2.0.0-alpha02/go.mod h1:Zi2RF2khEr+hcr3fCAf6WL7OEoUwUHeWWiob/WcEaDc= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/internal/ovirt/data_source_affinity_group.go b/internal/ovirt/data_source_affinity_group.go index 90d1d88c..0cd8bfeb 100644 --- a/internal/ovirt/data_source_affinity_group.go +++ b/internal/ovirt/data_source_affinity_group.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func (p *provider) affinityGroupDataSource() *schema.Resource { diff --git a/internal/ovirt/data_source_ovirt_blank_template_test.go b/internal/ovirt/data_source_ovirt_blank_template_test.go index e470cb42..b562b5ac 100644 --- a/internal/ovirt/data_source_ovirt_blank_template_test.go +++ b/internal/ovirt/data_source_ovirt_blank_template_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func TestBlankTemplateID(t *testing.T) { diff --git a/internal/ovirt/data_source_ovirt_disk_attachments.go b/internal/ovirt/data_source_ovirt_disk_attachments.go index db3b3754..644df243 100644 --- a/internal/ovirt/data_source_ovirt_disk_attachments.go +++ b/internal/ovirt/data_source_ovirt_disk_attachments.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func (p *provider) diskAttachmentsDataSource() *schema.Resource { diff --git a/internal/ovirt/data_source_ovirt_template_disk_attachments.go b/internal/ovirt/data_source_ovirt_template_disk_attachments.go index acfaa914..64ae8345 100644 --- a/internal/ovirt/data_source_ovirt_template_disk_attachments.go +++ b/internal/ovirt/data_source_ovirt_template_disk_attachments.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func (p *provider) templateDiskAttachmentsDataSource() *schema.Resource { diff --git a/internal/ovirt/data_source_ovirt_wait_for_ip.go b/internal/ovirt/data_source_ovirt_wait_for_ip.go index c016f982..3b0b365b 100644 --- a/internal/ovirt/data_source_ovirt_wait_for_ip.go +++ b/internal/ovirt/data_source_ovirt_wait_for_ip.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func (p *provider) waitForIPDataSource() *schema.Resource { diff --git a/internal/ovirt/data_source_ovirt_wait_for_ip_test.go b/internal/ovirt/data_source_ovirt_wait_for_ip_test.go index cdfa7803..a940d269 100644 --- a/internal/ovirt/data_source_ovirt_wait_for_ip_test.go +++ b/internal/ovirt/data_source_ovirt_wait_for_ip_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func TestOvirtWaitForIP(t *testing.T) { diff --git a/internal/ovirt/provider.go b/internal/ovirt/provider.go index d09fe156..cd7ff01b 100644 --- a/internal/ovirt/provider.go +++ b/internal/ovirt/provider.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" ovirtclientlog "github.com/ovirt/go-ovirt-client-log/v3" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func init() { diff --git a/internal/ovirt/resource_ovirt_affinity_group.go b/internal/ovirt/resource_ovirt_affinity_group.go index d120ff34..3558b8d6 100644 --- a/internal/ovirt/resource_ovirt_affinity_group.go +++ b/internal/ovirt/resource_ovirt_affinity_group.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) const affinityNegative = "negative" diff --git a/internal/ovirt/resource_ovirt_disk.go b/internal/ovirt/resource_ovirt_disk.go index 5cd69523..3d23d7e9 100644 --- a/internal/ovirt/resource_ovirt_disk.go +++ b/internal/ovirt/resource_ovirt_disk.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var diskBaseSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_disk_attachment.go b/internal/ovirt/resource_ovirt_disk_attachment.go index c1f99426..05643329 100644 --- a/internal/ovirt/resource_ovirt_disk_attachment.go +++ b/internal/ovirt/resource_ovirt_disk_attachment.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var diskAttachmentSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_disk_attachment_test.go b/internal/ovirt/resource_ovirt_disk_attachment_test.go index fce05adc..46dbebb7 100644 --- a/internal/ovirt/resource_ovirt_disk_attachment_test.go +++ b/internal/ovirt/resource_ovirt_disk_attachment_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func TestDiskAttachmentResource(t *testing.T) { diff --git a/internal/ovirt/resource_ovirt_disk_attachments.go b/internal/ovirt/resource_ovirt_disk_attachments.go index d3bb27b9..8c42df43 100644 --- a/internal/ovirt/resource_ovirt_disk_attachments.go +++ b/internal/ovirt/resource_ovirt_disk_attachments.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var diskAttachmentsSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_disk_attachments_test.go b/internal/ovirt/resource_ovirt_disk_attachments_test.go index 2369b971..3f434cc2 100644 --- a/internal/ovirt/resource_ovirt_disk_attachments_test.go +++ b/internal/ovirt/resource_ovirt_disk_attachments_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func TestDiskAttachmentsResource(t *testing.T) { diff --git a/internal/ovirt/resource_ovirt_disk_from_image.go b/internal/ovirt/resource_ovirt_disk_from_image.go index cad7d52d..0fe3a006 100644 --- a/internal/ovirt/resource_ovirt_disk_from_image.go +++ b/internal/ovirt/resource_ovirt_disk_from_image.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var diskFromImageSchema = schemaMerge( diff --git a/internal/ovirt/resource_ovirt_disk_resize.go b/internal/ovirt/resource_ovirt_disk_resize.go index 5c4537fc..95953b22 100644 --- a/internal/ovirt/resource_ovirt_disk_resize.go +++ b/internal/ovirt/resource_ovirt_disk_resize.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var diskResizeSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_disk_resize_test.go b/internal/ovirt/resource_ovirt_disk_resize_test.go index bbd241e2..2de1a661 100644 --- a/internal/ovirt/resource_ovirt_disk_resize_test.go +++ b/internal/ovirt/resource_ovirt_disk_resize_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func TestDiskResizeResource(t *testing.T) { diff --git a/internal/ovirt/resource_ovirt_disk_test.go b/internal/ovirt/resource_ovirt_disk_test.go index 4f6a5de2..896c52ad 100644 --- a/internal/ovirt/resource_ovirt_disk_test.go +++ b/internal/ovirt/resource_ovirt_disk_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func TestDiskResource(t *testing.T) { diff --git a/internal/ovirt/resource_ovirt_nic.go b/internal/ovirt/resource_ovirt_nic.go index dd0aa111..54646335 100644 --- a/internal/ovirt/resource_ovirt_nic.go +++ b/internal/ovirt/resource_ovirt_nic.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var nicSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_nic_test.go b/internal/ovirt/resource_ovirt_nic_test.go index f099e43c..937d2fa6 100644 --- a/internal/ovirt/resource_ovirt_nic_test.go +++ b/internal/ovirt/resource_ovirt_nic_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func TestNICResource(t *testing.T) { diff --git a/internal/ovirt/resource_ovirt_tag.go b/internal/ovirt/resource_ovirt_tag.go index 89293815..3a4439ca 100644 --- a/internal/ovirt/resource_ovirt_tag.go +++ b/internal/ovirt/resource_ovirt_tag.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var tagSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_template.go b/internal/ovirt/resource_ovirt_template.go index 767bdc76..ce578273 100644 --- a/internal/ovirt/resource_ovirt_template.go +++ b/internal/ovirt/resource_ovirt_template.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var templateSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_vm.go b/internal/ovirt/resource_ovirt_vm.go index 2f2e2598..36c676ad 100644 --- a/internal/ovirt/resource_ovirt_vm.go +++ b/internal/ovirt/resource_ovirt_vm.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var vmSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_vm_affinity_group.go b/internal/ovirt/resource_ovirt_vm_affinity_group.go index 5bc6e07a..675c2d19 100644 --- a/internal/ovirt/resource_ovirt_vm_affinity_group.go +++ b/internal/ovirt/resource_ovirt_vm_affinity_group.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var vmAffinityGroupSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_vm_disks_resize.go b/internal/ovirt/resource_ovirt_vm_disks_resize.go index 1fd2a01a..07e6b418 100644 --- a/internal/ovirt/resource_ovirt_vm_disks_resize.go +++ b/internal/ovirt/resource_ovirt_vm_disks_resize.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var vmDisksResizeSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_vm_disks_resize_test.go b/internal/ovirt/resource_ovirt_vm_disks_resize_test.go index 581c75f0..2807f12e 100644 --- a/internal/ovirt/resource_ovirt_vm_disks_resize_test.go +++ b/internal/ovirt/resource_ovirt_vm_disks_resize_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func TestVMDisksResize(t *testing.T) { diff --git a/internal/ovirt/resource_ovirt_vm_graphics_consoles.go b/internal/ovirt/resource_ovirt_vm_graphics_consoles.go index defd4a82..ce0831ff 100644 --- a/internal/ovirt/resource_ovirt_vm_graphics_consoles.go +++ b/internal/ovirt/resource_ovirt_vm_graphics_consoles.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var vmGraphicsConsoleSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_vm_optimize_cpu_settings.go b/internal/ovirt/resource_ovirt_vm_optimize_cpu_settings.go index af9f8362..514fb988 100644 --- a/internal/ovirt/resource_ovirt_vm_optimize_cpu_settings.go +++ b/internal/ovirt/resource_ovirt_vm_optimize_cpu_settings.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var vmOptimizeCPUSettingsSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_vm_start.go b/internal/ovirt/resource_ovirt_vm_start.go index 9adb9d17..cd47c48a 100644 --- a/internal/ovirt/resource_ovirt_vm_start.go +++ b/internal/ovirt/resource_ovirt_vm_start.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/go-cty/cty" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) // VMStopBehavior describes the possible methods by which a VM can be stopped. diff --git a/internal/ovirt/resource_ovirt_vm_tag.go b/internal/ovirt/resource_ovirt_vm_tag.go index 55f60657..328a4dc9 100644 --- a/internal/ovirt/resource_ovirt_vm_tag.go +++ b/internal/ovirt/resource_ovirt_vm_tag.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) var vmTagSchema = map[string]*schema.Schema{ diff --git a/internal/ovirt/resource_ovirt_vm_tag_test.go b/internal/ovirt/resource_ovirt_vm_tag_test.go index be732f79..bee46199 100644 --- a/internal/ovirt/resource_ovirt_vm_tag_test.go +++ b/internal/ovirt/resource_ovirt_vm_tag_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func TestTagAttachmentResource(t *testing.T) { diff --git a/internal/ovirt/resource_ovirt_vm_test.go b/internal/ovirt/resource_ovirt_vm_test.go index 61cd3ebe..258ec7e8 100644 --- a/internal/ovirt/resource_ovirt_vm_test.go +++ b/internal/ovirt/resource_ovirt_vm_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - ovirtclient "github.com/ovirt/go-ovirt-client" ovirtclientlog "github.com/ovirt/go-ovirt-client-log/v3" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func TestVMResource(t *testing.T) { diff --git a/internal/ovirt/util.go b/internal/ovirt/util.go index 01fdc1c0..93074123 100644 --- a/internal/ovirt/util.go +++ b/internal/ovirt/util.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func schemaMerge(schema1, schema2 map[string]*schema.Schema) map[string]*schema.Schema { diff --git a/internal/ovirt/validation.go b/internal/ovirt/validation.go index 2fd0dc98..d8520e6f 100644 --- a/internal/ovirt/validation.go +++ b/internal/ovirt/validation.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/go-version" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - ovirtclient "github.com/ovirt/go-ovirt-client" + ovirtclient "github.com/ovirt/go-ovirt-client/v2" ) func validateDiskSize(i interface{}, path cty.Path) diag.Diagnostics {