Apply suggestions

Signed-off-by: abarreiro <abarreiro@vmware.com>

.goreleaser.yml

@@ -12,7 +12,7 @@ builds:
     flags:
       - -trimpath
     ldflags:
-      - '-s -w -X github.com/vmware/terraform-provider-vcd/v3/vcd.BuildVersion={{.Env.BUILDVERSION}}'
+      - '-s -w -X github.com/vmware/terraform-provider-vcd/v4/vcd.BuildVersion={{.Env.BUILDVERSION}}'
     goos:
       - freebsd
       - windows

GNUmakefile

@@ -9,11 +9,11 @@ default: build
 
 # builds the plugin injecting output of `git describe` to BuildVersion variable
 build: fmtcheck
-	go install -ldflags="-X 'github.com/vmware/terraform-provider-vcd/v3/vcd.BuildVersion=$(GIT_DESCRIBE)'"
+	go install -ldflags="-X 'github.com/vmware/terraform-provider-vcd/v4/vcd.BuildVersion=$(GIT_DESCRIBE)'"
 
 # builds the plugin with race detector enabled and injecting output of `git describe` to BuildVersion variable
 buildrace: fmtcheck
-	go install --race -ldflags="-X 'github.com/vmware/terraform-provider-vcd/v3/vcd.BuildVersion=$(GIT_DESCRIBE)'"
+	go install --race -ldflags="-X 'github.com/vmware/terraform-provider-vcd/v4/vcd.BuildVersion=$(GIT_DESCRIBE)'"
 
 # creates a .zip archive of the code
 dist:

go.mod

@@ -8,8 +8,6 @@ require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
 	github.com/kr/pretty v0.3.1
 	github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.2
-	// TODO: TM: Change this to v4
-	github.com/vmware/terraform-provider-vcd/v3 v3.14.0
 )
 
 require (
@@ -19,7 +17,6 @@ require (
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	github.com/vmware/go-vcloud-director/v2 v2.26.0 // indirect
 	golang.org/x/tools v0.17.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect

go.sum

@@ -149,12 +149,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU
 github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
-github.com/vmware/go-vcloud-director/v2 v2.26.0 h1:hcrZNbtj6x0a+nVUfkJG+Jj1l38Gw+NuUxUp0xStbSM=
-github.com/vmware/go-vcloud-director/v2 v2.26.0/go.mod h1:7Of1qJja+LLNKVegjZG7uuhhy6xgGg3q7Fkw2CEP+Tw=
 github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.2 h1:5bpxq1V0I4G50FWwi+COnbNcPUD/T747BmrkZaiN7G0=
 github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.2/go.mod h1:68KHsVns52dsq/w5JQYzauaU/+NAi1FmCxhBrFc/VoQ=
-github.com/vmware/terraform-provider-vcd/v3 v3.14.0 h1:1RS269l6TmzppdZad5bishZC8WaR2ets9lHsFXc3EbQ=
-github.com/vmware/terraform-provider-vcd/v3 v3.14.0/go.mod h1:bo3JeIaQ+J+iR0ax8w2WWJH7YRYeaG8E0k3h5MD3n+E=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -224,9 +220,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
 google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
-	"github.com/vmware/terraform-provider-vcd/v3/vcd"
+	"github.com/vmware/terraform-provider-vcd/v4/vcd"
 )
 
 func main() {

vcd/provider.go

@@ -16,7 +16,7 @@ import (
 )
 
 // BuildVersion holds version which is meant to be injected at build time using ldflags
-// (e.g. 'go build -ldflags="-X 'github.com/vmware/terraform-provider-vcd/v3/vcd.BuildVersion=v1.0.0'"')
+// (e.g. 'go build -ldflags="-X 'github.com/vmware/terraform-provider-vcd/v4/vcd.BuildVersion=v1.0.0'"')
 var BuildVersion = "unset"
 
 // DataSources is a public function which allows filtering and access all defined data sources