mirrors/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/bpg/terraform-provider-proxmox.git synced 2025-08-24 12:28:34 +00:00
Code

fix: missing reference to standalone terraform plugin and duplicate output names in example

Browse Source
This commit is contained in:
Dan Petersen 2021-01-02 22:48:42 +01:00
parent 550ab62a7a
commit 0fd8d3dae7
10 changed files with 59 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/data_source_virtual_environment_cluster_alias.tf
View File

@ -2,6 +2,6 @@ data "proxmox_virtual_environment_cluster_alias" "example" {
name = "example" name = "example"
} }
output "proxmox_virtual_environment_cluster_alias_example_cidr" { 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
} }

2
example/data_source_virtual_environment_cluster_aliases.tf
View File

@ -2,7 +2,7 @@ data "proxmox_virtual_environment_cluster_aliases" "example" {
depends_on = ["proxmox_virtual_environment_cluster_alias.example"] depends_on = ["proxmox_virtual_environment_cluster_alias.example"]
} }
output "proxmox_virtual_environment_cluster_aliases" { output "data_proxmox_virtual_environment_cluster_aliases" {
value = "${map( value = "${map(
"alias_ids", data.proxmox_virtual_environment_cluster_aliases.example.alias_ids, "alias_ids", data.proxmox_virtual_environment_cluster_aliases.example.alias_ids,
)}" )}"

12
proxmoxtf/data_source_virtual_environment_alias.go
View File

@ -5,16 +5,15 @@
package proxmoxtf package proxmoxtf
import ( import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
) )
const ( const (
dvDataVirtualEnvironmentClusterAliasComment = "" dvDataVirtualEnvironmentClusterAliasComment = ""
mkDataSourceVirtualEnvironmentClusterAliasName = "name"
mkDataSourceVirtualEnvironmentClusterAliasCIDR = "cidr"
mkDataSourceVirtualEnvironmentClusterAliasComment = "comment"
mkDataSourceVirtualEnvironmentClusterAliasName = "name"
mkDataSourceVirtualEnvironmentClusterAliasCIDR = "cidr"
mkDataSourceVirtualEnvironmentClusterAliasComment = "comment"
) )
func dataSourceVirtualEnvironmentClusterAlias() *schema.Resource { func dataSourceVirtualEnvironmentClusterAlias() *schema.Resource {
@ -35,7 +34,6 @@ func dataSourceVirtualEnvironmentClusterAlias() *schema.Resource {
Description: "Alias comment", Description: "Alias comment",
Computed: true, Computed: true,
}, },
}, },
Read: dataSourceVirtualEnvironmentAliasRead, Read: dataSourceVirtualEnvironmentAliasRead,
} }

6
proxmoxtf/data_source_virtual_environment_alias_test.go
View File

@ -7,7 +7,7 @@ package proxmoxtf
import ( import (
"testing" "testing"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
) )
// TestDataSourceVirtualEnvironmentAliasInstantiation tests whether the DataSourceVirtualEnvironmentAlias instance can be instantiated. // TestDataSourceVirtualEnvironmentAliasInstantiation tests whether the DataSourceVirtualEnvironmentAlias instance can be instantiated.
@ -33,8 +33,8 @@ func TestDataSourceVirtualEnvironmentAliasSchema(t *testing.T) {
}) })
testValueTypes(t, s, map[string]schema.ValueType{ testValueTypes(t, s, map[string]schema.ValueType{
mkDataSourceVirtualEnvironmentClusterAliasName: schema.TypeString, mkDataSourceVirtualEnvironmentClusterAliasName: schema.TypeString,
mkDataSourceVirtualEnvironmentClusterAliasCIDR: schema.TypeString, mkDataSourceVirtualEnvironmentClusterAliasCIDR: schema.TypeString,
mkDataSourceVirtualEnvironmentClusterAliasComment: schema.TypeString, mkDataSourceVirtualEnvironmentClusterAliasComment: schema.TypeString,
}) })
} }

4
proxmoxtf/data_source_virtual_environment_aliases.go
View File

