diff --git a/.all-contributorsrc b/.all-contributorsrc index db131327..7a943ddc 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -857,6 +857,15 @@ "bug", "test" ] + }, + { + "login": "ecanuto", + "name": "Everaldo Canuto", + "avatar_url": "https://avatars.githubusercontent.com/u/55260?v=4", + "profile": "https://github.com/ecanuto", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 9fc17981..a1eb34ab 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.46.2" + ".": "0.46.3" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 58d2c955..263cacde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.46.3](https://github.com/bpg/terraform-provider-proxmox/compare/v0.46.2...v0.46.3) (2024-02-07) + + +### Bug Fixes + +* **file:** `error moving file` when uploading snippets ([#1013](https://github.com/bpg/terraform-provider-proxmox/issues/1013)) ([b6fbdcf](https://github.com/bpg/terraform-provider-proxmox/commit/b6fbdcf5ab3c191136c60814404153785aec806b)) + + +### Miscellaneous + +* **deps:** update module go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp (v0.47.0 → v0.48.0) in /tools ([#1014](https://github.com/bpg/terraform-provider-proxmox/issues/1014)) ([303b7da](https://github.com/bpg/terraform-provider-proxmox/commit/303b7da684dcf2f986fd6a70a74e40b75d71911a)) + ## [0.46.2](https://github.com/bpg/terraform-provider-proxmox/compare/v0.46.1...v0.46.2) (2024-02-06) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 516cbab2..39f57c48 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -122,6 +122,9 @@ Eusebius1920
Eusebius1920
🐛 📖 kvangent
kvangent
🐛 ⚠️ + + Everaldo Canuto
Everaldo Canuto
💻 + diff --git a/Makefile b/Makefile index b27d5e44..916ce86d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ NAME=terraform-provider-proxmox TARGETS=darwin linux windows TERRAFORM_PLUGIN_EXTENSION= -VERSION=0.46.2# x-release-please-version +VERSION=0.46.3# x-release-please-version # check if opentofu is installed and use it if it is, # otherwise use terraform diff --git a/examples/guides/cloud-image/centos-qcow2/provider.tf b/examples/guides/cloud-image/centos-qcow2/provider.tf index 99045605..5b59e875 100644 --- a/examples/guides/cloud-image/centos-qcow2/provider.tf +++ b/examples/guides/cloud-image/centos-qcow2/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { proxmox = { source = "bpg/proxmox" - version = "0.46.2" # x-release-please-version + version = "0.46.3" # x-release-please-version } } } diff --git a/examples/guides/cloud-image/debian-from-storage/provider.tf b/examples/guides/cloud-image/debian-from-storage/provider.tf index 99045605..5b59e875 100644 --- a/examples/guides/cloud-image/debian-from-storage/provider.tf +++ b/examples/guides/cloud-image/debian-from-storage/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { proxmox = { source = "bpg/proxmox" - version = "0.46.2" # x-release-please-version + version = "0.46.3" # x-release-please-version } } } diff --git a/examples/guides/cloud-image/ubuntu-img/provider.tf b/examples/guides/cloud-image/ubuntu-img/provider.tf index 99045605..5b59e875 100644 --- a/examples/guides/cloud-image/ubuntu-img/provider.tf +++ b/examples/guides/cloud-image/ubuntu-img/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { proxmox = { source = "bpg/proxmox" - version = "0.46.2" # x-release-please-version + version = "0.46.3" # x-release-please-version } } } diff --git a/examples/guides/cloud-init/custom/provider.tf b/examples/guides/cloud-init/custom/provider.tf index 99045605..5b59e875 100644 --- a/examples/guides/cloud-init/custom/provider.tf +++ b/examples/guides/cloud-init/custom/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { proxmox = { source = "bpg/proxmox" - version = "0.46.2" # x-release-please-version + version = "0.46.3" # x-release-please-version } } } diff --git a/examples/guides/cloud-init/native/provider.tf b/examples/guides/cloud-init/native/provider.tf index 99045605..5b59e875 100644 --- a/examples/guides/cloud-init/native/provider.tf +++ b/examples/guides/cloud-init/native/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { proxmox = { source = "bpg/proxmox" - version = "0.46.2" # x-release-please-version + version = "0.46.3" # x-release-please-version } } } diff --git a/go.mod b/go.mod index c9b5da45..0425de20 100644 --- a/go.mod +++ b/go.mod @@ -18,9 +18,9 @@ require ( github.com/pkg/sftp v1.13.6 github.com/skeema/knownhosts v1.2.1 github.com/stretchr/testify v1.8.4 - golang.org/x/crypto v0.18.0 + golang.org/x/crypto v0.19.0 golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 - golang.org/x/net v0.20.0 + golang.org/x/net v0.21.0 ) require ( @@ -63,7 +63,7 @@ require ( github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/zclconf/go-cty v1.14.2 // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/sys v0.16.0 // indirect + golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect diff --git a/go.sum b/go.sum index 755fda1d..08e22527 100644 --- a/go.sum +++ b/go.sum @@ -178,8 +178,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo= golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -194,8 +194,8 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -216,16 +216,16 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/proxmoxtf/resource/file.go b/proxmoxtf/resource/file.go index 636bbc5a..9ea7170d 100644 --- a/proxmoxtf/resource/file.go +++ b/proxmoxtf/resource/file.go @@ -12,7 +12,6 @@ import ( "crypto/sha256" "crypto/tls" "fmt" - "github.com/bpg/terraform-provider-proxmox/proxmoxtf/resource/ssh" "io" "net/http" "net/url" @@ -23,6 +22,8 @@ import ( "strings" "time" + "github.com/bpg/terraform-provider-proxmox/proxmoxtf/resource/ssh" + "github.com/google/uuid" "github.com/hashicorp/go-cty/cty" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -594,12 +595,12 @@ func fileCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag _, err := capi.SSH().ExecuteNodeCommands(ctx, nodeName, []string{ // the `mv` command should be scoped to the specific directories in sudoers! - fmt.Sprintf(`%s; try_sudo "mv %s/%s %s/%s" && rm %s/%s && rmdir -p %s`, + fmt.Sprintf(`%s; try_sudo "mv %s/%s %s/%s" && rmdir %s && rmdir %s || echo`, ssh.TrySudo, srcDir, *fileName, dstDir, *fileName, - srcDir, *fileName, srcDir, + tempFileDir, ), }) if err != nil { diff --git a/tools/go.mod b/tools/go.mod index 516dcb5b..16d16c4a 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -4,7 +4,7 @@ go 1.21 replace github.com/nats-io/nkeys => github.com/nats-io/nkeys v0.4.7 -replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 +replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 require ( github.com/golangci/golangci-lint v1.55.2