From 427db3d44a1d43d03cdb90034a6b099a954523aa Mon Sep 17 00:00:00 2001 From: Dan Petersen Date: Sat, 13 Feb 2021 02:46:29 +0100 Subject: [PATCH] fix: example and makefile issues --- .gitignore | 2 + CHANGELOG.md | 7 +++ Makefile | 62 +++++++++++++------ example.tfrc | 9 +++ ...ource_virtual_environment_cluster_alias.tf | 6 +- ...rce_virtual_environment_cluster_aliases.tf | 8 +-- ...a_source_virtual_environment_datastores.tf | 22 +++---- .../data_source_virtual_environment_dns.tf | 6 +- .../data_source_virtual_environment_group.tf | 8 +-- .../data_source_virtual_environment_groups.tf | 6 +- .../data_source_virtual_environment_hosts.tf | 10 +-- .../data_source_virtual_environment_nodes.tf | 18 +++--- .../data_source_virtual_environment_pool.tf | 8 +-- .../data_source_virtual_environment_pools.tf | 8 +-- .../data_source_virtual_environment_role.tf | 6 +- .../data_source_virtual_environment_roles.tf | 8 +-- .../data_source_virtual_environment_time.tf | 12 ++-- .../data_source_virtual_environment_user.tf | 22 +++---- .../data_source_virtual_environment_users.tf | 20 +++--- ...data_source_virtual_environment_version.tf | 12 ++-- example/main.tf | 8 +++ ...ource_virtual_environemnt_cluster_alias.tf | 10 +-- ...esource_virtual_environment_certificate.tf | 28 ++++----- ...ource_virtual_environment_cluster_ipset.tf | 32 +++++----- .../resource_virtual_environment_container.tf | 16 ++--- example/resource_virtual_environment_dns.tf | 6 +- example/resource_virtual_environment_file.tf | 48 +++++++------- example/resource_virtual_environment_group.tf | 10 +-- example/resource_virtual_environment_hosts.tf | 16 ++--- example/resource_virtual_environment_pool.tf | 6 +- example/resource_virtual_environment_role.tf | 4 +- example/resource_virtual_environment_time.tf | 14 ++--- example/resource_virtual_environment_user.tf | 22 +++---- example/resource_virtual_environment_vm.tf | 32 +++++----- example/ssh.tf | 4 +- example/{provider.tf => variables.tf} | 15 +---- example/versions.tf | 8 ++- 37 files changed, 291 insertions(+), 248 deletions(-) create mode 100644 example.tfrc create mode 100644 example/main.tf rename example/{provider.tf => variables.tf} (57%) diff --git a/.gitignore b/.gitignore index 3f913c16..43018296 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ autogenerated/ bin/ +cache/ dist/ modules-dev/ @@ -20,6 +21,7 @@ modules-dev/ *.dll *.exe *.iml +*.lock.hcl *.log *.test *.tfplan diff --git a/CHANGELOG.md b/CHANGELOG.md index 991f28c6..78415197 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## v0.5.0 (UNRELEASED) + +OTHER: + +* provider/example: Remove support for Terraform v0.11 and older +* provider/makefile: Update to use plugin caching to support local builds + ## v0.4.1 OTHER: diff --git a/Makefile b/Makefile index c043ed4b..26a6d6b0 100644 --- a/Makefile +++ b/Makefile @@ -3,13 +3,13 @@ NAME=$$(grep TerraformProviderName proxmoxtf/version.go | grep -o -e 'terraform- TARGETS=darwin linux windows TERRAFORM_PLUGIN_EXTENSION= VERSION=$$(grep TerraformProviderVersion proxmoxtf/version.go | grep -o -e '[0-9]\.[0-9]\.[0-9]') +VERSION_EXAMPLE=9999.0.0 ifeq ($(OS),Windows_NT) - TERRAFORM_CACHE_DIRECTORY=$$(cygpath -u "$(APPDATA)")/terraform.d/plugins TERRAFORM_PLATFORM=windows_amd64 + TERRAFORM_PLUGIN_CACHE_DIRECTORY=$$(cygpath -u "$(shell pwd -P)")/cache/plugins TERRAFORM_PLUGIN_EXTENSION=.exe else - TERRAFORM_CACHE_DIRECTORY=$(HOME)/terraform.d/plugins UNAME_S=$$(shell uname -s) ifeq ($(UNAME_S),Darwin) @@ -17,36 +17,58 @@ else else TERRAFORM_PLATFORM=linux_amd64 endif + + TERRAFORM_PLUGIN_CACHE_DIRECTORY=$(shell pwd -P)/cache/plugins endif -TERRAFORM_PLUGIN_DIRECTORY=$(TERRAFORM_CACHE_DIRECTORY)/terraform.danitso.com/provider/proxmox/$(VERSION)/$(TERRAFORM_PLATFORM) +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_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) default: build build: - go build -o "bin/$(NAME)_v$(VERSION)-custom_x4" - -example: example-init example-apply example-apply example-destroy - -example-apply: - cd ./example && terraform apply -auto-approve - -example-destroy: - cd ./example && terraform destroy -auto-approve - -example-init: - rm -f "example/$(NAME)_v"* - go build -o "example/$(NAME)_v$(VERSION)-custom_x4" - mkdir -p "$(TERRAFORM_PLUGIN_DIRECTORY)" rm -f "$(TERRAFORM_PLUGIN_EXECUTABLE)" - cp "example/$(NAME)_v$(VERSION)-custom_x4" "$(TERRAFORM_PLUGIN_EXECUTABLE)" + go build -o "$(TERRAFORM_PLUGIN_EXECUTABLE)" - cd ./example && terraform init +example: example-build example-init example-apply example-apply example-destroy + +example-apply: + export TF_CLI_CONFIG_FILE="$(shell pwd -P)/example.tfrc" \ + && export TF_DISABLE_CHECKPOINT="true" \ + && export TF_PLUGIN_CACHE_DIR="$(TERRAFORM_PLUGIN_CACHE_DIRECTORY)" \ + && cd ./example \ + && terraform apply -auto-approve + +example-build: + mkdir -p "$(TERRAFORM_PLUGIN_DIRECTORY_EXAMPLE)" + rm -f "$(TERRAFORM_PLUGIN_EXECUTABLE_EXAMPLE)" + go build -o "$(TERRAFORM_PLUGIN_EXECUTABLE_EXAMPLE)" + +example-destroy: + export TF_CLI_CONFIG_FILE="$(shell pwd -P)/example.tfrc" \ + && export TF_DISABLE_CHECKPOINT="true" \ + && export TF_PLUGIN_CACHE_DIR="$(TERRAFORM_PLUGIN_CACHE_DIRECTORY)" \ + && cd ./example \ + && terraform destroy -auto-approve + +example-init: + export TF_CLI_CONFIG_FILE="$(shell pwd -P)/example.tfrc" \ + && export TF_DISABLE_CHECKPOINT="true" \ + && export TF_PLUGIN_CACHE_DIR="$(TERRAFORM_PLUGIN_CACHE_DIRECTORY)" \ + && cd ./example \ + && rm -f .terraform.lock.hcl \ + && terraform init \ + -verify-plugins=false example-plan: - cd ./example && terraform plan + export TF_CLI_CONFIG_FILE="$(shell pwd -P)/example.tfrc" \ + && export TF_DISABLE_CHECKPOINT="true" \ + && export TF_PLUGIN_CACHE_DIR="$(TERRAFORM_PLUGIN_CACHE_DIRECTORY)" \ + && cd ./example \ + && terraform plan fmt: gofmt -s -w $(GOFMT_FILES) diff --git a/example.tfrc b/example.tfrc new file mode 100644 index 00000000..3fe923ac --- /dev/null +++ b/example.tfrc @@ -0,0 +1,9 @@ +provider_installation { + filesystem_mirror { + path = "../cache/plugins" + include = ["registry.terraform.io/danitso/proxmox"] + } + direct { + exclude = ["registry.terraform.io/danitso/proxmox"] + } +} diff --git a/example/data_source_virtual_environment_cluster_alias.tf b/example/data_source_virtual_environment_cluster_alias.tf index 946225e0..20e14b25 100644 --- a/example/data_source_virtual_environment_cluster_alias.tf +++ b/example/data_source_virtual_environment_cluster_alias.tf @@ -1,7 +1,9 @@ data "proxmox_virtual_environment_cluster_alias" "example" { - name = "example" + depends_on = [proxmox_virtual_environment_cluster_alias.example] + + name = proxmox_virtual_environment_cluster_alias.example.name } output "data_proxmox_virtual_environment_cluster_alias_example_cidr" { - value = proxmox_virtual_environment_cluster_alias.example.cidr + value = proxmox_virtual_environment_cluster_alias.example.cidr } diff --git a/example/data_source_virtual_environment_cluster_aliases.tf b/example/data_source_virtual_environment_cluster_aliases.tf index f7a0308a..8333f2c8 100644 --- a/example/data_source_virtual_environment_cluster_aliases.tf +++ b/example/data_source_virtual_environment_cluster_aliases.tf @@ -1,9 +1,9 @@ data "proxmox_virtual_environment_cluster_aliases" "example" { - depends_on = ["proxmox_virtual_environment_cluster_alias.example"] + depends_on = [proxmox_virtual_environment_cluster_alias.example] } output "data_proxmox_virtual_environment_cluster_aliases" { - value = "${map( - "alias_ids", data.proxmox_virtual_environment_cluster_aliases.example.alias_ids, - )}" + value = { + "alias_ids" = data.proxmox_virtual_environment_cluster_aliases.example.alias_ids + } } diff --git a/example/data_source_virtual_environment_datastores.tf b/example/data_source_virtual_environment_datastores.tf index db9a52bd..6a159ba2 100644 --- a/example/data_source_virtual_environment_datastores.tf +++ b/example/data_source_virtual_environment_datastores.tf @@ -1,43 +1,43 @@ data "proxmox_virtual_environment_datastores" "example" { - node_name = "${data.proxmox_virtual_environment_nodes.example.names[0]}" + node_name = data.proxmox_virtual_environment_nodes.example.names[0] } output "data_proxmox_virtual_environment_datastores_example_active" { - value = "${data.proxmox_virtual_environment_datastores.example.active}" + value = data.proxmox_virtual_environment_datastores.example.active } output "data_proxmox_virtual_environment_datastores_example_content_types" { - value = "${data.proxmox_virtual_environment_datastores.example.content_types}" + value = data.proxmox_virtual_environment_datastores.example.content_types } output "data_proxmox_virtual_environment_datastores_example_datastore_ids" { - value = "${data.proxmox_virtual_environment_datastores.example.datastore_ids}" + value = data.proxmox_virtual_environment_datastores.example.datastore_ids } output "data_proxmox_virtual_environment_datastores_example_enabled" { - value = "${data.proxmox_virtual_environment_datastores.example.enabled}" + value = data.proxmox_virtual_environment_datastores.example.enabled } output "data_proxmox_virtual_environment_datastores_example_node_name" { - value = "${data.proxmox_virtual_environment_datastores.example.node_name}" + value = data.proxmox_virtual_environment_datastores.example.node_name } output "data_proxmox_virtual_environment_datastores_example_shared" { - value = "${data.proxmox_virtual_environment_datastores.example.shared}" + value = data.proxmox_virtual_environment_datastores.example.shared } output "data_proxmox_virtual_environment_datastores_example_space_available" { - value = "${data.proxmox_virtual_environment_datastores.example.space_available}" + value = data.proxmox_virtual_environment_datastores.example.space_available } output "data_proxmox_virtual_environment_datastores_example_space_total" { - value = "${data.proxmox_virtual_environment_datastores.example.space_total}" + value = data.proxmox_virtual_environment_datastores.example.space_total } output "data_proxmox_virtual_environment_datastores_example_space_used" { - value = "${data.proxmox_virtual_environment_datastores.example.space_used}" + value = data.proxmox_virtual_environment_datastores.example.space_used } output "data_proxmox_virtual_environment_datastores_example_types" { - value = "${data.proxmox_virtual_environment_datastores.example.types}" + value = data.proxmox_virtual_environment_datastores.example.types } diff --git a/example/data_source_virtual_environment_dns.tf b/example/data_source_virtual_environment_dns.tf index 120d47ca..d0c3387b 100644 --- a/example/data_source_virtual_environment_dns.tf +++ b/example/data_source_virtual_environment_dns.tf @@ -1,11 +1,11 @@ data "proxmox_virtual_environment_dns" "example" { - node_name = "${data.proxmox_virtual_environment_nodes.example.names[0]}" + node_name = data.proxmox_virtual_environment_nodes.example.names[0] } output "data_proxmox_virtual_environment_dns_example_domain" { - value = "${data.proxmox_virtual_environment_dns.example.domain}" + value = data.proxmox_virtual_environment_dns.example.domain } output "data_proxmox_virtual_environment_dns_example_servers" { - value = "${data.proxmox_virtual_environment_dns.example.servers}" + value = data.proxmox_virtual_environment_dns.example.servers } diff --git a/example/data_source_virtual_environment_group.tf b/example/data_source_virtual_environment_group.tf index 0aa96c08..d0dddb03 100644 --- a/example/data_source_virtual_environment_group.tf +++ b/example/data_source_virtual_environment_group.tf @@ -1,15 +1,15 @@ data "proxmox_virtual_environment_group" "example" { - group_id = "${proxmox_virtual_environment_group.example.id}" + group_id = proxmox_virtual_environment_group.example.id } output "data_proxmox_virtual_environment_group_example_acl" { - value = "${data.proxmox_virtual_environment_group.example.acl}" + value = data.proxmox_virtual_environment_group.example.acl } output "data_proxmox_virtual_environment_group_example_comment" { - value = "${data.proxmox_virtual_environment_group.example.comment}" + value = data.proxmox_virtual_environment_group.example.comment } output "data_proxmox_virtual_environment_group_example_members" { - value = "${data.proxmox_virtual_environment_group.example.members}" + value = data.proxmox_virtual_environment_group.example.members } diff --git a/example/data_source_virtual_environment_groups.tf b/example/data_source_virtual_environment_groups.tf index 89ae8b3b..f02a2b95 100644 --- a/example/data_source_virtual_environment_groups.tf +++ b/example/data_source_virtual_environment_groups.tf @@ -1,10 +1,10 @@ data "proxmox_virtual_environment_groups" "example" { - depends_on = ["proxmox_virtual_environment_group.example"] + depends_on = [proxmox_virtual_environment_group.example] } output "data_proxmox_virtual_environment_groups_example" { - value = "${map( + value = map( "comments", data.proxmox_virtual_environment_groups.example.comments, "group_ids", data.proxmox_virtual_environment_groups.example.group_ids, - )}" + ) } diff --git a/example/data_source_virtual_environment_hosts.tf b/example/data_source_virtual_environment_hosts.tf index 3f16d12d..f28cc177 100644 --- a/example/data_source_virtual_environment_hosts.tf +++ b/example/data_source_virtual_environment_hosts.tf @@ -1,19 +1,19 @@ data "proxmox_virtual_environment_hosts" "example" { - node_name = "${data.proxmox_virtual_environment_nodes.example.names[0]}" + node_name = data.proxmox_virtual_environment_nodes.example.names[0] } output "data_proxmox_virtual_environment_hosts_example_addresses" { - value = "${data.proxmox_virtual_environment_hosts.example.addresses}" + value = data.proxmox_virtual_environment_hosts.example.addresses } output "data_proxmox_virtual_environment_hosts_example_digest" { - value = "${data.proxmox_virtual_environment_hosts.example.digest}" + value = data.proxmox_virtual_environment_hosts.example.digest } output "data_proxmox_virtual_environment_hosts_example_entries" { - value = "${data.proxmox_virtual_environment_hosts.example.entries}" + value = data.proxmox_virtual_environment_hosts.example.entries } output "data_proxmox_virtual_environment_hosts_example_hostnames" { - value = "${data.proxmox_virtual_environment_hosts.example.hostnames}" + value = data.proxmox_virtual_environment_hosts.example.hostnames } diff --git a/example/data_source_virtual_environment_nodes.tf b/example/data_source_virtual_environment_nodes.tf index 2a1b5b1a..33a5bfb7 100644 --- a/example/data_source_virtual_environment_nodes.tf +++ b/example/data_source_virtual_environment_nodes.tf @@ -1,37 +1,37 @@ data "proxmox_virtual_environment_nodes" "example" {} output "data_proxmox_virtual_environment_nodes_example_cpu_count" { - value = "${data.proxmox_virtual_environment_nodes.example.cpu_count}" + value = data.proxmox_virtual_environment_nodes.example.cpu_count } output "data_proxmox_virtual_environment_nodes_example_cpu_utilization" { - value = "${data.proxmox_virtual_environment_nodes.example.cpu_utilization}" + value = data.proxmox_virtual_environment_nodes.example.cpu_utilization } output "data_proxmox_virtual_environment_nodes_example_memory_available" { - value = "${data.proxmox_virtual_environment_nodes.example.memory_available}" + value = data.proxmox_virtual_environment_nodes.example.memory_available } output "data_proxmox_virtual_environment_nodes_example_memory_used" { - value = "${data.proxmox_virtual_environment_nodes.example.memory_used}" + value = data.proxmox_virtual_environment_nodes.example.memory_used } output "data_proxmox_virtual_environment_nodes_example_names" { - value = "${data.proxmox_virtual_environment_nodes.example.names}" + value = data.proxmox_virtual_environment_nodes.example.names } output "data_proxmox_virtual_environment_nodes_example_online" { - value = "${data.proxmox_virtual_environment_nodes.example.online}" + value = data.proxmox_virtual_environment_nodes.example.online } output "data_proxmox_virtual_environment_nodes_example_ssl_fingerprints" { - value = "${data.proxmox_virtual_environment_nodes.example.ssl_fingerprints}" + value = data.proxmox_virtual_environment_nodes.example.ssl_fingerprints } output "data_proxmox_virtual_environment_nodes_example_support_levels" { - value = "${data.proxmox_virtual_environment_nodes.example.support_levels}" + value = data.proxmox_virtual_environment_nodes.example.support_levels } output "data_proxmox_virtual_environment_nodes_example_uptime" { - value = "${data.proxmox_virtual_environment_nodes.example.uptime}" + value = data.proxmox_virtual_environment_nodes.example.uptime } diff --git a/example/data_source_virtual_environment_pool.tf b/example/data_source_virtual_environment_pool.tf index ad451464..ab5dbc60 100644 --- a/example/data_source_virtual_environment_pool.tf +++ b/example/data_source_virtual_environment_pool.tf @@ -1,15 +1,15 @@ data "proxmox_virtual_environment_pool" "example" { - pool_id = "${proxmox_virtual_environment_pool.example.id}" + pool_id = proxmox_virtual_environment_pool.example.id } output "data_proxmox_virtual_environment_pool_example_comment" { - value = "${data.proxmox_virtual_environment_pool.example.comment}" + value = data.proxmox_virtual_environment_pool.example.comment } output "data_proxmox_virtual_environment_pool_example_members" { - value = "${data.proxmox_virtual_environment_pool.example.members}" + value = data.proxmox_virtual_environment_pool.example.members } output "data_proxmox_virtual_environment_pool_example_pool_id" { - value = "${data.proxmox_virtual_environment_pool.example.id}" + value = data.proxmox_virtual_environment_pool.example.id } diff --git a/example/data_source_virtual_environment_pools.tf b/example/data_source_virtual_environment_pools.tf index 5a285ed0..141d39e2 100644 --- a/example/data_source_virtual_environment_pools.tf +++ b/example/data_source_virtual_environment_pools.tf @@ -1,9 +1,9 @@ data "proxmox_virtual_environment_pools" "example" { - depends_on = ["proxmox_virtual_environment_pool.example"] + depends_on = [proxmox_virtual_environment_pool.example] } output "data_proxmox_virtual_environment_pools_example" { - value = "${map( - "pool_ids", data.proxmox_virtual_environment_pools.example.pool_ids, - )}" + value = { + pool_ids = data.proxmox_virtual_environment_pools.example.pool_ids + } } diff --git a/example/data_source_virtual_environment_role.tf b/example/data_source_virtual_environment_role.tf index c461fa38..4a8de985 100644 --- a/example/data_source_virtual_environment_role.tf +++ b/example/data_source_virtual_environment_role.tf @@ -1,11 +1,11 @@ data "proxmox_virtual_environment_role" "example" { - role_id = "${proxmox_virtual_environment_role.example.id}" + role_id = proxmox_virtual_environment_role.example.id } output "data_proxmox_virtual_environment_role_example_privileges" { - value = "${data.proxmox_virtual_environment_role.example.privileges}" + value = data.proxmox_virtual_environment_role.example.privileges } output "data_proxmox_virtual_environment_role_example_role_id" { - value = "${data.proxmox_virtual_environment_role.example.id}" + value = data.proxmox_virtual_environment_role.example.id } diff --git a/example/data_source_virtual_environment_roles.tf b/example/data_source_virtual_environment_roles.tf index 74908540..6df9b857 100644 --- a/example/data_source_virtual_environment_roles.tf +++ b/example/data_source_virtual_environment_roles.tf @@ -1,15 +1,15 @@ data "proxmox_virtual_environment_roles" "example" { - depends_on = ["proxmox_virtual_environment_role.example"] + depends_on = [proxmox_virtual_environment_role.example] } output "data_proxmox_virtual_environment_roles_example_privileges" { - value = "${data.proxmox_virtual_environment_roles.example.privileges}" + value = data.proxmox_virtual_environment_roles.example.privileges } output "data_proxmox_virtual_environment_roles_example_role_ids" { - value = "${data.proxmox_virtual_environment_roles.example.role_ids}" + value = data.proxmox_virtual_environment_roles.example.role_ids } output "data_proxmox_virtual_environment_roles_example_special" { - value = "${data.proxmox_virtual_environment_roles.example.special}" + value = data.proxmox_virtual_environment_roles.example.special } diff --git a/example/data_source_virtual_environment_time.tf b/example/data_source_virtual_environment_time.tf index cdbdd8a1..ccc7af42 100644 --- a/example/data_source_virtual_environment_time.tf +++ b/example/data_source_virtual_environment_time.tf @@ -1,11 +1,11 @@ data "proxmox_virtual_environment_time" "example" { - node_name = "${data.proxmox_virtual_environment_nodes.example.names[0]}" + node_name = data.proxmox_virtual_environment_nodes.example.names[0] } output "data_proxmox_virtual_environment_time" { - value = "${map( - "local_time", data.proxmox_virtual_environment_time.example.local_time, - "time_zone", data.proxmox_virtual_environment_time.example.time_zone, - "utc_time", data.proxmox_virtual_environment_time.example.utc_time, - )}" + value = { + local_time = data.proxmox_virtual_environment_time.example.local_time + time_zone = data.proxmox_virtual_environment_time.example.time_zone + utc_time = data.proxmox_virtual_environment_time.example.utc_time + } } diff --git a/example/data_source_virtual_environment_user.tf b/example/data_source_virtual_environment_user.tf index fd916697..0a5b42c8 100644 --- a/example/data_source_virtual_environment_user.tf +++ b/example/data_source_virtual_environment_user.tf @@ -1,43 +1,43 @@ data "proxmox_virtual_environment_user" "example" { - user_id = "${proxmox_virtual_environment_user.example.id}" + user_id = proxmox_virtual_environment_user.example.id } output "data_proxmox_virtual_environment_user_example_acl" { - value = "${data.proxmox_virtual_environment_user.example.acl}" + value = data.proxmox_virtual_environment_user.example.acl } output "data_proxmox_virtual_environment_user_example_comment" { - value = "${data.proxmox_virtual_environment_user.example.comment}" + value = data.proxmox_virtual_environment_user.example.comment } output "data_proxmox_virtual_environment_user_example_email" { - value = "${data.proxmox_virtual_environment_user.example.email}" + value = data.proxmox_virtual_environment_user.example.email } output "data_proxmox_virtual_environment_user_example_enabled" { - value = "${data.proxmox_virtual_environment_user.example.enabled}" + value = data.proxmox_virtual_environment_user.example.enabled } output "data_proxmox_virtual_environment_user_example_expiration_date" { - value = "${data.proxmox_virtual_environment_user.example.expiration_date}" + value = data.proxmox_virtual_environment_user.example.expiration_date } output "data_proxmox_virtual_environment_user_example_first_name" { - value = "${data.proxmox_virtual_environment_user.example.first_name}" + value = data.proxmox_virtual_environment_user.example.first_name } output "data_proxmox_virtual_environment_user_example_groups" { - value = "${data.proxmox_virtual_environment_user.example.groups}" + value = data.proxmox_virtual_environment_user.example.groups } output "data_proxmox_virtual_environment_user_example_keys" { - value = "${data.proxmox_virtual_environment_user.example.keys}" + value = data.proxmox_virtual_environment_user.example.keys } output "data_proxmox_virtual_environment_user_example_last_name" { - value = "${data.proxmox_virtual_environment_user.example.last_name}" + value = data.proxmox_virtual_environment_user.example.last_name } output "data_proxmox_virtual_environment_user_example_user_id" { - value = "${data.proxmox_virtual_environment_user.example.id}" + value = data.proxmox_virtual_environment_user.example.id } diff --git a/example/data_source_virtual_environment_users.tf b/example/data_source_virtual_environment_users.tf index ebbe7dfa..a4933403 100644 --- a/example/data_source_virtual_environment_users.tf +++ b/example/data_source_virtual_environment_users.tf @@ -1,39 +1,39 @@ data "proxmox_virtual_environment_users" "example" { - depends_on = ["proxmox_virtual_environment_user.example"] + depends_on = [proxmox_virtual_environment_user.example] } output "data_proxmox_virtual_environment_users_example_comments" { - value = "${data.proxmox_virtual_environment_users.example.comments}" + value = data.proxmox_virtual_environment_users.example.comments } output "data_proxmox_virtual_environment_users_example_emails" { - value = "${data.proxmox_virtual_environment_users.example.emails}" + value = data.proxmox_virtual_environment_users.example.emails } output "data_proxmox_virtual_environment_users_example_enabled" { - value = "${data.proxmox_virtual_environment_users.example.enabled}" + value = data.proxmox_virtual_environment_users.example.enabled } output "data_proxmox_virtual_environment_users_example_expiration_dates" { - value = "${data.proxmox_virtual_environment_users.example.expiration_dates}" + value = data.proxmox_virtual_environment_users.example.expiration_dates } output "data_proxmox_virtual_environment_users_example_first_names" { - value = "${data.proxmox_virtual_environment_users.example.first_names}" + value = data.proxmox_virtual_environment_users.example.first_names } output "data_proxmox_virtual_environment_users_example_groups" { - value = "${data.proxmox_virtual_environment_users.example.groups}" + value = data.proxmox_virtual_environment_users.example.groups } output "data_proxmox_virtual_environment_users_example_keys" { - value = "${data.proxmox_virtual_environment_users.example.keys}" + value = data.proxmox_virtual_environment_users.example.keys } output "data_proxmox_virtual_environment_users_example_last_names" { - value = "${data.proxmox_virtual_environment_users.example.last_names}" + value = data.proxmox_virtual_environment_users.example.last_names } output "data_proxmox_virtual_environment_users_example_user_ids" { - value = "${data.proxmox_virtual_environment_users.example.user_ids}" + value = data.proxmox_virtual_environment_users.example.user_ids } diff --git a/example/data_source_virtual_environment_version.tf b/example/data_source_virtual_environment_version.tf index 5ecdff22..d10f9196 100644 --- a/example/data_source_virtual_environment_version.tf +++ b/example/data_source_virtual_environment_version.tf @@ -1,10 +1,10 @@ data "proxmox_virtual_environment_version" "example" {} output "data_proxmox_virtual_environment_version" { - value = "${map( - "keyboard_layout", data.proxmox_virtual_environment_version.example.keyboard_layout, - "release", data.proxmox_virtual_environment_version.example.release, - "repository_id", data.proxmox_virtual_environment_version.example.repository_id, - "version", data.proxmox_virtual_environment_version.example.version, - )}" + value = { + keyboard_layout = data.proxmox_virtual_environment_version.example.keyboard_layout + release = data.proxmox_virtual_environment_version.example.release + repository_id = data.proxmox_virtual_environment_version.example.repository_id + version = data.proxmox_virtual_environment_version.example.version + } } diff --git a/example/main.tf b/example/main.tf new file mode 100644 index 00000000..a50b4cad --- /dev/null +++ b/example/main.tf @@ -0,0 +1,8 @@ +provider "proxmox" { + virtual_environment { + endpoint = var.virtual_environment_endpoint + username = var.virtual_environment_username + password = var.virtual_environment_password + insecure = true + } +} diff --git a/example/resource_virtual_environemnt_cluster_alias.tf b/example/resource_virtual_environemnt_cluster_alias.tf index 34170be4..762c70f9 100644 --- a/example/resource_virtual_environemnt_cluster_alias.tf +++ b/example/resource_virtual_environemnt_cluster_alias.tf @@ -1,13 +1,13 @@ resource "proxmox_virtual_environment_cluster_alias" "example" { - name = "local_network" - cidr = "192.168.0.0/23" - comment = "Managed by Terraform" + name = "example" + cidr = "192.168.0.0/23" + comment = "Managed by Terraform" } output "proxmox_virtual_environment_cluster_alias_example_name" { - value = "${proxmox_virtual_environment_cluster_alias.example.name}" + value = proxmox_virtual_environment_cluster_alias.example.name } output "proxmox_virtual_environment_cluster_alias_example_cidr" { - value = "${proxmox_virtual_environment_cluster_alias.example.cidr}" + value = proxmox_virtual_environment_cluster_alias.example.cidr } diff --git a/example/resource_virtual_environment_certificate.tf b/example/resource_virtual_environment_certificate.tf index 53423462..b03d8c68 100644 --- a/example/resource_virtual_environment_certificate.tf +++ b/example/resource_virtual_environment_certificate.tf @@ -1,7 +1,7 @@ resource "proxmox_virtual_environment_certificate" "example" { - certificate = "${tls_self_signed_cert.proxmox_virtual_environment_certificate.cert_pem}" - node_name = "${data.proxmox_virtual_environment_nodes.example.names[0]}" - private_key = "${tls_private_key.proxmox_virtual_environment_certificate.private_key_pem}" + certificate = tls_self_signed_cert.proxmox_virtual_environment_certificate.cert_pem + node_name = data.proxmox_virtual_environment_nodes.example.names[0] + private_key = tls_private_key.proxmox_virtual_environment_certificate.private_key_pem } resource "tls_private_key" "proxmox_virtual_environment_certificate" { @@ -10,8 +10,8 @@ resource "tls_private_key" "proxmox_virtual_environment_certificate" { } resource "tls_self_signed_cert" "proxmox_virtual_environment_certificate" { - key_algorithm = "${tls_private_key.proxmox_virtual_environment_certificate.algorithm}" - private_key_pem = "${tls_private_key.proxmox_virtual_environment_certificate.private_key_pem}" + key_algorithm = tls_private_key.proxmox_virtual_environment_certificate.algorithm + private_key_pem = tls_private_key.proxmox_virtual_environment_certificate.private_key_pem subject { common_name = "example.com" @@ -28,37 +28,37 @@ resource "tls_self_signed_cert" "proxmox_virtual_environment_certificate" { } output "resource_proxmox_virtual_environment_certificate_example_expiration_date" { - value = "${proxmox_virtual_environment_certificate.example.expiration_date}" + value = proxmox_virtual_environment_certificate.example.expiration_date } output "resource_proxmox_virtual_environment_certificate_example_file_name" { - value = "${proxmox_virtual_environment_certificate.example.file_name}" + value = proxmox_virtual_environment_certificate.example.file_name } output "resource_proxmox_virtual_environment_certificate_example_issuer" { - value = "${proxmox_virtual_environment_certificate.example.issuer}" + value = proxmox_virtual_environment_certificate.example.issuer } output "resource_proxmox_virtual_environment_certificate_example_public_key_size" { - value = "${proxmox_virtual_environment_certificate.example.public_key_size}" + value = proxmox_virtual_environment_certificate.example.public_key_size } output "resource_proxmox_virtual_environment_certificate_example_public_key_type" { - value = "${proxmox_virtual_environment_certificate.example.public_key_type}" + value = proxmox_virtual_environment_certificate.example.public_key_type } output "resource_proxmox_virtual_environment_certificate_example_ssl_fingerprint" { - value = "${proxmox_virtual_environment_certificate.example.ssl_fingerprint}" + value = proxmox_virtual_environment_certificate.example.ssl_fingerprint } output "resource_proxmox_virtual_environment_certificate_example_start_date" { - value = "${proxmox_virtual_environment_certificate.example.start_date}" + value = proxmox_virtual_environment_certificate.example.start_date } output "resource_proxmox_virtual_environment_certificate_example_subject" { - value = "${proxmox_virtual_environment_certificate.example.subject}" + value = proxmox_virtual_environment_certificate.example.subject } output "resource_proxmox_virtual_environment_certificate_example_subject_alternative_names" { - value = "${proxmox_virtual_environment_certificate.example.subject_alternative_names}" + value = proxmox_virtual_environment_certificate.example.subject_alternative_names } diff --git a/example/resource_virtual_environment_cluster_ipset.tf b/example/resource_virtual_environment_cluster_ipset.tf index 5d81f53c..11703ed5 100644 --- a/example/resource_virtual_environment_cluster_ipset.tf +++ b/example/resource_virtual_environment_cluster_ipset.tf @@ -1,25 +1,25 @@ resource "proxmox_virtual_environment_cluster_ipset" "example" { - name = "local_network" - comment = "Managed by Terraform" + name = "local_network" + comment = "Managed by Terraform" - cidr { - name = "192.168.0.0/23" - comment = "Local network 1" - } + cidr { + name = "192.168.0.0/23" + comment = "Local network 1" + } - cidr { - name = "192.168.0.1" - comment = "Server 1" - nomatch = true - } + cidr { + name = "192.168.0.1" + comment = "Server 1" + nomatch = true + } - cidr { - name = "192.168.2.1" - comment = "Server 1" - } + cidr { + name = "192.168.2.1" + comment = "Server 1" + } } output "resource_proxmox_virtual_environment_cluster_ipset" { - value = "${proxmox_virtual_environment_cluster_ipset.example.name}" + value = proxmox_virtual_environment_cluster_ipset.example.name } diff --git a/example/resource_virtual_environment_container.tf b/example/resource_virtual_environment_container.tf index 93d99722..9a158de3 100644 --- a/example/resource_virtual_environment_container.tf +++ b/example/resource_virtual_environment_container.tf @@ -15,7 +15,7 @@ resource "proxmox_virtual_environment_container" "example_template" { } user_account { - keys = ["${trimspace(tls_private_key.example.public_key_openssh)}"] + keys = [trimspace(tls_private_key.example.public_key_openssh)] password = "example" } } @@ -24,14 +24,14 @@ resource "proxmox_virtual_environment_container" "example_template" { name = "veth0" } - node_name = "${data.proxmox_virtual_environment_nodes.example.names[0]}" + node_name = data.proxmox_virtual_environment_nodes.example.names[0] operating_system { - template_file_id = "${proxmox_virtual_environment_file.ubuntu_container_template.id}" + template_file_id = proxmox_virtual_environment_file.ubuntu_container_template.id type = "ubuntu" } - pool_id = "${proxmox_virtual_environment_pool.example.id}" + pool_id = proxmox_virtual_environment_pool.example.id template = true vm_id = 2042 } @@ -45,11 +45,11 @@ resource "proxmox_virtual_environment_container" "example" { hostname = "terraform-provider-proxmox-example-lxc" } - node_name = "${data.proxmox_virtual_environment_nodes.example.names[0]}" - pool_id = "${proxmox_virtual_environment_pool.example.id}" - vm_id = 2043 + node_name = data.proxmox_virtual_environment_nodes.example.names[0] + pool_id = proxmox_virtual_environment_pool.example.id + vm_id = 2043 } output "resource_proxmox_virtual_environment_container_example_id" { - value = "${proxmox_virtual_environment_container.example.id}" + value = proxmox_virtual_environment_container.example.id } diff --git a/example/resource_virtual_environment_dns.tf b/example/resource_virtual_environment_dns.tf index 83b3f4d5..39aef355 100644 --- a/example/resource_virtual_environment_dns.tf +++ b/example/resource_virtual_environment_dns.tf @@ -1,5 +1,5 @@ resource "proxmox_virtual_environment_dns" "example" { - domain = "${data.proxmox_virtual_environment_dns.example.domain}" - node_name = "${data.proxmox_virtual_environment_nodes.example.names[0]}" - servers = "${data.proxmox_virtual_environment_dns.example.servers}" + domain = data.proxmox_virtual_environment_dns.example.domain + node_name = data.proxmox_virtual_environment_nodes.example.names[0] + servers = data.proxmox_virtual_environment_dns.example.servers } diff --git a/example/resource_virtual_environment_file.tf b/example/resource_virtual_environment_file.tf index d233f57c..18fc37bd 100644 --- a/example/resource_virtual_environment_file.tf +++ b/example/resource_virtual_environment_file.tf @@ -4,8 +4,8 @@ resource "proxmox_virtual_environment_file" "cloud_config" { content_type = "snippets" - datastore_id = "${element(data.proxmox_virtual_environment_datastores.example.datastore_ids, index(data.proxmox_virtual_environment_datastores.example.datastore_ids, "local"))}" - node_name = "${data.proxmox_virtual_environment_datastores.example.node_name}" + datastore_id = element(data.proxmox_virtual_environment_datastores.example.datastore_ids, index(data.proxmox_virtual_environment_datastores.example.datastore_ids, "local")) + node_name = data.proxmox_virtual_environment_datastores.example.node_name source_raw { data = <