diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b982ad57..0eae8312 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,7 +8,7 @@ Relates OR Closes #0000 -Release note for [CHANGELOG](https://github.com/danitso/terraform-provider-proxmox/blob/master/CHANGELOG.md): +Release note for [CHANGELOG](https://github.com/bpg/terraform-provider-proxmox/blob/master/CHANGELOG.md): ```release-note diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index b408d65f..633214b1 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -55,7 +55,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at info@danitso.com. All +reported by contacting the project team at info@boldyrev.me. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. diff --git a/Makefile b/Makefile index 26a6d6b0..a3e8cfd2 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,8 @@ else TERRAFORM_PLUGIN_CACHE_DIRECTORY=$(shell pwd -P)/cache/plugins endif -TERRAFORM_PLUGIN_DIRECTORY=$(TERRAFORM_PLUGIN_CACHE_DIRECTORY)/registry.terraform.io/danitso/proxmox/$(VERSION)/$(TERRAFORM_PLATFORM) -TERRAFORM_PLUGIN_DIRECTORY_EXAMPLE=$(TERRAFORM_PLUGIN_CACHE_DIRECTORY)/registry.terraform.io/danitso/proxmox/$(VERSION_EXAMPLE)/$(TERRAFORM_PLATFORM) +TERRAFORM_PLUGIN_DIRECTORY=$(TERRAFORM_PLUGIN_CACHE_DIRECTORY)/registry.terraform.io/bpg/proxmox/$(VERSION)/$(TERRAFORM_PLATFORM) +TERRAFORM_PLUGIN_DIRECTORY_EXAMPLE=$(TERRAFORM_PLUGIN_CACHE_DIRECTORY)/registry.terraform.io/bpg/proxmox/$(VERSION_EXAMPLE)/$(TERRAFORM_PLATFORM) TERRAFORM_PLUGIN_EXECUTABLE=$(TERRAFORM_PLUGIN_DIRECTORY)/$(NAME)_v$(VERSION)_x4$(TERRAFORM_PLUGIN_EXTENSION) TERRAFORM_PLUGIN_EXECUTABLE_EXAMPLE=$(TERRAFORM_PLUGIN_DIRECTORY_EXAMPLE)/$(NAME)_v$(VERSION_EXAMPLE)_x4$(TERRAFORM_PLUGIN_EXTENSION) diff --git a/README.md b/README.md index 47e3fe65..23838409 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,14 @@ -[![Go Report Card](https://goreportcard.com/badge/github.com/danitso/terraform-provider-proxmox)](https://goreportcard.com/report/github.com/danitso/terraform-provider-proxmox) -[![GoDoc](https://godoc.org/github.com/danitso/terraform-provider-proxmox?status.svg)](http://godoc.org/github.com/danitso/terraform-provider-proxmox) +[![Go Report Card](https://goreportcard.com/badge/github.com/bpg/terraform-provider-proxmox)](https://goreportcard.com/report/github.com/bpg/terraform-provider-proxmox) +[![GoDoc](https://godoc.org/github.com/bpg/terraform-provider-proxmox?status.svg)](http://godoc.org/github.com/bpg/terraform-provider-proxmox) # Terraform Provider for Proxmox A Terraform Provider which adds support for Proxmox solutions. +This repository is a fork of https://github.com/danitso/terraform-provider-proxmox with several critical fixes to unblock +VM deployment in Proxmox v7.0, and a few other enhancements. + ## Requirements -- [Terraform](https://www.terraform.io/downloads.html) 0.13+ +- [Terraform](https://www.terraform.io/downloads.html) 0.14+ - [Go](https://golang.org/doc/install) 1.16+ (to build the provider plugin) - [GoReleaser](https://goreleaser.com/install/) 0.155+ (to build the provider plugin) @@ -16,23 +19,23 @@ A Terraform Provider which adds support for Proxmox solutions. - [Known issues](#known-issues) ## Building the provider -- Clone the repository to `$GOPATH/src/github.com/danitso/terraform-provider-proxmox`: +- Clone the repository to `$GOPATH/src/github.com/bpg/terraform-provider-proxmox`: ```sh - $ mkdir -p "${GOPATH}/src/github.com/danitso" - $ cd "${GOPATH}/src/github.com/danitso" - $ git clone git@github.com:danitso/terraform-provider-proxmox + $ mkdir -p "${GOPATH}/src/github.com/bpg" + $ cd "${GOPATH}/src/github.com/bpg" + $ git clone git@github.com:bpg/terraform-provider-proxmox ``` - Enter the provider directory and build it: ```sh - $ cd "${GOPATH}/src/github.com/danitso/terraform-provider-proxmox" + $ cd "${GOPATH}/src/github.com/bpg/terraform-provider-proxmox" $ make build ``` ## Using the provider -You can find the latest release and its documentation in the [Terraform Registry](https://registry.terraform.io/providers/danitso/proxmox/latest). +You can find the latest release and its documentation in the [Terraform Registry](https://registry.terraform.io/providers/bpg/proxmox/latest). ## Testing the provider In order to test the provider, you can simply run `make test`. diff --git a/docs/_config.yml b/docs/_config.yml index 21e9b091..76bc46a0 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,8 +1,8 @@ -email: info@danitso.com +email: info@boldyrev.me title: Proxmox Provider description: >- Terraform Provider for Proxmox. -github_username: "danitso" +github_username: "bpg" highlighter: rouge markdown: kramdown @@ -11,6 +11,6 @@ plugins: remote_theme: pmarsceill/just-the-docs # Theme settings. -footer_content: 'Copyright © 2019-2020 Danitso - Distributed under the Mozilla Public License 2.0' +footer_content: 'Copyright © 2019-2021 Danitso - Distributed under the Mozilla Public License 2.0
Copyright © 2021 Pavel Boldyrev - Distributed under the Mozilla Public License 2.0' heading_anchors: true search_enabled: false diff --git a/example.tfrc b/example.tfrc index 3fe923ac..7dbe362b 100644 --- a/example.tfrc +++ b/example.tfrc @@ -1,9 +1,9 @@ provider_installation { filesystem_mirror { path = "../cache/plugins" - include = ["registry.terraform.io/danitso/proxmox"] + include = ["registry.terraform.io/bpg/proxmox"] } direct { - exclude = ["registry.terraform.io/danitso/proxmox"] + exclude = ["registry.terraform.io/bpg/proxmox"] } } diff --git a/example/versions.tf b/example/versions.tf index a0d9d8e0..b504ac02 100644 --- a/example/versions.tf +++ b/example/versions.tf @@ -5,7 +5,7 @@ terraform { version = "2.0.0" } proxmox = { - source = "danitso/proxmox" + source = "bpg/proxmox" version = "9999.0.0" } tls = { diff --git a/go.mod b/go.mod index da611388..b7df56e0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/danitso/terraform-provider-proxmox +module github.com/bpg/terraform-provider-proxmox -go 1.15 +go 1.16 require ( cloud.google.com/go v0.74.0 // indirect diff --git a/main.go b/main.go index 68efbdab..5acd877c 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ package main import ( - "github.com/danitso/terraform-provider-proxmox/proxmoxtf" + "github.com/bpg/terraform-provider-proxmox/proxmoxtf" "github.com/hashicorp/terraform-plugin-sdk/plugin" "github.com/hashicorp/terraform-plugin-sdk/terraform" ) diff --git a/proxmoxtf/provider.go b/proxmoxtf/provider.go index 6d692c44..1c91927e 100644 --- a/proxmoxtf/provider.go +++ b/proxmoxtf/provider.go @@ -9,7 +9,7 @@ import ( "net/url" "os" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_certificate.go b/proxmoxtf/resource_virtual_environment_certificate.go index 79a81ff0..bfc57af3 100644 --- a/proxmoxtf/resource_virtual_environment_certificate.go +++ b/proxmoxtf/resource_virtual_environment_certificate.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_cluster_alias.go b/proxmoxtf/resource_virtual_environment_cluster_alias.go index 2a8a99ce..1fcbdc8a 100644 --- a/proxmoxtf/resource_virtual_environment_cluster_alias.go +++ b/proxmoxtf/resource_virtual_environment_cluster_alias.go @@ -7,7 +7,7 @@ package proxmoxtf import ( "strings" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_cluster_ipset.go b/proxmoxtf/resource_virtual_environment_cluster_ipset.go index 0ca038aa..f4be044f 100644 --- a/proxmoxtf/resource_virtual_environment_cluster_ipset.go +++ b/proxmoxtf/resource_virtual_environment_cluster_ipset.go @@ -7,7 +7,7 @@ package proxmoxtf import ( "strings" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_container.go b/proxmoxtf/resource_virtual_environment_container.go index 01c8f428..67a1096c 100644 --- a/proxmoxtf/resource_virtual_environment_container.go +++ b/proxmoxtf/resource_virtual_environment_container.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) diff --git a/proxmoxtf/resource_virtual_environment_dns.go b/proxmoxtf/resource_virtual_environment_dns.go index b4e294cf..2cf923dc 100644 --- a/proxmoxtf/resource_virtual_environment_dns.go +++ b/proxmoxtf/resource_virtual_environment_dns.go @@ -7,7 +7,7 @@ package proxmoxtf import ( "fmt" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_file.go b/proxmoxtf/resource_virtual_environment_file.go index c00f918f..22c2491e 100644 --- a/proxmoxtf/resource_virtual_environment_file.go +++ b/proxmoxtf/resource_virtual_environment_file.go @@ -19,7 +19,7 @@ import ( "strings" "time" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_group.go b/proxmoxtf/resource_virtual_environment_group.go index 0c619b8f..8ae9ff5f 100644 --- a/proxmoxtf/resource_virtual_environment_group.go +++ b/proxmoxtf/resource_virtual_environment_group.go @@ -7,7 +7,7 @@ package proxmoxtf import ( "strings" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_hosts.go b/proxmoxtf/resource_virtual_environment_hosts.go index 7da84462..35b01486 100644 --- a/proxmoxtf/resource_virtual_environment_hosts.go +++ b/proxmoxtf/resource_virtual_environment_hosts.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_pool.go b/proxmoxtf/resource_virtual_environment_pool.go index f5b76f82..08160466 100644 --- a/proxmoxtf/resource_virtual_environment_pool.go +++ b/proxmoxtf/resource_virtual_environment_pool.go @@ -7,7 +7,7 @@ package proxmoxtf import ( "strings" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_role.go b/proxmoxtf/resource_virtual_environment_role.go index b87731b2..39efd2ec 100644 --- a/proxmoxtf/resource_virtual_environment_role.go +++ b/proxmoxtf/resource_virtual_environment_role.go @@ -7,7 +7,7 @@ package proxmoxtf import ( "strings" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_time.go b/proxmoxtf/resource_virtual_environment_time.go index 7a644408..e2eca85d 100644 --- a/proxmoxtf/resource_virtual_environment_time.go +++ b/proxmoxtf/resource_virtual_environment_time.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_user.go b/proxmoxtf/resource_virtual_environment_user.go index f2c50ef7..7968ff72 100644 --- a/proxmoxtf/resource_virtual_environment_user.go +++ b/proxmoxtf/resource_virtual_environment_user.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) diff --git a/proxmoxtf/resource_virtual_environment_vm.go b/proxmoxtf/resource_virtual_environment_vm.go index ddf9169e..565cba3e 100644 --- a/proxmoxtf/resource_virtual_environment_vm.go +++ b/proxmoxtf/resource_virtual_environment_vm.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" ) diff --git a/proxmoxtf/utils.go b/proxmoxtf/utils.go index 690b1ebf..de5951bc 100644 --- a/proxmoxtf/utils.go +++ b/proxmoxtf/utils.go @@ -14,7 +14,7 @@ import ( "time" "unicode" - "github.com/danitso/terraform-provider-proxmox/proxmox" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" )