@ -5,11 +5,11 @@
package proxmoxtf package proxmoxtf
import ( import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
) )
const ( const (
mkDataSourceVirtualEnvironmentClusterAliasesAliasIDs = "alias_ids" mkDataSourceVirtualEnvironmentClusterAliasesAliasIDs = "alias_ids"
) )
func dataSourceVirtualEnvironmentClusterAliases() *schema.Resource { func dataSourceVirtualEnvironmentClusterAliases() *schema.Resource {

2
proxmoxtf/data_source_virtual_environment_aliases_test.go
View File

@ -7,7 +7,7 @@ package proxmoxtf
import ( import (
"testing" "testing"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
) )
// TestDataSourceVirtualEnvironmentAliasesInstantiation tests whether the DataSourceVirtualEnvironmentAliases instance can be instantiated. // TestDataSourceVirtualEnvironmentAliasesInstantiation tests whether the DataSourceVirtualEnvironmentAliases instance can be instantiated.

60
proxmoxtf/resource_virtual_environment_cluster_alias.go
View File

@ -5,43 +5,44 @@
package proxmoxtf package proxmoxtf
import ( import (
"github.com/danitso/terraform-provider-proxmox/proxmox"
"github.com/hashicorp/terraform/helper/schema"
"strings" "strings"
"github.com/danitso/terraform-provider-proxmox/proxmox"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
) )
const ( const (
dvResourceVirtualEnvironmentClusterAliasComment = "" dvResourceVirtualEnvironmentClusterAliasComment = ""
mkResourceVirtualEnvironmentClusterAliasName = "name" mkResourceVirtualEnvironmentClusterAliasName = "name"
mkResourceVirtualEnvironmentClusterAliasCIDR = "cidr" mkResourceVirtualEnvironmentClusterAliasCIDR = "cidr"
mkResourceVirtualEnvironmentClusterAliasComment = "comment" mkResourceVirtualEnvironmentClusterAliasComment = "comment"
) )
func resourceVirtualEnvironmentClusterAlias() *schema.Resource { func resourceVirtualEnvironmentClusterAlias() *schema.Resource {
return &schema.Resource{ return &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
mkResourceVirtualEnvironmentClusterAliasName: { mkResourceVirtualEnvironmentClusterAliasName: {
Type: schema.TypeString, Type: schema.TypeString,
Description: "Alias name", Description: "Alias name",
Required: true, Required: true,
ForceNew: false, ForceNew: false,
}, },
mkResourceVirtualEnvironmentClusterAliasCIDR: { mkResourceVirtualEnvironmentClusterAliasCIDR: {
Type: schema.TypeString, Type: schema.TypeString,
Description: "IP/CIDR block", Description: "IP/CIDR block",
Required: true, Required: true,
ForceNew: false, ForceNew: false,
}, },
mkResourceVirtualEnvironmentClusterAliasComment: { mkResourceVirtualEnvironmentClusterAliasComment: {
Type: schema.TypeString, Type: schema.TypeString,
Description: "Alias comment", Description: "Alias comment",
Optional: true, Optional: true,
Default: dvResourceVirtualEnvironmentClusterAliasComment, Default: dvResourceVirtualEnvironmentClusterAliasComment,
}, },
}, },
Create: resourceVirtualEnvironmentClusterAliasCreate, Create: resourceVirtualEnvironmentClusterAliasCreate,
Read: resourceVirtualEnvironmentClusterAliasRead, Read: resourceVirtualEnvironmentClusterAliasRead,
Update: resourceVirtualEnvironmentClusterAliasUpdate, Update: resourceVirtualEnvironmentClusterAliasUpdate,
Delete: resourceVirtualEnvironmentClusterAliasDelete, Delete: resourceVirtualEnvironmentClusterAliasDelete,
} }
@ -61,8 +62,8 @@ func resourceVirtualEnvironmentClusterAliasCreate(d *schema.ResourceData, m inte
body := &proxmox.VirtualEnvironmentClusterAliasCreateRequestBody{ body := &proxmox.VirtualEnvironmentClusterAliasCreateRequestBody{
Comment: &comment, Comment: &comment,
Name: name, Name: name,
CIDR: cidr, CIDR: cidr,
} }
err = veClient.CreateAlias(body) err = veClient.CreateAlias(body)
@ -98,8 +99,8 @@ func resourceVirtualEnvironmentClusterAliasRead(d *schema.ResourceData, m interf
aliasMap := map[string]interface{}{ aliasMap := map[string]interface{}{
mkResourceVirtualEnvironmentClusterAliasComment: alias.Comment, mkResourceVirtualEnvironmentClusterAliasComment: alias.Comment,
mkResourceVirtualEnvironmentClusterAliasName: alias.Name, mkResourceVirtualEnvironmentClusterAliasName: alias.Name,
mkResourceVirtualEnvironmentClusterAliasCIDR: alias.CIDR, mkResourceVirtualEnvironmentClusterAliasCIDR: alias.CIDR,
} }
for key, val := range aliasMap { for key, val := range aliasMap {
@ -127,8 +128,8 @@ func resourceVirtualEnvironmentClusterAliasUpdate(d *schema.ResourceData, m inte
previousName := d.Id() previousName := d.Id()
body := &proxmox.VirtualEnvironmentClusterAliasUpdateRequestBody{ body := &proxmox.VirtualEnvironmentClusterAliasUpdateRequestBody{
ReName: newName, ReName: newName,
CIDR: cidr, CIDR: cidr,
Comment: &comment, Comment: &comment,
} }
@ -143,7 +144,6 @@ func resourceVirtualEnvironmentClusterAliasUpdate(d *schema.ResourceData, m inte
return resourceVirtualEnvironmentClusterAliasRead(d, m) return resourceVirtualEnvironmentClusterAliasRead(d, m)
} }
func resourceVirtualEnvironmentClusterAliasDelete(d *schema.ResourceData, m interface{}) error { func resourceVirtualEnvironmentClusterAliasDelete(d *schema.ResourceData, m interface{}) error {
config := m.(providerConfiguration) config := m.(providerConfiguration)
veClient, err := config.GetVEClient() veClient, err := config.GetVEClient()
@ -168,17 +168,3 @@ func resourceVirtualEnvironmentClusterAliasDelete(d *schema.ResourceData, m inte
return nil return nil
} }

8
proxmoxtf/resource_virtual_environment_cluster_alias_test.go
View File

@ -7,7 +7,7 @@ package proxmoxtf
import ( import (
"testing" "testing"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
) )
// TestResourceVirtualEnvironmentAliasInstantiation tests whether the ResourceVirtualEnvironmentAlias instance can be instantiated. // TestResourceVirtualEnvironmentAliasInstantiation tests whether the ResourceVirtualEnvironmentAlias instance can be instantiated.
@ -33,8 +33,8 @@ func TestResourceVirtualEnvironmentAliasSchema(t *testing.T) {
}) })
testValueTypes(t, s, map[string]schema.ValueType{ testValueTypes(t, s, map[string]schema.ValueType{
mkResourceVirtualEnvironmentClusterAliasName: schema.TypeString, mkResourceVirtualEnvironmentClusterAliasName: schema.TypeString,
mkResourceVirtualEnvironmentClusterAliasCIDR: schema.TypeString, mkResourceVirtualEnvironmentClusterAliasCIDR: schema.TypeString,
mkResourceVirtualEnvironmentClusterAliasComment: schema.TypeString, mkResourceVirtualEnvironmentClusterAliasComment: schema.TypeString,
}) })
} }

51
proxmoxtf/resource_virtual_environment_cluster_ipset.go
View File

@ -5,9 +5,10 @@
package proxmoxtf package proxmoxtf
import ( import (
"github.com/danitso/terraform-provider-proxmox/proxmox"
"github.com/hashicorp/terraform/helper/schema"
"strings" "strings"
"github.com/danitso/terraform-provider-proxmox/proxmox"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
) )
const ( const (
@ -25,26 +26,26 @@ func resourceVirtualEnvironmentClusterIPSet() *schema.Resource {
return &schema.Resource{ return &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
mkResourceVirtualEnvironmentClusterIPSetName: { mkResourceVirtualEnvironmentClusterIPSetName: {
Type: schema.TypeString, Type: schema.TypeString,
Description: "IPSet name", Description: "IPSet name",
Required: true, Required: true,
ForceNew: false, ForceNew: false,
}, },
mkResourceVirtualEnvironmentClusterIPSetCIDR: { mkResourceVirtualEnvironmentClusterIPSetCIDR: {
Type: schema.TypeList, Type: schema.TypeList,
Description: "List of IP or Networks", Description: "List of IP or Networks",
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
DefaultFunc: func() (interface{}, error) { DefaultFunc: func() (interface{}, error) {
return []interface{}{}, nil return []interface{}{}, nil
}, },
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
mkResourceVirtualEnvironmentClusterIPSetCIDRName: { mkResourceVirtualEnvironmentClusterIPSetCIDRName: {
Type: schema.TypeString, Type: schema.TypeString,
Description: "Network/IP specification in CIDR format", Description: "Network/IP specification in CIDR format",
Required: true, Required: true,
ForceNew: true, ForceNew: true,
}, },
mkResourceVirtualEnvironmentClusterIPSetCIDRNoMatch: { mkResourceVirtualEnvironmentClusterIPSetCIDRNoMatch: {
Type: schema.TypeBool, Type: schema.TypeBool,
@ -71,7 +72,7 @@ func resourceVirtualEnvironmentClusterIPSet() *schema.Resource {
}, },
}, },
Create: resourceVirtualEnvironmentClusterIPSetCreate, Create: resourceVirtualEnvironmentClusterIPSetCreate,
Read: resourceVirtualEnvironmentClusterIPSetRead, Read: resourceVirtualEnvironmentClusterIPSetRead,
Update: resourceVirtualEnvironmentClusterIPSetUpdate, Update: resourceVirtualEnvironmentClusterIPSetUpdate,
Delete: resourceVirtualEnvironmentClusterIPSetDelete, Delete: resourceVirtualEnvironmentClusterIPSetDelete,
} }
@ -95,11 +96,10 @@ func resourceVirtualEnvironmentClusterIPSetCreate(d *schema.ResourceData, m inte
IPSetMap := v.(map[string]interface{}) IPSetMap := v.(map[string]interface{})
IPSetObject := proxmox.VirtualEnvironmentClusterIPSetGetResponseData{} IPSetObject := proxmox.VirtualEnvironmentClusterIPSetGetResponseData{}
cidr := IPSetMap[mkResourceVirtualEnvironmentClusterIPSetCIDRName].(string) cidr := IPSetMap[mkResourceVirtualEnvironmentClusterIPSetCIDRName].(string)
noMatch := IPSetMap[mkResourceVirtualEnvironmentClusterIPSetCIDRNoMatch].(bool) noMatch := IPSetMap[mkResourceVirtualEnvironmentClusterIPSetCIDRNoMatch].(bool)
comment := IPSetMap[mkResourceVirtualEnvironmentClusterIPSetCIDRComment].(string) comment := IPSetMap[mkResourceVirtualEnvironmentClusterIPSetCIDRComment].(string)
IPSetObject.Comment = comment IPSetObject.Comment = comment
IPSetObject.CIDR = cidr IPSetObject.CIDR = cidr
@ -108,13 +108,12 @@ func resourceVirtualEnvironmentClusterIPSetCreate(d *schema.ResourceData, m inte
IPSetObject.NoMatch = &noMatchBool IPSetObject.NoMatch = &noMatchBool
} }
IPSetsArray[i] = IPSetObject IPSetsArray[i] = IPSetObject
} }
body := &proxmox.VirtualEnvironmentClusterIPSetCreateRequestBody{ body := &proxmox.VirtualEnvironmentClusterIPSetCreateRequestBody{
Comment: comment, Comment: comment,
Name: name, Name: name,
} }
err = veClient.CreateIPSet(body) err = veClient.CreateIPSet(body)
@ -167,7 +166,6 @@ func resourceVirtualEnvironmentClusterIPSetRead(d *schema.ResourceData, m interf
} }
} }
IPSet, err := veClient.GetListIPSetContent(name) IPSet, err := veClient.GetListIPSetContent(name)
if err != nil { if err != nil {
@ -199,8 +197,8 @@ func resourceVirtualEnvironmentClusterIPSetUpdate(d *schema.ResourceData, m inte
previousName := d.Id() previousName := d.Id()
body := &proxmox.VirtualEnvironmentClusterIPSetUpdateRequestBody{ body := &proxmox.VirtualEnvironmentClusterIPSetUpdateRequestBody{
ReName: previousName, ReName: previousName,
Name: newName, Name: newName,
Comment: &comment, Comment: &comment,
} }
@ -215,7 +213,6 @@ func resourceVirtualEnvironmentClusterIPSetUpdate(d *schema.ResourceData, m inte
return resourceVirtualEnvironmentClusterIPSetRead(d, m) return resourceVirtualEnvironmentClusterIPSetRead(d, m)
} }
func resourceVirtualEnvironmentClusterIPSetDelete(d *schema.ResourceData, m interface{}) error { func resourceVirtualEnvironmentClusterIPSetDelete(d *schema.ResourceData, m interface{}) error {
config := m.(providerConfiguration) config := m.(providerConfiguration)
veClient, err := config.GetVEClient() veClient, err := config.GetVEClient()
@ -257,17 +254,3 @@ func resourceVirtualEnvironmentClusterIPSetDelete(d *schema.ResourceData, m inte
return nil return nil
} }

3
proxmoxtf/resource_virtual_environment_cluster_ipset_test.go
View File

@ -5,8 +5,9 @@
package proxmoxtf package proxmoxtf
import ( import (
"github.com/hashicorp/terraform/helper/schema"
"testing" "testing"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
) )
// TestResourceVirtualEnvironmentIPSetInstantiation tests whether the resourceVirtualEnvironmentClusterIPSet // TestResourceVirtualEnvironmentIPSetInstantiation tests whether the resourceVirtualEnvironmentClusterIPSet