Merge pull request #422 from mleone87/master

Bugfixes, timeouts, logging improvement, some logic rework

Author: ggongaware

.gitignore

@@ -4,3 +4,5 @@ examples/*_override.tf
 *~*
 *.bak
 bin
+.vscode
+*.log

Makefile

@@ -1,3 +1,52 @@
+SHELL := /bin/bash
+
+DESCRIBE           := $(shell git describe --match "v*" --always --tags)
+DESCRIBE_PARTS     := $(subst -, ,$(DESCRIBE))
+
+VERSION_TAG        := $(word 1,$(DESCRIBE_PARTS))
+COMMITS_SINCE_TAG  := $(word 2,$(DESCRIBE_PARTS))
+
+VERSION            := $(subst v,,$(VERSION_TAG))
+VERSION_PARTS      := $(subst ., ,$(VERSION))
+
+MAJOR              := $(word 1,$(VERSION_PARTS))
+MINOR              := $(word 2,$(VERSION_PARTS))
+MICRO              := $(word 3,$(VERSION_PARTS))
+
+NEXT_MAJOR         := $(shell echo $$(($(MAJOR)+1)))
+NEXT_MINOR         := $(shell echo $$(($(MINOR)+1)))
+NEXT_MICRO          = $(shell echo $$(($(MICRO)+1)))
+
+ifeq ($(strip $(COMMITS_SINCE_TAG)),)
+CURRENT_VERSION_MICRO := $(MAJOR).$(MINOR).$(MICRO)
+CURRENT_VERSION_MINOR := $(CURRENT_VERSION_MICRO)
+CURRENT_VERSION_MAJOR := $(CURRENT_VERSION_MICRO)
+else
+CURRENT_VERSION_MICRO := $(MAJOR).$(MINOR).$(NEXT_MICRO)
+CURRENT_VERSION_MINOR := $(MAJOR).$(NEXT_MINOR).0
+CURRENT_VERSION_MAJOR := $(NEXT_MAJOR).0.0
+endif
+
+DATE                = $(shell date +'%d.%m.%Y')
+TIME                = $(shell date +'%H:%M:%S')
+COMMIT             := $(shell git rev-parse HEAD)
+AUTHOR             := $(firstword $(subst @, ,$(shell git show --format="%aE" $(COMMIT))))
+BRANCH_NAME        := $(shell git rev-parse --abbrev-ref HEAD)
+
+TAG_MESSAGE         = "$(TIME) $(DATE) $(AUTHOR) $(BRANCH_NAME)"
+COMMIT_MESSAGE     := $(shell git log --format=%B -n 1 $(COMMIT))
+
+CURRENT_TAG_MICRO  := "v$(CURRENT_VERSION_MICRO)"
+CURRENT_TAG_MINOR  := "v$(CURRENT_VERSION_MINOR)"
+CURRENT_TAG_MAJOR  := "v$(CURRENT_VERSION_MAJOR)"
+
+KERNEL=$(shell if [ "$$(uname -s)" == "Linux" ]; then echo linux; fi)
+ARCH=$(shell if [ "$$(uname -m)" == "x86_64" ]; then echo amd64; fi)
+
+# $(info $$KERNEL = $(KERNEL))
+
+# $(error $$ARCH = $(ARCH))
+
 .PHONY: build fmt vet test clean install acctest local-dev-install
 
 all: build
@@ -27,11 +76,12 @@ acctest: build
 install: build
 	cp bin/terraform-provider-proxmox $$GOPATH/bin/terraform-provider-proxmox
 
-KERNEL=$(shell $(uname -s | tr '[:upper:]' '[:lower:]'))
-ARCH=$(shell if [ "$$(uname -m)" == "x86_64" ]; then echo amd64; fi)
-local-dev-install:
-	mkdir -p ~/.terraform.d/plugins/registry.example.com/telmate/proxmox/$(KERNEL)_$(ARCH)/
-	cp bin/terraform-provider-proxmox ~/.terraform.d/plugins/registry.example.com/telmate/proxmox/$(KERNEL)_$(ARCH)/
+local-dev-install: build
+	@echo "$(CURRENT_VERSION_MICRO)"
+	@echo "$(KERNEL)"
+	@echo "$(ARCH)"
+	mkdir -p ~/.terraform.d/plugins/localhost/telmate/proxmox/$(CURRENT_VERSION_MICRO)/$(KERNEL)_$(ARCH)/
+	cp bin/terraform-provider-proxmox ~/.terraform.d/plugins/localhost/telmate/proxmox/$(CURRENT_VERSION_MICRO)/$(KERNEL)_$(ARCH)/
 
 clean:
-	@git clean -f -d -X
+	@git clean -f -d

docs/index.md

@@ -2,11 +2,12 @@
 
 A Terraform provider is responsible for understanding API interactions and exposing resources. The Proxmox provider uses the Proxmox API. This provider exposes two resources: [proxmox_vm_qemu](docs/resources/vm_qemu.md) and [proxmox_lxc](docs/resources/lxc.md).
 
-## Creating the Proxmox user and role for terraform 
+## Creating the Proxmox user and role for terraform
 
 The particular privileges required may change but here is a suitable starting point rather than using cluster-wide Administrator rights
 
 Log into the Proxmox cluster or host using ssh (or mimic these in the GUI) then:
+
 - Create a new role for the future terraform user.
 - Create the user "terraform-prov@pve"
 - Add the TERRAFORM-PROV role to the terraform-prov user
@@ -17,9 +18,9 @@ pveum user add terraform-prov@pve --password <password>
 pveum aclmod / -user terraform-prov@pve -role TerraformProv
 ```
 
-The provider also supports using an API key rather than a password, see below for details. 
+The provider also supports using an API key rather than a password, see below for details.
 
-After the role is in use, if there is a need to modify the privileges, simply issue the command showed, adding or removing priviledges as needed. 
+After the role is in use, if there is a need to modify the privileges, simply issue the command showed, adding or removing priviledges as needed.
 
 ```bash
 pveum role modify TerraformProv -privs "VM.Allocate VM.Clone VM.Config.CDROM VM.Config.CPU VM.Config.Cloudinit VM.Config.Disk VM.Config.HWType VM.Config.Memory VM.Config.Network VM.Config.Options VM.Monitor VM.Audit VM.PowerMgmt Datastore.AllocateSpace Datastore.Audit"
@@ -59,33 +60,46 @@ provider "proxmox" {
 }
 ```
 
+## Enable Debug Mode in proxmox-api-go
+
+You can enable global debug mode for the provider underliing api client, using the new provider parameter. The default setting is _false_
+
+```hcl
+provider "proxmox" {
+    pm_debug = true
+}
+```
+
 ## Argument Reference
 
 The following arguments are supported in the provider block:
 
-* `pm_api_url` - (Required; or use environment variable `PM_API_URL`) This is the target Proxmox API endpoint.
-* `pm_user` - (Optional; or use environment variable `PM_USER`) The user, remember to include the authentication realm such as myuser@pam or myuser@pve.
-* `pm_password` - (Optional; sensitive; or use environment variable `PM_PASS`) The password.
-* `pm_api_token_id` - (Optional; or use environment variable `PM_API_TOKEN_ID`) This is an [API token](https://pve.proxmox.com/pve-docs/pveum-plain.html) you have previously created for a specific user.
-* `pm_api_token_secret` - (Optional; or use environment variable `PM_API_TOKEN_SECRET`) This is a uuid that is only available when initially creating the token.
-* `pm_otp` - (Optional; or use environment variable `PM_OTP`) The 2FA OTP code.
-* `pm_tls_insecure` - (Optional) Disable TLS verification while connecting to the proxmox server.
-* `pm_parallel` - (Optional; defaults to 4) Allowed simultaneous Proxmox processes (e.g. creating resources).
-* `pm_log_enable` - (Optional; defaults to false) Enable debug logging, see the section below for logging details.
-* `pm_log_levels` - (Optional) A map of log sources and levels.
-* `pm_log_file` - (Optional; defaults to "terraform-plugin-proxmox.log") If logging is enabled, the log file the provider will write logs to.
-* `pm_timeout` - (Optional; defaults to 300) Timeout value (seconds) for proxmox API calls.
+- `pm_api_url` - (Required; or use environment variable `PM_API_URL`) This is the target Proxmox API endpoint.
+- `pm_user` - (Optional; or use environment variable `PM_USER`) The user, remember to include the authentication realm such as myuser@pam or myuser@pve.
+- `pm_password` - (Optional; sensitive; or use environment variable `PM_PASS`) The password.
+- `pm_api_token_id` - (Optional; or use environment variable `PM_API_TOKEN_ID`) This is an [API token](https://pve.proxmox.com/pve-docs/pveum-plain.html) you have previously created for a specific user.
+- `pm_api_token_secret` - (Optional; or use environment variable `PM_API_TOKEN_SECRET`) This is a uuid that is only available when initially creating the token.
+- `pm_otp` - (Optional; or use environment variable `PM_OTP`) The 2FA OTP code.
+- `pm_tls_insecure` - (Optional) Disable TLS verification while connecting to the proxmox server.
+- `pm_parallel` - (Optional; defaults to 4) Allowed simultaneous Proxmox processes (e.g. creating resources).
+- `pm_log_enable` - (Optional; defaults to false) Enable debug logging, see the section below for logging details.
+- `pm_log_levels` - (Optional) A map of log sources and levels.
+- `pm_log_file` - (Optional; defaults to "terraform-plugin-proxmox.log") If logging is enabled, the log file the provider will write logs to.
+- `pm_timeout` - (Optional; defaults to 300) Timeout value (seconds) for proxmox API calls.
+- `pm_debug` - (Optional; defaults to false) Enable verbose output in proxmox-api-go
 
 Additionally, one can set the `PM_OTP_PROMPT` environment variable to prompt for OTP 2FA code (if required).
 
 ## Logging
 
-The provider is able to output detailed logs upon request. Note that this feature is intended for development purposes, but could also be used to help investigate bugs. For example: the following code when placed into the provider "proxmox" block will enable loging to the file "terraform-plugin-proxmox.log".  All log sources will default to the "debug" level, and any stdout/stderr from sublibraries (proxmox-api-go) will be silenced (set to non-empty string to enable).
+The provider is able to output detailed logs upon request. Note that this feature is intended for development purposes, but could also be used to help investigate bugs. For example: the following code when placed into the provider "proxmox" block will enable loging to the file "terraform-plugin-proxmox.log". All log sources will default to the "debug" level.
+To silence and any stdout/stderr from sublibraries (proxmox-api-go), remove or comment out \_capturelog.
 
 ```hcl
 provider "proxmox" {
   pm_log_enable = true
   pm_log_file = "terraform-plugin-proxmox.log"
+  pm_debug = true
   pm_log_levels = {
     _default = "debug"
     _capturelog = ""