From 182024e8bd6d597b6cd49c61eaf8251d1bc5b5f7 Mon Sep 17 00:00:00 2001 From: Johannes Reppin Date: Wed, 6 Mar 2024 14:39:27 +0100 Subject: [PATCH 1/4] rename provider from ddelnano to vatesfr --- .github/workflows/release.yml | 4 ++-- Makefile | 2 +- docs/resources/vm.md | 2 +- go.mod | 13 +++++-------- main.go | 2 +- xoa/acc_setup_test.go | 2 +- xoa/data_source_cloud_config.go | 2 +- xoa/data_source_cloud_config_test.go | 2 +- xoa/data_source_host.go | 2 +- xoa/data_source_hosts.go | 2 +- xoa/data_source_hosts_test.go | 2 +- xoa/data_source_pool.go | 2 +- xoa/data_source_resource_set.go | 2 +- xoa/data_source_resource_set_test.go | 2 +- xoa/data_source_user.go | 2 +- xoa/data_source_vms.go | 4 ++-- xoa/data_source_xenorchestra_network.go | 2 +- xoa/data_source_xenorchestra_network_test.go | 2 +- xoa/data_source_xenorchestra_pif.go | 2 +- xoa/data_source_xenorchestra_sr.go | 2 +- xoa/data_source_xenorchestra_template.go | 2 +- xoa/data_source_xenorchestra_vdi.go | 2 +- xoa/internal/mocks.go | 2 +- xoa/internal/state/migrate.go | 4 ++-- xoa/provider.go | 2 +- xoa/provider_test.go | 2 +- xoa/resource_user_test.go | 2 +- xoa/resource_xenorchestra_acl.go | 2 +- xoa/resource_xenorchestra_acl_test.go | 2 +- xoa/resource_xenorchestra_bonded_network.go | 2 +- xoa/resource_xenorchestra_cloud_config.go | 2 +- xoa/resource_xenorchestra_cloud_config_test.go | 2 +- xoa/resource_xenorchestra_network.go | 2 +- xoa/resource_xenorchestra_resource_set.go | 2 +- xoa/resource_xenorchestra_resource_set_test.go | 4 ++-- xoa/resource_xenorchestra_vdi.go | 2 +- xoa/resource_xenorchestra_vdi_test.go | 2 +- xoa/resource_xenorchestra_vm.go | 8 ++++---- xoa/resource_xenorchestra_vm_test.go | 4 ++-- 39 files changed, 51 insertions(+), 54 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4468f42e..a915fbd4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,12 +1,12 @@ # This GitHub action can publish assets for release when a tag is created. # Currently its setup to run on any tag that matches the pattern "v*" (ie. v0.1.0). # -# This uses an action (paultyng/ghaction-import-gpg) that assumes you set your +# This uses an action (paultyng/ghaction-import-gpg) that assumes you set your # private key in the `GPG_PRIVATE_KEY` secret and passphrase in the `PASSPHRASE` # secret. If you would rather own your own GPG handling, please fork this action # or use an alternative one for key handling. # -# You will need to pass the `--batch` flag to `gpg` in your signing step +# You will need to pass the `--batch` flag to `gpg` in your signing step # in `goreleaser` to indicate this is being used in a non-interactive mode. # name: release diff --git a/Makefile b/Makefile index bda2b7aa..df33e51f 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ GOMAXPROCS ?= 5 TF_VERSION ?= v0.14.11 ROOT_PKG_PATH := github.com/ddelnano/terraform-provider-xenorchestra ifdef TEST - TEST := github.com/ddelnano/terraform-provider-xenorchestra/xoa -run '$(TEST)' + TEST := github.com/vatesfr/terraform-provider-xenorchestra/xoa -run '$(TEST)' else TEST := ./... endif diff --git a/docs/resources/vm.md b/docs/resources/vm.md index e979d350..7972c313 100644 --- a/docs/resources/vm.md +++ b/docs/resources/vm.md @@ -129,7 +129,7 @@ $ xo-cli xo.getAllObjects filter='json:{"id": "cf7b5d7d-3cd5-6b7c-5025-5c935c8cd "max": 4, "number": 2 } - + # Updating the VM to use 3 CPUs would happen without stopping/starting the VM # Updating the VM to use 5 CPUs would stop/start the VM ``` diff --git a/go.mod b/go.mod index 99e2676f..61c87174 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,14 @@ -module github.com/ddelnano/terraform-provider-xenorchestra +module github.com/vatesfr/terraform-provider-xenorchestra go 1.21 require ( - github.com/ddelnano/terraform-provider-xenorchestra/client v0.0.0-00010101000000-000000000000 + github.com/cenkalti/backoff/v3 v3.2.2 + github.com/gorilla/websocket v1.4.2 github.com/hashicorp/terraform-plugin-docs v0.18.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 + github.com/mitchellh/mapstructure v1.5.0 + github.com/sourcegraph/jsonrpc2 v0.0.0-20210201082850-366fbb520750 ) require ( @@ -18,13 +21,11 @@ require ( github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/armon/go-radix v1.0.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect - github.com/cenkalti/backoff/v3 v3.2.2 // indirect github.com/cloudflare/circl v1.3.7 // indirect github.com/fatih/color v1.16.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/uuid v1.4.0 // indirect - github.com/gorilla/websocket v1.4.2 // indirect github.com/hashicorp/cli v1.1.6 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-checkpoint v0.5.0 // indirect @@ -53,13 +54,11 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect - github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/oklog/run v1.1.0 // indirect github.com/posener/complete v1.2.3 // indirect github.com/russross/blackfriday v1.6.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect - github.com/sourcegraph/jsonrpc2 v0.0.0-20210201082850-366fbb520750 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect @@ -79,5 +78,3 @@ require ( google.golang.org/protobuf v1.32.0 // indirect gopkg.in/yaml.v2 v2.3.0 // indirect ) - -replace github.com/ddelnano/terraform-provider-xenorchestra/client => ./client diff --git a/main.go b/main.go index 64055094..1d1584ac 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "flag" "log" - "github.com/ddelnano/terraform-provider-xenorchestra/xoa" + "github.com/vatesfr/terraform-provider-xenorchestra/xoa" "github.com/hashicorp/terraform-plugin-sdk/v2/plugin" ) diff --git a/xoa/acc_setup_test.go b/xoa/acc_setup_test.go index 19a58c01..828f2a2a 100644 --- a/xoa/acc_setup_test.go +++ b/xoa/acc_setup_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/xoa/data_source_cloud_config.go b/xoa/data_source_cloud_config.go index 5f782a9b..4d0dc48d 100644 --- a/xoa/data_source_cloud_config.go +++ b/xoa/data_source_cloud_config.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/data_source_cloud_config_test.go b/xoa/data_source_cloud_config_test.go index 85c79039..7d24f26c 100644 --- a/xoa/data_source_cloud_config_test.go +++ b/xoa/data_source_cloud_config_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/xoa/data_source_host.go b/xoa/data_source_host.go index 185b7710..c8026f5c 100644 --- a/xoa/data_source_host.go +++ b/xoa/data_source_host.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/data_source_hosts.go b/xoa/data_source_hosts.go index ac992802..e6a56f9e 100644 --- a/xoa/data_source_hosts.go +++ b/xoa/data_source_hosts.go @@ -3,7 +3,7 @@ package xoa import ( "log" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/data_source_hosts_test.go b/xoa/data_source_hosts_test.go index 244c32aa..f2b9c2fa 100644 --- a/xoa/data_source_hosts_test.go +++ b/xoa/data_source_hosts_test.go @@ -6,7 +6,7 @@ import ( "regexp" "testing" - "github.com/ddelnano/terraform-provider-xenorchestra/xoa/internal" + "github.com/vatesfr/terraform-provider-xenorchestra/xoa/internal" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/xoa/data_source_pool.go b/xoa/data_source_pool.go index 3ab3166d..459390d4 100644 --- a/xoa/data_source_pool.go +++ b/xoa/data_source_pool.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/data_source_resource_set.go b/xoa/data_source_resource_set.go index 98e7a367..24f7f729 100644 --- a/xoa/data_source_resource_set.go +++ b/xoa/data_source_resource_set.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/data_source_resource_set_test.go b/xoa/data_source_resource_set_test.go index 0b6b724b..4339aa43 100644 --- a/xoa/data_source_resource_set_test.go +++ b/xoa/data_source_resource_set_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/xoa/data_source_user.go b/xoa/data_source_user.go index 948ffbb2..6ce1a0aa 100644 --- a/xoa/data_source_user.go +++ b/xoa/data_source_user.go @@ -3,7 +3,7 @@ package xoa import ( "log" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/data_source_vms.go b/xoa/data_source_vms.go index f5c68049..5138275e 100644 --- a/xoa/data_source_vms.go +++ b/xoa/data_source_vms.go @@ -4,8 +4,8 @@ import ( "log" "strings" - "github.com/ddelnano/terraform-provider-xenorchestra/client" - "github.com/ddelnano/terraform-provider-xenorchestra/xoa/internal" + "github.com/vatesfr/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/xoa/internal" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/data_source_xenorchestra_network.go b/xoa/data_source_xenorchestra_network.go index 45814291..14b78d59 100644 --- a/xoa/data_source_xenorchestra_network.go +++ b/xoa/data_source_xenorchestra_network.go @@ -1,7 +1,7 @@ package xoa import ( - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/data_source_xenorchestra_network_test.go b/xoa/data_source_xenorchestra_network_test.go index b61b09ca..1eef32de 100644 --- a/xoa/data_source_xenorchestra_network_test.go +++ b/xoa/data_source_xenorchestra_network_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/xoa/data_source_xenorchestra_pif.go b/xoa/data_source_xenorchestra_pif.go index 07999a55..c71d23ea 100644 --- a/xoa/data_source_xenorchestra_pif.go +++ b/xoa/data_source_xenorchestra_pif.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/data_source_xenorchestra_sr.go b/xoa/data_source_xenorchestra_sr.go index ee0601a9..5da17b85 100644 --- a/xoa/data_source_xenorchestra_sr.go +++ b/xoa/data_source_xenorchestra_sr.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/data_source_xenorchestra_template.go b/xoa/data_source_xenorchestra_template.go index a197001b..2eea7601 100644 --- a/xoa/data_source_xenorchestra_template.go +++ b/xoa/data_source_xenorchestra_template.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/data_source_xenorchestra_vdi.go b/xoa/data_source_xenorchestra_vdi.go index ec3af4cb..85876bc0 100644 --- a/xoa/data_source_xenorchestra_vdi.go +++ b/xoa/data_source_xenorchestra_vdi.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/internal/mocks.go b/xoa/internal/mocks.go index 910cdf93..e5b1845b 100644 --- a/xoa/internal/mocks.go +++ b/xoa/internal/mocks.go @@ -3,7 +3,7 @@ package internal import ( "errors" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/internal/state/migrate.go b/xoa/internal/state/migrate.go index 9a14d33d..75029dfe 100644 --- a/xoa/internal/state/migrate.go +++ b/xoa/internal/state/migrate.go @@ -6,7 +6,7 @@ import ( "log" "net" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) @@ -145,7 +145,7 @@ $ xo-cli xo.getAllObjects filter='json:{"id": "cf7b5d7d-3cd5-6b7c-5025-5c935c8cd "max": 4, "number": 2 } - + # Updating the VM to use 3 CPUs would happen without stopping/starting the VM # Updating the VM to use 5 CPUs would stop/start the VM`, }, diff --git a/xoa/provider.go b/xoa/provider.go index 87e22baf..966472af 100644 --- a/xoa/provider.go +++ b/xoa/provider.go @@ -6,7 +6,7 @@ import ( "regexp" "time" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/xoa/provider_test.go b/xoa/provider_test.go index dcf84371..a70bee02 100644 --- a/xoa/provider_test.go +++ b/xoa/provider_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/ddelnano/terraform-provider-xenorchestra/xoa/internal" + "github.com/vatesfr/terraform-provider-xenorchestra/xoa/internal" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/resource_user_test.go b/xoa/resource_user_test.go index 1419826f..5e104412 100644 --- a/xoa/resource_user_test.go +++ b/xoa/resource_user_test.go @@ -1,7 +1,7 @@ package xoa import ( - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/xoa/resource_xenorchestra_acl.go b/xoa/resource_xenorchestra_acl.go index 1c01c1ac..57917ac4 100644 --- a/xoa/resource_xenorchestra_acl.go +++ b/xoa/resource_xenorchestra_acl.go @@ -1,7 +1,7 @@ package xoa import ( - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/xoa/resource_xenorchestra_acl_test.go b/xoa/resource_xenorchestra_acl_test.go index 44933d00..13eb3d4f 100644 --- a/xoa/resource_xenorchestra_acl_test.go +++ b/xoa/resource_xenorchestra_acl_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/xoa/resource_xenorchestra_bonded_network.go b/xoa/resource_xenorchestra_bonded_network.go index 27a33bf4..66f657f1 100644 --- a/xoa/resource_xenorchestra_bonded_network.go +++ b/xoa/resource_xenorchestra_bonded_network.go @@ -3,7 +3,7 @@ package xoa import ( "errors" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/xoa/resource_xenorchestra_cloud_config.go b/xoa/resource_xenorchestra_cloud_config.go index 32c52146..807eedb5 100644 --- a/xoa/resource_xenorchestra_cloud_config.go +++ b/xoa/resource_xenorchestra_cloud_config.go @@ -1,7 +1,7 @@ package xoa import ( - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/resource_xenorchestra_cloud_config_test.go b/xoa/resource_xenorchestra_cloud_config_test.go index 05318f4c..62518be7 100644 --- a/xoa/resource_xenorchestra_cloud_config_test.go +++ b/xoa/resource_xenorchestra_cloud_config_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/xoa/resource_xenorchestra_network.go b/xoa/resource_xenorchestra_network.go index c4011699..df929591 100644 --- a/xoa/resource_xenorchestra_network.go +++ b/xoa/resource_xenorchestra_network.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/xoa/resource_xenorchestra_resource_set.go b/xoa/resource_xenorchestra_resource_set.go index a1269a88..d01dbcfe 100644 --- a/xoa/resource_xenorchestra_resource_set.go +++ b/xoa/resource_xenorchestra_resource_set.go @@ -3,7 +3,7 @@ package xoa import ( "log" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/xoa/resource_xenorchestra_resource_set_test.go b/xoa/resource_xenorchestra_resource_set_test.go index 410c9d74..d65002df 100644 --- a/xoa/resource_xenorchestra_resource_set_test.go +++ b/xoa/resource_xenorchestra_resource_set_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/ddelnano/terraform-provider-xenorchestra/client" - "github.com/ddelnano/terraform-provider-xenorchestra/xoa/internal" + "github.com/vatesfr/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/xoa/internal" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/xoa/resource_xenorchestra_vdi.go b/xoa/resource_xenorchestra_vdi.go index 9dd29a03..2051a696 100644 --- a/xoa/resource_xenorchestra_vdi.go +++ b/xoa/resource_xenorchestra_vdi.go @@ -1,7 +1,7 @@ package xoa import ( - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) diff --git a/xoa/resource_xenorchestra_vdi_test.go b/xoa/resource_xenorchestra_vdi_test.go index df3f0563..48904beb 100644 --- a/xoa/resource_xenorchestra_vdi_test.go +++ b/xoa/resource_xenorchestra_vdi_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/ddelnano/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/client" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/xoa/resource_xenorchestra_vm.go b/xoa/resource_xenorchestra_vm.go index e5f6be73..a49329c4 100644 --- a/xoa/resource_xenorchestra_vm.go +++ b/xoa/resource_xenorchestra_vm.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/ddelnano/terraform-provider-xenorchestra/client" - "github.com/ddelnano/terraform-provider-xenorchestra/xoa/internal" - "github.com/ddelnano/terraform-provider-xenorchestra/xoa/internal/state" + "github.com/vatesfr/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/xoa/internal" + "github.com/vatesfr/terraform-provider-xenorchestra/xoa/internal/state" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) @@ -207,7 +207,7 @@ $ xo-cli xo.getAllObjects filter='json:{"id": "cf7b5d7d-3cd5-6b7c-5025-5c935c8cd "max": 4, "number": 2 } - + # Updating the VM to use 3 CPUs would happen without stopping/starting the VM # Updating the VM to use 5 CPUs would stop/start the VM ` + "```" + ` diff --git a/xoa/resource_xenorchestra_vm_test.go b/xoa/resource_xenorchestra_vm_test.go index 7e0e51f3..9f2b53b1 100644 --- a/xoa/resource_xenorchestra_vm_test.go +++ b/xoa/resource_xenorchestra_vm_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/ddelnano/terraform-provider-xenorchestra/client" - "github.com/ddelnano/terraform-provider-xenorchestra/xoa/internal" + "github.com/vatesfr/terraform-provider-xenorchestra/client" + "github.com/vatesfr/terraform-provider-xenorchestra/xoa/internal" "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" From 953f5062af357ce5857c8118a5d9866821413779 Mon Sep 17 00:00:00 2001 From: Dom Del Nano Date: Wed, 6 Mar 2024 06:14:01 -0800 Subject: [PATCH 2/4] Remove changes to go.mod to be consistent with client/go.{mod,sum} Signed-off-by: Dom Del Nano --- go.mod | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 61c87174..927fb5d6 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,9 @@ module github.com/vatesfr/terraform-provider-xenorchestra go 1.21 require ( - github.com/cenkalti/backoff/v3 v3.2.2 - github.com/gorilla/websocket v1.4.2 + github.com/vatesfr/terraform-provider-xenorchestra/client v0.0.0-00010101000000-000000000000 github.com/hashicorp/terraform-plugin-docs v0.18.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 - github.com/mitchellh/mapstructure v1.5.0 - github.com/sourcegraph/jsonrpc2 v0.0.0-20210201082850-366fbb520750 ) require ( @@ -21,11 +18,13 @@ require ( github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/armon/go-radix v1.0.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect + github.com/cenkalti/backoff/v3 v3.2.2 // indirect github.com/cloudflare/circl v1.3.7 // indirect github.com/fatih/color v1.16.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/uuid v1.4.0 // indirect + github.com/gorilla/websocket v1.4.2 // indirect github.com/hashicorp/cli v1.1.6 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-checkpoint v0.5.0 // indirect @@ -54,11 +53,13 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/oklog/run v1.1.0 // indirect github.com/posener/complete v1.2.3 // indirect github.com/russross/blackfriday v1.6.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect + github.com/sourcegraph/jsonrpc2 v0.0.0-20210201082850-366fbb520750 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect @@ -78,3 +79,5 @@ require ( google.golang.org/protobuf v1.32.0 // indirect gopkg.in/yaml.v2 v2.3.0 // indirect ) + +replace github.com/vatesfr/terraform-provider-xenorchestra/client => ./client From 32c35303f0f99c89e7cce2c464ec5a4348e39c6c Mon Sep 17 00:00:00 2001 From: Dom Del Nano Date: Wed, 6 Mar 2024 16:20:49 -0800 Subject: [PATCH 3/4] Ensure client module has correct name Signed-off-by: Dom Del Nano --- client/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/go.mod b/client/go.mod index 973c8e02..926661d0 100644 --- a/client/go.mod +++ b/client/go.mod @@ -1,4 +1,4 @@ -module github.com/ddelnano/terraform-provider-xenorchestra/client +module github.com/vatesfr/terraform-provider-xenorchestra/client go 1.21 From d4f82b5661959dc7a6c3ab145fea7836c4990378 Mon Sep 17 00:00:00 2001 From: Dom Del Nano Date: Wed, 6 Mar 2024 17:34:44 -0800 Subject: [PATCH 4/4] Fix additional package name caused by recent test runner improvement Signed-off-by: Dom Del Nano --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index df33e51f..bcbf1c0d 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ TIMEOUT ?= 40m GOMAXPROCS ?= 5 TF_VERSION ?= v0.14.11 -ROOT_PKG_PATH := github.com/ddelnano/terraform-provider-xenorchestra +ROOT_PKG_PATH := github.com/vatesfr/terraform-provider-xenorchestra ifdef TEST TEST := github.com/vatesfr/terraform-provider-xenorchestra/xoa -run '$(TEST)' else