Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
oucema001 committed Jan 25, 2024
1 parent dc5284d commit 0cf091a
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 33 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ see: [Debugger-Based Debugging](https://www.terraform.io/docs/extend/debugging.h
* [Proxmox documentation](https://pve.proxmox.com/pve-docs/)
* [Terraform](https://www.terraform.io/)
* [Terraform documentation](https://www.terraform.io/docs/index.html)
* [Recommended ISO builder](https://github.com/Telmate/terraform-ubuntu-proxmox-iso)
* [Recommended ISO builder](https://github.com/frostyfab/terraform-ubuntu-proxmox-iso)
10 changes: 5 additions & 5 deletions docs/guides/developer.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ can help investigate any problems they may run into.
# Compilation
Instructions on how to compile the provider, and cause terraform to use that
newly compiled executable, see the
[installation guide](https://github.com/Telmate/terraform-provider-proxmox/blob/new_developer_setup/docs/guides/installation.md#compile-the-executables-with-go).
[installation guide](https://github.com/frostyfab/terraform-provider-proxmox/blob/new_developer_setup/docs/guides/installation.md#compile-the-executables-with-go).

You may want to specify the namespace and specific path to the plugin to make
sure terraform is getting the correct executable. If you are using the default
Expand Down Expand Up @@ -53,14 +53,14 @@ Much of the code for the provider is not actually in this repo. It's in a
library repo called proxmox-api-go. When you build the provider, the build
system will check out a specific commit of that repo to get the code.

This is controlled by [go.sum](https://github.com/Telmate/terraform-provider-proxmox/blob/master/go.sum#L5-L6)
This is controlled by [go.sum](https://github.com/frostyfab/terraform-provider-proxmox/blob/master/go.sum#L5-L6)

The convention seems to be `Version-Date-CommitHash`. As an example, the
following was commit `31826f2fdc39` that was checked in on 2023-12-07:

```
github.com/Telmate/proxmox-api-go v0.0.0-20231207182448-31826f2fdc39 h1:0MvktdAFWIcc9F4IwQls2Em1F9z2LUZR1fSVm1PkKfM=
github.com/Telmate/proxmox-api-go v0.0.0-20231207182448-31826f2fdc39/go.mod h1:xOwyTd8uC2IiYfmjwCVU2fTTVToFCm9yxJzn4cd7rPw=
github.com/frostyfab/proxmox-api-go v0.0.0-20231207182448-31826f2fdc39 h1:0MvktdAFWIcc9F4IwQls2Em1F9z2LUZR1fSVm1PkKfM=
github.com/frostyfab/proxmox-api-go v0.0.0-20231207182448-31826f2fdc39/go.mod h1:xOwyTd8uC2IiYfmjwCVU2fTTVToFCm9yxJzn4cd7rPw=
```

If you want to make changes to the library (e.g. to add debug print
Expand All @@ -69,7 +69,7 @@ for your modified library instead of getting it from github. To do this, you
can add the following line to the end of go.mod:

```
replace "github.com/Telmate/proxmox-api-go" => "../proxmox-api-go"
replace "github.com/frostyfab/proxmox-api-go" => "../proxmox-api-go"
```

This will let you experiment locally without having to push things up to github
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/installation.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ executables that have to be placed in the plugin directory.
First, clone this repo and cd into the repo's root.

```shell
git clone https://github.com/Telmate/terraform-provider-proxmox
git clone https://github.com/frostyfab/terraform-provider-proxmox
cd terraform-provider-proxmox
```

Expand Down
11 changes: 3 additions & 8 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ module github.com/Telmate/terraform-provider-proxmox/v2
go 1.20

require (
github.com/frostyfab/proxmox-api-go v0.0.0-20231117222322-ac75783be16d // indirect
github.com/frostyfab/proxmox-api-go v0.0.0-20231117222322-ac75783be16d
github.com/google/uuid v1.5.0
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
github.com/hashicorp/terraform-plugin-sdk/v2 v2.31.0
github.com/rs/zerolog v1.31.0

)

require github.com/Telmate/proxmox-api-go v0.0.0-20240123211857-586199ea9da2 // indirect

require (
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
Expand Down Expand Up @@ -60,10 +62,3 @@ require (
google.golang.org/grpc v1.60.1 // indirect
google.golang.org/protobuf v1.32.0 // indirect
)

require (
github.com/Telmate/proxmox-api-go v0.0.0-20240123211857-586199ea9da2 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
)
10 changes: 0 additions & 10 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg=
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
github.com/Telmate/proxmox-api-go v0.0.0-20240120172859-e1cc84906875 h1:CEn1ifBCODs1aT2fvHN1FdlkjtwNX2ZG2hHmaevLzR4=
github.com/Telmate/proxmox-api-go v0.0.0-20240120172859-e1cc84906875/go.mod h1:xOwyTd8uC2IiYfmjwCVU2fTTVToFCm9yxJzn4cd7rPw=
github.com/Telmate/proxmox-api-go v0.0.0-20240123211857-586199ea9da2 h1:GDpTqoB3mCIpS+UFnGbj3yVrE/23HtWLotkmYZTBa1M=
github.com/Telmate/proxmox-api-go v0.0.0-20240123211857-586199ea9da2/go.mod h1:xOwyTd8uC2IiYfmjwCVU2fTTVToFCm9yxJzn4cd7rPw=
github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
Expand All @@ -17,7 +15,6 @@ github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUK
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
Expand Down Expand Up @@ -88,8 +85,6 @@ github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S
github.com/hashicorp/terraform-svchost v0.1.1/go.mod h1:mNsjQfZyf/Jhz35v6/0LWcv26+X7JPS+buii2c9/ctc=
github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
github.com/kdomanski/iso9660 v0.4.0 h1:BPKKdcINz3m0MdjIMwS0wx1nofsOjxOq8TOr45WGHFg=
Expand Down Expand Up @@ -130,13 +125,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ=
github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
Expand Down
2 changes: 1 addition & 1 deletion proxmox/data_ha_group.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package proxmox
import (
"sort"

"github.com/Telmate/proxmox-api-go/proxmox"
"github.com/frostyfab/proxmox-api-go/proxmox"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion proxmox/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"sync"

pxapi "github.com/Telmate/proxmox-api-go/proxmox"
pxapi "github.com/frostyfab/proxmox-api-go/proxmox"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion proxmox/resource_cloud_init_disk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"io"
"strings"

"github.com/Telmate/proxmox-api-go/proxmox"
"github.com/frostyfab/proxmox-api-go/proxmox"
"github.com/kdomanski/iso9660"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
Expand Down
2 changes: 1 addition & 1 deletion proxmox/resource_lxc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"time"

pxapi "github.com/Telmate/proxmox-api-go/proxmox"
pxapi "github.com/frostyfab/proxmox-api-go/proxmox"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion proxmox/resource_lxc_disk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

pxapi "github.com/Telmate/proxmox-api-go/proxmox"
pxapi "github.com/frostyfab/proxmox-api-go/proxmox"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion proxmox/resource_storage_iso.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"strings"

"github.com/Telmate/proxmox-api-go/proxmox"
"github.com/frostyfab/proxmox-api-go/proxmox"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

Expand Down
5 changes: 3 additions & 2 deletions proxmox/resource_vm_qemu_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"os"
"strings"
"testing"
pxapi "github.com/frostyfab/proxmox-api-go/proxmox"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
Expand Down Expand Up @@ -284,7 +285,7 @@ func TestAccProxmoxVmQemu_BasicCreateClone(t *testing.T) {
resource.TestCheckResourceAttr(resourcePath, "name", resourceName),
resource.TestCheckResourceAttr(clonePath, "name", cloneName),
// check for unused_disk.0.file existance as that means an extra disk popped up
// which would be a regression of https://github.com/Telmate/terraform-provider-proxmox/issues/239
// which would be a regression of https://github.com/frostyfab/terraform-provider-proxmox/issues/239
resource.TestCheckNoResourceAttr(clonePath, "unused_disk.0.file"),
),
},
Expand All @@ -311,7 +312,7 @@ func TestAccProxmoxVmQemu_CreateCloneWithTwoDisks(t *testing.T) {
resource.TestCheckResourceAttr(resourcePath, "name", resourceName),
resource.TestCheckResourceAttr(clonePath, "name", cloneName),
// check for unused_disk.0.file existance as that means an extra disk popped up
// which would be a regression of https://github.com/Telmate/terraform-provider-proxmox/issues/239
// which would be a regression of https://github.com/frostyfab/terraform-provider-proxmox/issues/239
resource.TestCheckNoResourceAttr(clonePath, "unused_disk.0.file"),
resource.TestCheckResourceAttr(clonePath, "disk.0.size", "2G"),
resource.TestCheckResourceAttr(clonePath, "disk.1.size", "3G"),
Expand Down

0 comments on commit 0cf091a

Please sign in to comment.