diff --git a/proxmoxtf/data_source_virtual_environment_datastores_test.go b/proxmoxtf/data_source_virtual_environment_datastores_test.go index 35dc07ce..e93fc483 100644 --- a/proxmoxtf/data_source_virtual_environment_datastores_test.go +++ b/proxmoxtf/data_source_virtual_environment_datastores_test.go @@ -38,27 +38,16 @@ func TestDataSourceVirtualEnvironmentDatastoresSchema(t *testing.T) { mkDataSourceVirtualEnvironmentDatastoresTypes, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentDatastoresActive, - mkDataSourceVirtualEnvironmentDatastoresContentTypes, - mkDataSourceVirtualEnvironmentDatastoresDatastoreIDs, - mkDataSourceVirtualEnvironmentDatastoresEnabled, - mkDataSourceVirtualEnvironmentDatastoresNodeName, - mkDataSourceVirtualEnvironmentDatastoresShared, - mkDataSourceVirtualEnvironmentDatastoresSpaceAvailable, - mkDataSourceVirtualEnvironmentDatastoresSpaceTotal, - mkDataSourceVirtualEnvironmentDatastoresSpaceUsed, - mkDataSourceVirtualEnvironmentDatastoresTypes, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeString, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentDatastoresActive: schema.TypeList, + mkDataSourceVirtualEnvironmentDatastoresContentTypes: schema.TypeList, + mkDataSourceVirtualEnvironmentDatastoresDatastoreIDs: schema.TypeList, + mkDataSourceVirtualEnvironmentDatastoresEnabled: schema.TypeList, + mkDataSourceVirtualEnvironmentDatastoresNodeName: schema.TypeString, + mkDataSourceVirtualEnvironmentDatastoresShared: schema.TypeList, + mkDataSourceVirtualEnvironmentDatastoresSpaceAvailable: schema.TypeList, + mkDataSourceVirtualEnvironmentDatastoresSpaceTotal: schema.TypeList, + mkDataSourceVirtualEnvironmentDatastoresSpaceUsed: schema.TypeList, + mkDataSourceVirtualEnvironmentDatastoresTypes: schema.TypeList, }) } diff --git a/proxmoxtf/data_source_virtual_environment_dns_test.go b/proxmoxtf/data_source_virtual_environment_dns_test.go index 9b6ea8ba..08248448 100644 --- a/proxmoxtf/data_source_virtual_environment_dns_test.go +++ b/proxmoxtf/data_source_virtual_environment_dns_test.go @@ -31,13 +31,9 @@ func TestDataSourceVirtualEnvironmentDNSSchema(t *testing.T) { mkDataSourceVirtualEnvironmentDNSServers, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentDNSDomain, - mkDataSourceVirtualEnvironmentDNSNodeName, - mkDataSourceVirtualEnvironmentDNSServers, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, - schema.TypeList, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentDNSDomain: schema.TypeString, + mkDataSourceVirtualEnvironmentDNSNodeName: schema.TypeString, + mkDataSourceVirtualEnvironmentDNSServers: schema.TypeList, }) } diff --git a/proxmoxtf/data_source_virtual_environment_group_test.go b/proxmoxtf/data_source_virtual_environment_group_test.go index 5f9680be..b1dc565b 100644 --- a/proxmoxtf/data_source_virtual_environment_group_test.go +++ b/proxmoxtf/data_source_virtual_environment_group_test.go @@ -33,16 +33,11 @@ func TestDataSourceVirtualEnvironmentGroupSchema(t *testing.T) { mkDataSourceVirtualEnvironmentGroupMembers, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentGroupACL, - mkDataSourceVirtualEnvironmentGroupID, - mkDataSourceVirtualEnvironmentGroupComment, - mkDataSourceVirtualEnvironmentGroupMembers, - }, []schema.ValueType{ - schema.TypeSet, - schema.TypeString, - schema.TypeString, - schema.TypeSet, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentGroupACL: schema.TypeSet, + mkDataSourceVirtualEnvironmentGroupID: schema.TypeString, + mkDataSourceVirtualEnvironmentGroupComment: schema.TypeString, + mkDataSourceVirtualEnvironmentGroupMembers: schema.TypeSet, }) aclSchema := testNestedSchemaExistence(t, s, mkDataSourceVirtualEnvironmentGroupACL) @@ -53,13 +48,9 @@ func TestDataSourceVirtualEnvironmentGroupSchema(t *testing.T) { mkDataSourceVirtualEnvironmentGroupACLRoleID, }) - testSchemaValueTypes(t, aclSchema, []string{ - mkDataSourceVirtualEnvironmentGroupACLPath, - mkDataSourceVirtualEnvironmentGroupACLPropagate, - mkDataSourceVirtualEnvironmentGroupACLRoleID, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeBool, - schema.TypeString, + testSchemaValueTypes(t, aclSchema, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentGroupACLPath: schema.TypeString, + mkDataSourceVirtualEnvironmentGroupACLPropagate: schema.TypeBool, + mkDataSourceVirtualEnvironmentGroupACLRoleID: schema.TypeString, }) } diff --git a/proxmoxtf/data_source_virtual_environment_groups_test.go b/proxmoxtf/data_source_virtual_environment_groups_test.go index 1a20bc2f..5a17c843 100644 --- a/proxmoxtf/data_source_virtual_environment_groups_test.go +++ b/proxmoxtf/data_source_virtual_environment_groups_test.go @@ -27,11 +27,8 @@ func TestDataSourceVirtualEnvironmentGroupsSchema(t *testing.T) { mkDataSourceVirtualEnvironmentGroupsGroupIDs, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentGroupsComments, - mkDataSourceVirtualEnvironmentGroupsGroupIDs, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeList, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentGroupsComments: schema.TypeList, + mkDataSourceVirtualEnvironmentGroupsGroupIDs: schema.TypeList, }) } diff --git a/proxmoxtf/data_source_virtual_environment_hosts_test.go b/proxmoxtf/data_source_virtual_environment_hosts_test.go index 75674db3..639c9ca9 100644 --- a/proxmoxtf/data_source_virtual_environment_hosts_test.go +++ b/proxmoxtf/data_source_virtual_environment_hosts_test.go @@ -33,18 +33,12 @@ func TestDataSourceVirtualEnvironmentHostsSchema(t *testing.T) { mkDataSourceVirtualEnvironmentHostsHostnames, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentHostsAddresses, - mkDataSourceVirtualEnvironmentHostsDigest, - mkDataSourceVirtualEnvironmentHostsEntries, - mkDataSourceVirtualEnvironmentHostsHostnames, - mkDataSourceVirtualEnvironmentHostsNodeName, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeString, - schema.TypeList, - schema.TypeList, - schema.TypeString, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentHostsAddresses: schema.TypeList, + mkDataSourceVirtualEnvironmentHostsDigest: schema.TypeString, + mkDataSourceVirtualEnvironmentHostsEntries: schema.TypeList, + mkDataSourceVirtualEnvironmentHostsHostnames: schema.TypeList, + mkDataSourceVirtualEnvironmentHostsNodeName: schema.TypeString, }) entriesSchema := testNestedSchemaExistence(t, s, mkDataSourceVirtualEnvironmentHostsEntries) @@ -54,11 +48,8 @@ func TestDataSourceVirtualEnvironmentHostsSchema(t *testing.T) { mkDataSourceVirtualEnvironmentHostsEntriesHostnames, }) - testSchemaValueTypes(t, entriesSchema, []string{ - mkDataSourceVirtualEnvironmentHostsEntriesAddress, - mkDataSourceVirtualEnvironmentHostsEntriesHostnames, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeList, + testSchemaValueTypes(t, entriesSchema, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentHostsEntriesAddress: schema.TypeString, + mkDataSourceVirtualEnvironmentHostsEntriesHostnames: schema.TypeList, }) } diff --git a/proxmoxtf/data_source_virtual_environment_nodes_test.go b/proxmoxtf/data_source_virtual_environment_nodes_test.go index 43cc8fa6..26f33cd9 100644 --- a/proxmoxtf/data_source_virtual_environment_nodes_test.go +++ b/proxmoxtf/data_source_virtual_environment_nodes_test.go @@ -35,25 +35,15 @@ func TestDataSourceVirtualEnvironmentNodesSchema(t *testing.T) { mkDataSourceVirtualEnvironmentNodesUptime, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentNodesCPUCount, - mkDataSourceVirtualEnvironmentNodesCPUUtilization, - mkDataSourceVirtualEnvironmentNodesMemoryAvailable, - mkDataSourceVirtualEnvironmentNodesMemoryUsed, - mkDataSourceVirtualEnvironmentNodesNames, - mkDataSourceVirtualEnvironmentNodesOnline, - mkDataSourceVirtualEnvironmentNodesSSLFingerprints, - mkDataSourceVirtualEnvironmentNodesSupportLevels, - mkDataSourceVirtualEnvironmentNodesUptime, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentNodesCPUCount: schema.TypeList, + mkDataSourceVirtualEnvironmentNodesCPUUtilization: schema.TypeList, + mkDataSourceVirtualEnvironmentNodesMemoryAvailable: schema.TypeList, + mkDataSourceVirtualEnvironmentNodesMemoryUsed: schema.TypeList, + mkDataSourceVirtualEnvironmentNodesNames: schema.TypeList, + mkDataSourceVirtualEnvironmentNodesOnline: schema.TypeList, + mkDataSourceVirtualEnvironmentNodesSSLFingerprints: schema.TypeList, + mkDataSourceVirtualEnvironmentNodesSupportLevels: schema.TypeList, + mkDataSourceVirtualEnvironmentNodesUptime: schema.TypeList, }) } diff --git a/proxmoxtf/data_source_virtual_environment_pool_test.go b/proxmoxtf/data_source_virtual_environment_pool_test.go index 904f2232..d8e2765c 100644 --- a/proxmoxtf/data_source_virtual_environment_pool_test.go +++ b/proxmoxtf/data_source_virtual_environment_pool_test.go @@ -32,14 +32,10 @@ func TestDataSourceVirtualEnvironmentPoolSchema(t *testing.T) { mkDataSourceVirtualEnvironmentPoolMembers, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentPoolComment, - mkDataSourceVirtualEnvironmentPoolMembers, - mkDataSourceVirtualEnvironmentPoolPoolID, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeList, - schema.TypeString, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentPoolComment: schema.TypeString, + mkDataSourceVirtualEnvironmentPoolMembers: schema.TypeList, + mkDataSourceVirtualEnvironmentPoolPoolID: schema.TypeString, }) membersSchema := testNestedSchemaExistence(t, s, mkDataSourceVirtualEnvironmentPoolMembers) @@ -52,17 +48,11 @@ func TestDataSourceVirtualEnvironmentPoolSchema(t *testing.T) { mkDataSourceVirtualEnvironmentPoolMembersVMID, }) - testSchemaValueTypes(t, membersSchema, []string{ - mkDataSourceVirtualEnvironmentPoolMembersDatastoreID, - mkDataSourceVirtualEnvironmentPoolMembersID, - mkDataSourceVirtualEnvironmentPoolMembersNodeName, - mkDataSourceVirtualEnvironmentPoolMembersType, - mkDataSourceVirtualEnvironmentPoolMembersVMID, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeInt, + testSchemaValueTypes(t, membersSchema, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentPoolMembersDatastoreID: schema.TypeString, + mkDataSourceVirtualEnvironmentPoolMembersID: schema.TypeString, + mkDataSourceVirtualEnvironmentPoolMembersNodeName: schema.TypeString, + mkDataSourceVirtualEnvironmentPoolMembersType: schema.TypeString, + mkDataSourceVirtualEnvironmentPoolMembersVMID: schema.TypeInt, }) } diff --git a/proxmoxtf/data_source_virtual_environment_pools_test.go b/proxmoxtf/data_source_virtual_environment_pools_test.go index 2608ad58..681db94c 100644 --- a/proxmoxtf/data_source_virtual_environment_pools_test.go +++ b/proxmoxtf/data_source_virtual_environment_pools_test.go @@ -27,9 +27,7 @@ func TestDataSourceVirtualEnvironmentPoolsSchema(t *testing.T) { mkDataSourceVirtualEnvironmentPoolsPoolIDs, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentPoolsPoolIDs, - }, []schema.ValueType{ - schema.TypeList, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentPoolsPoolIDs: schema.TypeList, }) } diff --git a/proxmoxtf/data_source_virtual_environment_role_test.go b/proxmoxtf/data_source_virtual_environment_role_test.go index 73b1d6e2..7bb18b6b 100644 --- a/proxmoxtf/data_source_virtual_environment_role_test.go +++ b/proxmoxtf/data_source_virtual_environment_role_test.go @@ -31,11 +31,8 @@ func TestDataSourceVirtualEnvironmentRoleSchema(t *testing.T) { mkDataSourceVirtualEnvironmentRolePrivileges, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentRoleID, - mkDataSourceVirtualEnvironmentRolePrivileges, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeSet, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentRoleID: schema.TypeString, + mkDataSourceVirtualEnvironmentRolePrivileges: schema.TypeSet, }) } diff --git a/proxmoxtf/data_source_virtual_environment_roles_test.go b/proxmoxtf/data_source_virtual_environment_roles_test.go index 405f396c..314f693b 100644 --- a/proxmoxtf/data_source_virtual_environment_roles_test.go +++ b/proxmoxtf/data_source_virtual_environment_roles_test.go @@ -28,13 +28,9 @@ func TestDataSourceVirtualEnvironmentRolesSchema(t *testing.T) { mkDataSourceVirtualEnvironmentRolesSpecial, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentRolesPrivileges, - mkDataSourceVirtualEnvironmentRolesRoleIDs, - mkDataSourceVirtualEnvironmentRolesSpecial, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeList, - schema.TypeList, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentRolesPrivileges: schema.TypeList, + mkDataSourceVirtualEnvironmentRolesRoleIDs: schema.TypeList, + mkDataSourceVirtualEnvironmentRolesSpecial: schema.TypeList, }) } diff --git a/proxmoxtf/data_source_virtual_environment_user_test.go b/proxmoxtf/data_source_virtual_environment_user_test.go index 610ef224..01dd9b00 100644 --- a/proxmoxtf/data_source_virtual_environment_user_test.go +++ b/proxmoxtf/data_source_virtual_environment_user_test.go @@ -39,26 +39,16 @@ func TestDataSourceVirtualEnvironmentUserSchema(t *testing.T) { mkDataSourceVirtualEnvironmentUserLastName, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentUserACL, - mkDataSourceVirtualEnvironmentUserComment, - mkDataSourceVirtualEnvironmentUserEmail, - mkDataSourceVirtualEnvironmentUserEnabled, - mkDataSourceVirtualEnvironmentUserExpirationDate, - mkDataSourceVirtualEnvironmentUserFirstName, - mkDataSourceVirtualEnvironmentUserGroups, - mkDataSourceVirtualEnvironmentUserKeys, - mkDataSourceVirtualEnvironmentUserLastName, - }, []schema.ValueType{ - schema.TypeSet, - schema.TypeString, - schema.TypeString, - schema.TypeBool, - schema.TypeString, - schema.TypeString, - schema.TypeList, - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentUserACL: schema.TypeSet, + mkDataSourceVirtualEnvironmentUserComment: schema.TypeString, + mkDataSourceVirtualEnvironmentUserEmail: schema.TypeString, + mkDataSourceVirtualEnvironmentUserEnabled: schema.TypeBool, + mkDataSourceVirtualEnvironmentUserExpirationDate: schema.TypeString, + mkDataSourceVirtualEnvironmentUserFirstName: schema.TypeString, + mkDataSourceVirtualEnvironmentUserGroups: schema.TypeList, + mkDataSourceVirtualEnvironmentUserKeys: schema.TypeString, + mkDataSourceVirtualEnvironmentUserLastName: schema.TypeString, }) aclSchema := testNestedSchemaExistence(t, s, mkDataSourceVirtualEnvironmentGroupACL) @@ -69,13 +59,9 @@ func TestDataSourceVirtualEnvironmentUserSchema(t *testing.T) { mkDataSourceVirtualEnvironmentUserACLRoleID, }) - testSchemaValueTypes(t, aclSchema, []string{ - mkDataSourceVirtualEnvironmentUserACLPath, - mkDataSourceVirtualEnvironmentUserACLPropagate, - mkDataSourceVirtualEnvironmentUserACLRoleID, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeBool, - schema.TypeString, + testSchemaValueTypes(t, aclSchema, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentUserACLPath: schema.TypeString, + mkDataSourceVirtualEnvironmentUserACLPropagate: schema.TypeBool, + mkDataSourceVirtualEnvironmentUserACLRoleID: schema.TypeString, }) } diff --git a/proxmoxtf/data_source_virtual_environment_users_test.go b/proxmoxtf/data_source_virtual_environment_users_test.go index 9244c1b6..2f7c12bf 100644 --- a/proxmoxtf/data_source_virtual_environment_users_test.go +++ b/proxmoxtf/data_source_virtual_environment_users_test.go @@ -35,25 +35,15 @@ func TestDataSourceVirtualEnvironmentUsersSchema(t *testing.T) { mkDataSourceVirtualEnvironmentUsersUserIDs, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentUsersComments, - mkDataSourceVirtualEnvironmentUsersEmails, - mkDataSourceVirtualEnvironmentUsersEnabled, - mkDataSourceVirtualEnvironmentUsersExpirationDates, - mkDataSourceVirtualEnvironmentUsersFirstNames, - mkDataSourceVirtualEnvironmentUsersGroups, - mkDataSourceVirtualEnvironmentUsersKeys, - mkDataSourceVirtualEnvironmentUsersLastNames, - mkDataSourceVirtualEnvironmentUsersUserIDs, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentUsersComments: schema.TypeList, + mkDataSourceVirtualEnvironmentUsersEmails: schema.TypeList, + mkDataSourceVirtualEnvironmentUsersEnabled: schema.TypeList, + mkDataSourceVirtualEnvironmentUsersExpirationDates: schema.TypeList, + mkDataSourceVirtualEnvironmentUsersFirstNames: schema.TypeList, + mkDataSourceVirtualEnvironmentUsersGroups: schema.TypeList, + mkDataSourceVirtualEnvironmentUsersKeys: schema.TypeList, + mkDataSourceVirtualEnvironmentUsersLastNames: schema.TypeList, + mkDataSourceVirtualEnvironmentUsersUserIDs: schema.TypeList, }) } diff --git a/proxmoxtf/data_source_virtual_environment_version_test.go b/proxmoxtf/data_source_virtual_environment_version_test.go index b3ea1b9f..01ce995a 100644 --- a/proxmoxtf/data_source_virtual_environment_version_test.go +++ b/proxmoxtf/data_source_virtual_environment_version_test.go @@ -30,15 +30,10 @@ func TestDataSourceVirtualEnvironmentVersionSchema(t *testing.T) { mkDataSourceVirtualEnvironmentVersionVersion, }) - testSchemaValueTypes(t, s, []string{ - mkDataSourceVirtualEnvironmentVersionKeyboardLayout, - mkDataSourceVirtualEnvironmentVersionRelease, - mkDataSourceVirtualEnvironmentVersionRepositoryID, - mkDataSourceVirtualEnvironmentVersionVersion, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkDataSourceVirtualEnvironmentVersionKeyboardLayout: schema.TypeString, + mkDataSourceVirtualEnvironmentVersionRelease: schema.TypeString, + mkDataSourceVirtualEnvironmentVersionRepositoryID: schema.TypeString, + mkDataSourceVirtualEnvironmentVersionVersion: schema.TypeString, }) } diff --git a/proxmoxtf/provider_test.go b/proxmoxtf/provider_test.go index 49b7142b..23f2b9de 100644 --- a/proxmoxtf/provider_test.go +++ b/proxmoxtf/provider_test.go @@ -29,10 +29,8 @@ func TestProviderSchema(t *testing.T) { mkProviderVirtualEnvironment, }) - testSchemaValueTypes(t, s, []string{ - mkProviderVirtualEnvironment, - }, []schema.ValueType{ - schema.TypeList, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkProviderVirtualEnvironment: schema.TypeList, }) veSchema := testNestedSchemaExistence(t, s, mkProviderVirtualEnvironment) @@ -44,15 +42,10 @@ func TestProviderSchema(t *testing.T) { mkProviderVirtualEnvironmentUsername, }) - testSchemaValueTypes(t, veSchema, []string{ - mkProviderVirtualEnvironmentEndpoint, - mkProviderVirtualEnvironmentInsecure, - mkProviderVirtualEnvironmentPassword, - mkProviderVirtualEnvironmentUsername, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeBool, - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, veSchema, map[string]schema.ValueType{ + mkProviderVirtualEnvironmentEndpoint: schema.TypeString, + mkProviderVirtualEnvironmentInsecure: schema.TypeBool, + mkProviderVirtualEnvironmentPassword: schema.TypeString, + mkProviderVirtualEnvironmentUsername: schema.TypeString, }) } diff --git a/proxmoxtf/resource_virtual_environment_certificate_test.go b/proxmoxtf/resource_virtual_environment_certificate_test.go index c54c1209..1839ee57 100644 --- a/proxmoxtf/resource_virtual_environment_certificate_test.go +++ b/proxmoxtf/resource_virtual_environment_certificate_test.go @@ -45,33 +45,19 @@ func TestResourceVirtualEnvironmentCertificateSchema(t *testing.T) { mkResourceVirtualEnvironmentCertificateSubjectAlternativeNames, }) - testSchemaValueTypes(t, s, []string{ - mkResourceVirtualEnvironmentCertificateCertificate, - mkResourceVirtualEnvironmentCertificateCertificateChain, - mkResourceVirtualEnvironmentCertificateExpirationDate, - mkResourceVirtualEnvironmentCertificateFileName, - mkResourceVirtualEnvironmentCertificateIssuer, - mkResourceVirtualEnvironmentCertificateNodeName, - mkResourceVirtualEnvironmentCertificatePrivateKey, - mkResourceVirtualEnvironmentCertificatePublicKeySize, - mkResourceVirtualEnvironmentCertificatePublicKeyType, - mkResourceVirtualEnvironmentCertificateSSLFingerprint, - mkResourceVirtualEnvironmentCertificateStartDate, - mkResourceVirtualEnvironmentCertificateSubject, - mkResourceVirtualEnvironmentCertificateSubjectAlternativeNames, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeInt, - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeList, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentCertificateCertificate: schema.TypeString, + mkResourceVirtualEnvironmentCertificateCertificateChain: schema.TypeString, + mkResourceVirtualEnvironmentCertificateExpirationDate: schema.TypeString, + mkResourceVirtualEnvironmentCertificateFileName: schema.TypeString, + mkResourceVirtualEnvironmentCertificateIssuer: schema.TypeString, + mkResourceVirtualEnvironmentCertificateNodeName: schema.TypeString, + mkResourceVirtualEnvironmentCertificatePrivateKey: schema.TypeString, + mkResourceVirtualEnvironmentCertificatePublicKeySize: schema.TypeInt, + mkResourceVirtualEnvironmentCertificatePublicKeyType: schema.TypeString, + mkResourceVirtualEnvironmentCertificateSSLFingerprint: schema.TypeString, + mkResourceVirtualEnvironmentCertificateStartDate: schema.TypeString, + mkResourceVirtualEnvironmentCertificateSubject: schema.TypeString, + mkResourceVirtualEnvironmentCertificateSubjectAlternativeNames: schema.TypeList, }) } diff --git a/proxmoxtf/resource_virtual_environment_container_test.go b/proxmoxtf/resource_virtual_environment_container_test.go index bec36833..ed3e8c4d 100644 --- a/proxmoxtf/resource_virtual_environment_container_test.go +++ b/proxmoxtf/resource_virtual_environment_container_test.go @@ -39,26 +39,16 @@ func TestResourceVirtualEnvironmentContainerSchema(t *testing.T) { mkResourceVirtualEnvironmentContainerVMID, }) - testSchemaValueTypes(t, s, []string{ - mkResourceVirtualEnvironmentContainerCPU, - mkResourceVirtualEnvironmentContainerDescription, - mkResourceVirtualEnvironmentContainerDisk, - mkResourceVirtualEnvironmentContainerInitialization, - mkResourceVirtualEnvironmentContainerMemory, - mkResourceVirtualEnvironmentContainerOperatingSystem, - mkResourceVirtualEnvironmentContainerPoolID, - mkResourceVirtualEnvironmentContainerStarted, - mkResourceVirtualEnvironmentContainerVMID, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeString, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeString, - schema.TypeBool, - schema.TypeInt, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentContainerCPU: schema.TypeList, + mkResourceVirtualEnvironmentContainerDescription: schema.TypeString, + mkResourceVirtualEnvironmentContainerDisk: schema.TypeList, + mkResourceVirtualEnvironmentContainerInitialization: schema.TypeList, + mkResourceVirtualEnvironmentContainerMemory: schema.TypeList, + mkResourceVirtualEnvironmentContainerOperatingSystem: schema.TypeList, + mkResourceVirtualEnvironmentContainerPoolID: schema.TypeString, + mkResourceVirtualEnvironmentContainerStarted: schema.TypeBool, + mkResourceVirtualEnvironmentContainerVMID: schema.TypeInt, }) cpuSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentContainerCPU) @@ -69,14 +59,10 @@ func TestResourceVirtualEnvironmentContainerSchema(t *testing.T) { mkResourceVirtualEnvironmentContainerCPUUnits, }) - testSchemaValueTypes(t, cpuSchema, []string{ - mkResourceVirtualEnvironmentContainerCPUArchitecture, - mkResourceVirtualEnvironmentContainerCPUCores, - mkResourceVirtualEnvironmentContainerCPUUnits, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeInt, - schema.TypeInt, + testSchemaValueTypes(t, cpuSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentContainerCPUArchitecture: schema.TypeString, + mkResourceVirtualEnvironmentContainerCPUCores: schema.TypeInt, + mkResourceVirtualEnvironmentContainerCPUUnits: schema.TypeInt, }) diskSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentContainerDisk) @@ -85,10 +71,8 @@ func TestResourceVirtualEnvironmentContainerSchema(t *testing.T) { mkResourceVirtualEnvironmentContainerDiskDatastoreID, }) - testSchemaValueTypes(t, diskSchema, []string{ - mkResourceVirtualEnvironmentContainerDiskDatastoreID, - }, []schema.ValueType{ - schema.TypeString, + testSchemaValueTypes(t, diskSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentContainerDiskDatastoreID: schema.TypeString, }) initializationSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentContainerInitialization) @@ -100,16 +84,11 @@ func TestResourceVirtualEnvironmentContainerSchema(t *testing.T) { mkResourceVirtualEnvironmentContainerInitializationUserAccount, }) - testSchemaValueTypes(t, initializationSchema, []string{ - mkResourceVirtualEnvironmentContainerInitializationDNS, - mkResourceVirtualEnvironmentContainerInitializationHostname, - mkResourceVirtualEnvironmentContainerInitializationIPConfig, - mkResourceVirtualEnvironmentContainerInitializationUserAccount, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeString, - schema.TypeList, - schema.TypeList, + testSchemaValueTypes(t, initializationSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentContainerInitializationDNS: schema.TypeList, + mkResourceVirtualEnvironmentContainerInitializationHostname: schema.TypeString, + mkResourceVirtualEnvironmentContainerInitializationIPConfig: schema.TypeList, + mkResourceVirtualEnvironmentContainerInitializationUserAccount: schema.TypeList, }) initializationDNSSchema := testNestedSchemaExistence(t, initializationSchema, mkResourceVirtualEnvironmentContainerInitializationDNS) @@ -119,12 +98,9 @@ func TestResourceVirtualEnvironmentContainerSchema(t *testing.T) { mkResourceVirtualEnvironmentContainerInitializationDNSServer, }) - testSchemaValueTypes(t, initializationDNSSchema, []string{ - mkResourceVirtualEnvironmentContainerInitializationDNSDomain, - mkResourceVirtualEnvironmentContainerInitializationDNSServer, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, initializationDNSSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentContainerInitializationDNSDomain: schema.TypeString, + mkResourceVirtualEnvironmentContainerInitializationDNSServer: schema.TypeString, }) initializationIPConfigSchema := testNestedSchemaExistence(t, initializationSchema, mkResourceVirtualEnvironmentContainerInitializationIPConfig) @@ -134,12 +110,9 @@ func TestResourceVirtualEnvironmentContainerSchema(t *testing.T) { mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv6, }) - testSchemaValueTypes(t, initializationIPConfigSchema, []string{ - mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv4, - mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv6, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeList, + testSchemaValueTypes(t, initializationIPConfigSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv4: schema.TypeList, + mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv6: schema.TypeList, }) initializationIPConfigIPv4Schema := testNestedSchemaExistence(t, initializationIPConfigSchema, mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv4) @@ -149,12 +122,9 @@ func TestResourceVirtualEnvironmentContainerSchema(t *testing.T) { mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv4Gateway, }) - testSchemaValueTypes(t, initializationIPConfigIPv4Schema, []string{ - mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv4Address, - mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv4Gateway, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, initializationIPConfigIPv4Schema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv4Address: schema.TypeString, + mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv4Gateway: schema.TypeString, }) initializationIPConfigIPv6Schema := testNestedSchemaExistence(t, initializationIPConfigSchema, mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv6) @@ -164,12 +134,9 @@ func TestResourceVirtualEnvironmentContainerSchema(t *testing.T) { mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv6Gateway, }) - testSchemaValueTypes(t, initializationIPConfigIPv6Schema, []string{ - mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv6Address, - mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv6Gateway, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, initializationIPConfigIPv6Schema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv6Address: schema.TypeString, + mkResourceVirtualEnvironmentContainerInitializationIPConfigIPv6Gateway: schema.TypeString, }) initializationUserAccountSchema := testNestedSchemaExistence(t, initializationSchema, mkResourceVirtualEnvironmentContainerInitializationUserAccount) @@ -179,12 +146,9 @@ func TestResourceVirtualEnvironmentContainerSchema(t *testing.T) { mkResourceVirtualEnvironmentContainerInitializationUserAccountPassword, }) - testSchemaValueTypes(t, initializationUserAccountSchema, []string{ - mkResourceVirtualEnvironmentContainerInitializationUserAccountKeys, - mkResourceVirtualEnvironmentContainerInitializationUserAccountPassword, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeString, + testSchemaValueTypes(t, initializationUserAccountSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentContainerInitializationUserAccountKeys: schema.TypeList, + mkResourceVirtualEnvironmentContainerInitializationUserAccountPassword: schema.TypeString, }) memorySchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentContainerMemory) @@ -194,12 +158,9 @@ func TestResourceVirtualEnvironmentContainerSchema(t *testing.T) { mkResourceVirtualEnvironmentContainerMemorySwap, }) - testSchemaValueTypes(t, memorySchema, []string{ - mkResourceVirtualEnvironmentContainerMemoryDedicated, - mkResourceVirtualEnvironmentContainerMemorySwap, - }, []schema.ValueType{ - schema.TypeInt, - schema.TypeInt, + testSchemaValueTypes(t, memorySchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentContainerMemoryDedicated: schema.TypeInt, + mkResourceVirtualEnvironmentContainerMemorySwap: schema.TypeInt, }) networkInterfaceSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentContainerNetworkInterface) @@ -216,20 +177,13 @@ func TestResourceVirtualEnvironmentContainerSchema(t *testing.T) { mkResourceVirtualEnvironmentContainerNetworkInterfaceVLANID, }) - testSchemaValueTypes(t, networkInterfaceSchema, []string{ - mkResourceVirtualEnvironmentContainerNetworkInterfaceBridge, - mkResourceVirtualEnvironmentContainerNetworkInterfaceEnabled, - mkResourceVirtualEnvironmentContainerNetworkInterfaceMACAddress, - mkResourceVirtualEnvironmentContainerNetworkInterfaceName, - mkResourceVirtualEnvironmentContainerNetworkInterfaceRateLimit, - mkResourceVirtualEnvironmentContainerNetworkInterfaceVLANID, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeBool, - schema.TypeString, - schema.TypeString, - schema.TypeFloat, - schema.TypeInt, + testSchemaValueTypes(t, networkInterfaceSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentContainerNetworkInterfaceBridge: schema.TypeString, + mkResourceVirtualEnvironmentContainerNetworkInterfaceEnabled: schema.TypeBool, + mkResourceVirtualEnvironmentContainerNetworkInterfaceMACAddress: schema.TypeString, + mkResourceVirtualEnvironmentContainerNetworkInterfaceName: schema.TypeString, + mkResourceVirtualEnvironmentContainerNetworkInterfaceRateLimit: schema.TypeFloat, + mkResourceVirtualEnvironmentContainerNetworkInterfaceVLANID: schema.TypeInt, }) operatingSystemSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentContainerOperatingSystem) @@ -242,11 +196,8 @@ func TestResourceVirtualEnvironmentContainerSchema(t *testing.T) { mkResourceVirtualEnvironmentContainerOperatingSystemType, }) - testSchemaValueTypes(t, operatingSystemSchema, []string{ - mkResourceVirtualEnvironmentContainerOperatingSystemTemplateFileID, - mkResourceVirtualEnvironmentContainerOperatingSystemType, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, operatingSystemSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentContainerOperatingSystemTemplateFileID: schema.TypeString, + mkResourceVirtualEnvironmentContainerOperatingSystemType: schema.TypeString, }) } diff --git a/proxmoxtf/resource_virtual_environment_dns_test.go b/proxmoxtf/resource_virtual_environment_dns_test.go index 0ba6ade8..dbb37ab2 100644 --- a/proxmoxtf/resource_virtual_environment_dns_test.go +++ b/proxmoxtf/resource_virtual_environment_dns_test.go @@ -32,13 +32,9 @@ func TestResourceVirtualEnvironmentDNSSchema(t *testing.T) { mkResourceVirtualEnvironmentDNSServers, }) - testSchemaValueTypes(t, s, []string{ - mkResourceVirtualEnvironmentDNSDomain, - mkResourceVirtualEnvironmentDNSNodeName, - mkResourceVirtualEnvironmentDNSServers, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, - schema.TypeList, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentDNSDomain: schema.TypeString, + mkResourceVirtualEnvironmentDNSNodeName: schema.TypeString, + mkResourceVirtualEnvironmentDNSServers: schema.TypeList, }) } diff --git a/proxmoxtf/resource_virtual_environment_file_test.go b/proxmoxtf/resource_virtual_environment_file_test.go index b4b3e07d..6dece369 100644 --- a/proxmoxtf/resource_virtual_environment_file_test.go +++ b/proxmoxtf/resource_virtual_environment_file_test.go @@ -41,26 +41,16 @@ func TestResourceVirtualEnvironmentFileSchema(t *testing.T) { mkResourceVirtualEnvironmentFileFileTag, }) - testSchemaValueTypes(t, s, []string{ - mkResourceVirtualEnvironmentFileContentType, - mkResourceVirtualEnvironmentFileDatastoreID, - mkResourceVirtualEnvironmentFileFileModificationDate, - mkResourceVirtualEnvironmentFileFileName, - mkResourceVirtualEnvironmentFileFileSize, - mkResourceVirtualEnvironmentFileFileTag, - mkResourceVirtualEnvironmentFileNodeName, - mkResourceVirtualEnvironmentFileSourceFile, - mkResourceVirtualEnvironmentFileSourceRaw, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeInt, - schema.TypeString, - schema.TypeString, - schema.TypeList, - schema.TypeList, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentFileContentType: schema.TypeString, + mkResourceVirtualEnvironmentFileDatastoreID: schema.TypeString, + mkResourceVirtualEnvironmentFileFileModificationDate: schema.TypeString, + mkResourceVirtualEnvironmentFileFileName: schema.TypeString, + mkResourceVirtualEnvironmentFileFileSize: schema.TypeInt, + mkResourceVirtualEnvironmentFileFileTag: schema.TypeString, + mkResourceVirtualEnvironmentFileNodeName: schema.TypeString, + mkResourceVirtualEnvironmentFileSourceFile: schema.TypeList, + mkResourceVirtualEnvironmentFileSourceRaw: schema.TypeList, }) sourceFileSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentFileSourceFile) @@ -76,18 +66,12 @@ func TestResourceVirtualEnvironmentFileSchema(t *testing.T) { mkResourceVirtualEnvironmentFileSourceFileInsecure, }) - testSchemaValueTypes(t, sourceFileSchema, []string{ - mkResourceVirtualEnvironmentFileSourceFileChanged, - mkResourceVirtualEnvironmentFileSourceFileChecksum, - mkResourceVirtualEnvironmentFileSourceFileFileName, - mkResourceVirtualEnvironmentFileSourceFileInsecure, - mkResourceVirtualEnvironmentFileSourceFilePath, - }, []schema.ValueType{ - schema.TypeBool, - schema.TypeString, - schema.TypeString, - schema.TypeBool, - schema.TypeString, + testSchemaValueTypes(t, sourceFileSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentFileSourceFileChanged: schema.TypeBool, + mkResourceVirtualEnvironmentFileSourceFileChecksum: schema.TypeString, + mkResourceVirtualEnvironmentFileSourceFileFileName: schema.TypeString, + mkResourceVirtualEnvironmentFileSourceFileInsecure: schema.TypeBool, + mkResourceVirtualEnvironmentFileSourceFilePath: schema.TypeString, }) sourceRawSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentFileSourceRaw) @@ -101,13 +85,9 @@ func TestResourceVirtualEnvironmentFileSchema(t *testing.T) { mkResourceVirtualEnvironmentFileSourceRawResize, }) - testSchemaValueTypes(t, sourceRawSchema, []string{ - mkResourceVirtualEnvironmentFileSourceRawData, - mkResourceVirtualEnvironmentFileSourceRawFileName, - mkResourceVirtualEnvironmentFileSourceRawResize, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, - schema.TypeInt, + testSchemaValueTypes(t, sourceRawSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentFileSourceRawData: schema.TypeString, + mkResourceVirtualEnvironmentFileSourceRawFileName: schema.TypeString, + mkResourceVirtualEnvironmentFileSourceRawResize: schema.TypeInt, }) } diff --git a/proxmoxtf/resource_virtual_environment_group_test.go b/proxmoxtf/resource_virtual_environment_group_test.go index 538f36d4..01e89ddf 100644 --- a/proxmoxtf/resource_virtual_environment_group_test.go +++ b/proxmoxtf/resource_virtual_environment_group_test.go @@ -36,16 +36,11 @@ func TestResourceVirtualEnvironmentGroupSchema(t *testing.T) { mkResourceVirtualEnvironmentGroupMembers, }) - testSchemaValueTypes(t, s, []string{ - mkResourceVirtualEnvironmentGroupACL, - mkResourceVirtualEnvironmentGroupComment, - mkResourceVirtualEnvironmentGroupID, - mkResourceVirtualEnvironmentGroupMembers, - }, []schema.ValueType{ - schema.TypeSet, - schema.TypeString, - schema.TypeString, - schema.TypeSet, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentGroupACL: schema.TypeSet, + mkResourceVirtualEnvironmentGroupComment: schema.TypeString, + mkResourceVirtualEnvironmentGroupID: schema.TypeString, + mkResourceVirtualEnvironmentGroupMembers: schema.TypeSet, }) aclSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentGroupACL) @@ -59,13 +54,9 @@ func TestResourceVirtualEnvironmentGroupSchema(t *testing.T) { mkResourceVirtualEnvironmentGroupACLPropagate, }) - testSchemaValueTypes(t, aclSchema, []string{ - mkResourceVirtualEnvironmentGroupACLPath, - mkResourceVirtualEnvironmentGroupACLPropagate, - mkResourceVirtualEnvironmentGroupACLRoleID, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeBool, - schema.TypeString, + testSchemaValueTypes(t, aclSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentGroupACLPath: schema.TypeString, + mkResourceVirtualEnvironmentGroupACLPropagate: schema.TypeBool, + mkResourceVirtualEnvironmentGroupACLRoleID: schema.TypeString, }) } diff --git a/proxmoxtf/resource_virtual_environment_hosts_test.go b/proxmoxtf/resource_virtual_environment_hosts_test.go index 5bde7b85..53841d08 100644 --- a/proxmoxtf/resource_virtual_environment_hosts_test.go +++ b/proxmoxtf/resource_virtual_environment_hosts_test.go @@ -35,20 +35,13 @@ func TestResourceVirtualEnvironmentHostsSchema(t *testing.T) { mkResourceVirtualEnvironmentHostsHostnames, }) - testSchemaValueTypes(t, s, []string{ - mkResourceVirtualEnvironmentHostsAddresses, - mkResourceVirtualEnvironmentHostsDigest, - mkResourceVirtualEnvironmentHostsEntries, - mkResourceVirtualEnvironmentHostsEntry, - mkResourceVirtualEnvironmentHostsHostnames, - mkResourceVirtualEnvironmentHostsNodeName, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeString, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeString, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentHostsAddresses: schema.TypeList, + mkResourceVirtualEnvironmentHostsDigest: schema.TypeString, + mkResourceVirtualEnvironmentHostsEntries: schema.TypeList, + mkResourceVirtualEnvironmentHostsEntry: schema.TypeList, + mkResourceVirtualEnvironmentHostsHostnames: schema.TypeList, + mkResourceVirtualEnvironmentHostsNodeName: schema.TypeString, }) entriesSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentHostsEntries) @@ -58,12 +51,9 @@ func TestResourceVirtualEnvironmentHostsSchema(t *testing.T) { mkResourceVirtualEnvironmentHostsEntriesHostnames, }) - testSchemaValueTypes(t, entriesSchema, []string{ - mkResourceVirtualEnvironmentHostsEntriesAddress, - mkResourceVirtualEnvironmentHostsEntriesHostnames, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeList, + testSchemaValueTypes(t, entriesSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentHostsEntriesAddress: schema.TypeString, + mkResourceVirtualEnvironmentHostsEntriesHostnames: schema.TypeList, }) entrySchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentHostsEntry) @@ -73,11 +63,8 @@ func TestResourceVirtualEnvironmentHostsSchema(t *testing.T) { mkResourceVirtualEnvironmentHostsEntryHostnames, }) - testSchemaValueTypes(t, entrySchema, []string{ - mkResourceVirtualEnvironmentHostsEntryAddress, - mkResourceVirtualEnvironmentHostsEntryHostnames, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeList, + testSchemaValueTypes(t, entrySchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentHostsEntryAddress: schema.TypeString, + mkResourceVirtualEnvironmentHostsEntryHostnames: schema.TypeList, }) } diff --git a/proxmoxtf/resource_virtual_environment_pool_test.go b/proxmoxtf/resource_virtual_environment_pool_test.go index e3e35ddb..71fe2482 100644 --- a/proxmoxtf/resource_virtual_environment_pool_test.go +++ b/proxmoxtf/resource_virtual_environment_pool_test.go @@ -45,17 +45,11 @@ func TestResourceVirtualEnvironmentPoolSchema(t *testing.T) { mkResourceVirtualEnvironmentPoolMembersVMID, }) - testSchemaValueTypes(t, membersSchema, []string{ - mkResourceVirtualEnvironmentPoolMembersDatastoreID, - mkResourceVirtualEnvironmentPoolMembersID, - mkResourceVirtualEnvironmentPoolMembersNodeName, - mkResourceVirtualEnvironmentPoolMembersType, - mkResourceVirtualEnvironmentPoolMembersVMID, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeInt, + testSchemaValueTypes(t, membersSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentPoolMembersDatastoreID: schema.TypeString, + mkResourceVirtualEnvironmentPoolMembersID: schema.TypeString, + mkResourceVirtualEnvironmentPoolMembersNodeName: schema.TypeString, + mkResourceVirtualEnvironmentPoolMembersType: schema.TypeString, + mkResourceVirtualEnvironmentPoolMembersVMID: schema.TypeInt, }) } diff --git a/proxmoxtf/resource_virtual_environment_role_test.go b/proxmoxtf/resource_virtual_environment_role_test.go index 83a22dd5..ebcfde75 100644 --- a/proxmoxtf/resource_virtual_environment_role_test.go +++ b/proxmoxtf/resource_virtual_environment_role_test.go @@ -28,11 +28,8 @@ func TestResourceVirtualEnvironmentRoleSchema(t *testing.T) { mkResourceVirtualEnvironmentRoleRoleID, }) - testSchemaValueTypes(t, s, []string{ - mkResourceVirtualEnvironmentRolePrivileges, - mkResourceVirtualEnvironmentRoleRoleID, - }, []schema.ValueType{ - schema.TypeSet, - schema.TypeString, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentRolePrivileges: schema.TypeSet, + mkResourceVirtualEnvironmentRoleRoleID: schema.TypeString, }) } diff --git a/proxmoxtf/resource_virtual_environment_user_test.go b/proxmoxtf/resource_virtual_environment_user_test.go index 920b61c5..e7fc0b4a 100644 --- a/proxmoxtf/resource_virtual_environment_user_test.go +++ b/proxmoxtf/resource_virtual_environment_user_test.go @@ -40,30 +40,18 @@ func TestResourceVirtualEnvironmentUserSchema(t *testing.T) { mkResourceVirtualEnvironmentUserLastName, }) - testSchemaValueTypes(t, s, []string{ - mkResourceVirtualEnvironmentUserACL, - mkResourceVirtualEnvironmentUserComment, - mkResourceVirtualEnvironmentUserEmail, - mkResourceVirtualEnvironmentUserEnabled, - mkResourceVirtualEnvironmentUserExpirationDate, - mkResourceVirtualEnvironmentUserFirstName, - mkResourceVirtualEnvironmentUserGroups, - mkResourceVirtualEnvironmentUserKeys, - mkResourceVirtualEnvironmentUserLastName, - mkResourceVirtualEnvironmentUserPassword, - mkResourceVirtualEnvironmentUserUserID, - }, []schema.ValueType{ - schema.TypeSet, - schema.TypeString, - schema.TypeString, - schema.TypeBool, - schema.TypeString, - schema.TypeString, - schema.TypeSet, - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentUserACL: schema.TypeSet, + mkResourceVirtualEnvironmentUserComment: schema.TypeString, + mkResourceVirtualEnvironmentUserEmail: schema.TypeString, + mkResourceVirtualEnvironmentUserEnabled: schema.TypeBool, + mkResourceVirtualEnvironmentUserExpirationDate: schema.TypeString, + mkResourceVirtualEnvironmentUserFirstName: schema.TypeString, + mkResourceVirtualEnvironmentUserGroups: schema.TypeSet, + mkResourceVirtualEnvironmentUserKeys: schema.TypeString, + mkResourceVirtualEnvironmentUserLastName: schema.TypeString, + mkResourceVirtualEnvironmentUserPassword: schema.TypeString, + mkResourceVirtualEnvironmentUserUserID: schema.TypeString, }) aclSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentUserACL) @@ -77,13 +65,9 @@ func TestResourceVirtualEnvironmentUserSchema(t *testing.T) { mkResourceVirtualEnvironmentUserACLPropagate, }) - testSchemaValueTypes(t, aclSchema, []string{ - mkResourceVirtualEnvironmentUserACLPath, - mkResourceVirtualEnvironmentUserACLPropagate, - mkResourceVirtualEnvironmentUserACLRoleID, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeBool, - schema.TypeString, + testSchemaValueTypes(t, aclSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentUserACLPath: schema.TypeString, + mkResourceVirtualEnvironmentUserACLPropagate: schema.TypeBool, + mkResourceVirtualEnvironmentUserACLRoleID: schema.TypeString, }) } diff --git a/proxmoxtf/resource_virtual_environment_vm_test.go b/proxmoxtf/resource_virtual_environment_vm_test.go index 3f5488f6..a8759d97 100644 --- a/proxmoxtf/resource_virtual_environment_vm_test.go +++ b/proxmoxtf/resource_virtual_environment_vm_test.go @@ -58,56 +58,31 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMNetworkInterfaceNames, }) - testSchemaValueTypes(t, s, []string{ - mkResourceVirtualEnvironmentVMACPI, - mkResourceVirtualEnvironmentVMAgent, - mkResourceVirtualEnvironmentVMAudioDevice, - mkResourceVirtualEnvironmentVMBIOS, - mkResourceVirtualEnvironmentVMCDROM, - mkResourceVirtualEnvironmentVMCPU, - mkResourceVirtualEnvironmentVMDescription, - mkResourceVirtualEnvironmentVMDisk, - mkResourceVirtualEnvironmentVMInitialization, - mkResourceVirtualEnvironmentVMIPv4Addresses, - mkResourceVirtualEnvironmentVMIPv6Addresses, - mkResourceVirtualEnvironmentVMKeyboardLayout, - mkResourceVirtualEnvironmentVMMemory, - mkResourceVirtualEnvironmentVMName, - mkResourceVirtualEnvironmentVMNetworkDevice, - mkResourceVirtualEnvironmentVMMACAddresses, - mkResourceVirtualEnvironmentVMNetworkInterfaceNames, - mkResourceVirtualEnvironmentVMOperatingSystem, - mkResourceVirtualEnvironmentVMPoolID, - mkResourceVirtualEnvironmentVMSerialDevice, - mkResourceVirtualEnvironmentVMStarted, - mkResourceVirtualEnvironmentVMTabletDevice, - mkResourceVirtualEnvironmentVMTemplate, - mkResourceVirtualEnvironmentVMVMID, - }, []schema.ValueType{ - schema.TypeBool, - schema.TypeList, - schema.TypeList, - schema.TypeString, - schema.TypeList, - schema.TypeList, - schema.TypeString, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeString, - schema.TypeList, - schema.TypeString, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeList, - schema.TypeString, - schema.TypeList, - schema.TypeBool, - schema.TypeBool, - schema.TypeBool, - schema.TypeInt, + testSchemaValueTypes(t, s, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMACPI: schema.TypeBool, + mkResourceVirtualEnvironmentVMAgent: schema.TypeList, + mkResourceVirtualEnvironmentVMAudioDevice: schema.TypeList, + mkResourceVirtualEnvironmentVMBIOS: schema.TypeString, + mkResourceVirtualEnvironmentVMCDROM: schema.TypeList, + mkResourceVirtualEnvironmentVMCPU: schema.TypeList, + mkResourceVirtualEnvironmentVMDescription: schema.TypeString, + mkResourceVirtualEnvironmentVMDisk: schema.TypeList, + mkResourceVirtualEnvironmentVMInitialization: schema.TypeList, + mkResourceVirtualEnvironmentVMIPv4Addresses: schema.TypeList, + mkResourceVirtualEnvironmentVMIPv6Addresses: schema.TypeList, + mkResourceVirtualEnvironmentVMKeyboardLayout: schema.TypeString, + mkResourceVirtualEnvironmentVMMemory: schema.TypeList, + mkResourceVirtualEnvironmentVMName: schema.TypeString, + mkResourceVirtualEnvironmentVMNetworkDevice: schema.TypeList, + mkResourceVirtualEnvironmentVMMACAddresses: schema.TypeList, + mkResourceVirtualEnvironmentVMNetworkInterfaceNames: schema.TypeList, + mkResourceVirtualEnvironmentVMOperatingSystem: schema.TypeList, + mkResourceVirtualEnvironmentVMPoolID: schema.TypeString, + mkResourceVirtualEnvironmentVMSerialDevice: schema.TypeList, + mkResourceVirtualEnvironmentVMStarted: schema.TypeBool, + mkResourceVirtualEnvironmentVMTabletDevice: schema.TypeBool, + mkResourceVirtualEnvironmentVMTemplate: schema.TypeBool, + mkResourceVirtualEnvironmentVMVMID: schema.TypeInt, }) agentSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMAgent) @@ -118,14 +93,10 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMAgentType, }) - testSchemaValueTypes(t, agentSchema, []string{ - mkResourceVirtualEnvironmentVMAgentEnabled, - mkResourceVirtualEnvironmentVMAgentTrim, - mkResourceVirtualEnvironmentVMAgentType, - }, []schema.ValueType{ - schema.TypeBool, - schema.TypeBool, - schema.TypeString, + testSchemaValueTypes(t, agentSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMAgentEnabled: schema.TypeBool, + mkResourceVirtualEnvironmentVMAgentTrim: schema.TypeBool, + mkResourceVirtualEnvironmentVMAgentType: schema.TypeString, }) audioDeviceSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMAudioDevice) @@ -135,12 +106,9 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMAudioDeviceDriver, }) - testSchemaValueTypes(t, audioDeviceSchema, []string{ - mkResourceVirtualEnvironmentVMAudioDeviceDevice, - mkResourceVirtualEnvironmentVMAudioDeviceDriver, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, audioDeviceSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMAudioDeviceDevice: schema.TypeString, + mkResourceVirtualEnvironmentVMAudioDeviceDriver: schema.TypeString, }) cdromSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMCDROM) @@ -150,12 +118,9 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMCDROMFileID, }) - testSchemaValueTypes(t, cdromSchema, []string{ - mkResourceVirtualEnvironmentVMCDROMEnabled, - mkResourceVirtualEnvironmentVMCDROMFileID, - }, []schema.ValueType{ - schema.TypeBool, - schema.TypeString, + testSchemaValueTypes(t, cdromSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMCDROMEnabled: schema.TypeBool, + mkResourceVirtualEnvironmentVMCDROMFileID: schema.TypeString, }) cloneSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMClone) @@ -169,14 +134,10 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMCloneNodeName, }) - testSchemaValueTypes(t, cloneSchema, []string{ - mkResourceVirtualEnvironmentVMCloneDatastoreID, - mkResourceVirtualEnvironmentVMCloneNodeName, - mkResourceVirtualEnvironmentVMCloneVMID, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, - schema.TypeInt, + testSchemaValueTypes(t, cloneSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMCloneDatastoreID: schema.TypeString, + mkResourceVirtualEnvironmentVMCloneNodeName: schema.TypeString, + mkResourceVirtualEnvironmentVMCloneVMID: schema.TypeInt, }) cpuSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMCPU) @@ -191,22 +152,14 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMCPUUnits, }) - testSchemaValueTypes(t, cpuSchema, []string{ - mkResourceVirtualEnvironmentVMCPUArchitecture, - mkResourceVirtualEnvironmentVMCPUCores, - mkResourceVirtualEnvironmentVMCPUFlags, - mkResourceVirtualEnvironmentVMCPUHotplugged, - mkResourceVirtualEnvironmentVMCPUSockets, - mkResourceVirtualEnvironmentVMCPUType, - mkResourceVirtualEnvironmentVMCPUUnits, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeInt, - schema.TypeList, - schema.TypeInt, - schema.TypeInt, - schema.TypeString, - schema.TypeInt, + testSchemaValueTypes(t, cpuSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMCPUArchitecture: schema.TypeString, + mkResourceVirtualEnvironmentVMCPUCores: schema.TypeInt, + mkResourceVirtualEnvironmentVMCPUFlags: schema.TypeList, + mkResourceVirtualEnvironmentVMCPUHotplugged: schema.TypeInt, + mkResourceVirtualEnvironmentVMCPUSockets: schema.TypeInt, + mkResourceVirtualEnvironmentVMCPUType: schema.TypeString, + mkResourceVirtualEnvironmentVMCPUUnits: schema.TypeInt, }) diskSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMDisk) @@ -218,16 +171,11 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMDiskSize, }) - testSchemaValueTypes(t, diskSchema, []string{ - mkResourceVirtualEnvironmentVMDiskDatastoreID, - mkResourceVirtualEnvironmentVMDiskFileFormat, - mkResourceVirtualEnvironmentVMDiskFileID, - mkResourceVirtualEnvironmentVMDiskSize, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, - schema.TypeString, - schema.TypeInt, + testSchemaValueTypes(t, diskSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMDiskDatastoreID: schema.TypeString, + mkResourceVirtualEnvironmentVMDiskFileFormat: schema.TypeString, + mkResourceVirtualEnvironmentVMDiskFileID: schema.TypeString, + mkResourceVirtualEnvironmentVMDiskSize: schema.TypeInt, }) diskSpeedSchema := testNestedSchemaExistence(t, diskSchema, mkResourceVirtualEnvironmentVMDiskSpeed) @@ -239,16 +187,11 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMDiskSpeedWriteBurstable, }) - testSchemaValueTypes(t, diskSpeedSchema, []string{ - mkResourceVirtualEnvironmentVMDiskSpeedRead, - mkResourceVirtualEnvironmentVMDiskSpeedReadBurstable, - mkResourceVirtualEnvironmentVMDiskSpeedWrite, - mkResourceVirtualEnvironmentVMDiskSpeedWriteBurstable, - }, []schema.ValueType{ - schema.TypeInt, - schema.TypeInt, - schema.TypeInt, - schema.TypeInt, + testSchemaValueTypes(t, diskSpeedSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMDiskSpeedRead: schema.TypeInt, + mkResourceVirtualEnvironmentVMDiskSpeedReadBurstable: schema.TypeInt, + mkResourceVirtualEnvironmentVMDiskSpeedWrite: schema.TypeInt, + mkResourceVirtualEnvironmentVMDiskSpeedWriteBurstable: schema.TypeInt, }) initializationSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMInitialization) @@ -259,14 +202,10 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMInitializationUserAccount, }) - testSchemaValueTypes(t, initializationSchema, []string{ - mkResourceVirtualEnvironmentVMInitializationDNS, - mkResourceVirtualEnvironmentVMInitializationIPConfig, - mkResourceVirtualEnvironmentVMInitializationUserAccount, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeList, - schema.TypeList, + testSchemaValueTypes(t, initializationSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMInitializationDNS: schema.TypeList, + mkResourceVirtualEnvironmentVMInitializationIPConfig: schema.TypeList, + mkResourceVirtualEnvironmentVMInitializationUserAccount: schema.TypeList, }) initializationDNSSchema := testNestedSchemaExistence(t, initializationSchema, mkResourceVirtualEnvironmentVMInitializationDNS) @@ -276,12 +215,9 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMInitializationDNSServer, }) - testSchemaValueTypes(t, initializationDNSSchema, []string{ - mkResourceVirtualEnvironmentVMInitializationDNSDomain, - mkResourceVirtualEnvironmentVMInitializationDNSServer, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, initializationDNSSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMInitializationDNSDomain: schema.TypeString, + mkResourceVirtualEnvironmentVMInitializationDNSServer: schema.TypeString, }) initializationIPConfigSchema := testNestedSchemaExistence(t, initializationSchema, mkResourceVirtualEnvironmentVMInitializationIPConfig) @@ -291,12 +227,9 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6, }) - testSchemaValueTypes(t, initializationIPConfigSchema, []string{ - mkResourceVirtualEnvironmentVMInitializationIPConfigIPv4, - mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeList, + testSchemaValueTypes(t, initializationIPConfigSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMInitializationIPConfigIPv4: schema.TypeList, + mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6: schema.TypeList, }) initializationIPConfigIPv4Schema := testNestedSchemaExistence(t, initializationIPConfigSchema, mkResourceVirtualEnvironmentVMInitializationIPConfigIPv4) @@ -306,12 +239,9 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMInitializationIPConfigIPv4Gateway, }) - testSchemaValueTypes(t, initializationIPConfigIPv4Schema, []string{ - mkResourceVirtualEnvironmentVMInitializationIPConfigIPv4Address, - mkResourceVirtualEnvironmentVMInitializationIPConfigIPv4Gateway, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, initializationIPConfigIPv4Schema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMInitializationIPConfigIPv4Address: schema.TypeString, + mkResourceVirtualEnvironmentVMInitializationIPConfigIPv4Gateway: schema.TypeString, }) initializationIPConfigIPv6Schema := testNestedSchemaExistence(t, initializationIPConfigSchema, mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6) @@ -321,12 +251,9 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6Gateway, }) - testSchemaValueTypes(t, initializationIPConfigIPv6Schema, []string{ - mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6Address, - mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6Gateway, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, initializationIPConfigIPv6Schema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6Address: schema.TypeString, + mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6Gateway: schema.TypeString, }) initializationUserAccountSchema := testNestedSchemaExistence(t, initializationSchema, mkResourceVirtualEnvironmentVMInitializationUserAccount) @@ -337,14 +264,10 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMInitializationUserAccountUsername, }) - testSchemaValueTypes(t, initializationUserAccountSchema, []string{ - mkResourceVirtualEnvironmentVMInitializationUserAccountKeys, - mkResourceVirtualEnvironmentVMInitializationUserAccountPassword, - mkResourceVirtualEnvironmentVMInitializationUserAccountUsername, - }, []schema.ValueType{ - schema.TypeList, - schema.TypeString, - schema.TypeString, + testSchemaValueTypes(t, initializationUserAccountSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMInitializationUserAccountKeys: schema.TypeList, + mkResourceVirtualEnvironmentVMInitializationUserAccountPassword: schema.TypeString, + mkResourceVirtualEnvironmentVMInitializationUserAccountUsername: schema.TypeString, }) memorySchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMMemory) @@ -355,14 +278,10 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMMemoryShared, }) - testSchemaValueTypes(t, memorySchema, []string{ - mkResourceVirtualEnvironmentVMMemoryDedicated, - mkResourceVirtualEnvironmentVMMemoryFloating, - mkResourceVirtualEnvironmentVMMemoryShared, - }, []schema.ValueType{ - schema.TypeInt, - schema.TypeInt, - schema.TypeInt, + testSchemaValueTypes(t, memorySchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMMemoryDedicated: schema.TypeInt, + mkResourceVirtualEnvironmentVMMemoryFloating: schema.TypeInt, + mkResourceVirtualEnvironmentVMMemoryShared: schema.TypeInt, }) networkDeviceSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMNetworkDevice) @@ -376,20 +295,13 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMNetworkDeviceVLANID, }) - testSchemaValueTypes(t, networkDeviceSchema, []string{ - mkResourceVirtualEnvironmentVMNetworkDeviceBridge, - mkResourceVirtualEnvironmentVMNetworkDeviceEnabled, - mkResourceVirtualEnvironmentVMNetworkDeviceMACAddress, - mkResourceVirtualEnvironmentVMNetworkDeviceModel, - mkResourceVirtualEnvironmentVMNetworkDeviceRateLimit, - mkResourceVirtualEnvironmentVMNetworkDeviceVLANID, - }, []schema.ValueType{ - schema.TypeString, - schema.TypeBool, - schema.TypeString, - schema.TypeString, - schema.TypeFloat, - schema.TypeInt, + testSchemaValueTypes(t, networkDeviceSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMNetworkDeviceBridge: schema.TypeString, + mkResourceVirtualEnvironmentVMNetworkDeviceEnabled: schema.TypeBool, + mkResourceVirtualEnvironmentVMNetworkDeviceMACAddress: schema.TypeString, + mkResourceVirtualEnvironmentVMNetworkDeviceModel: schema.TypeString, + mkResourceVirtualEnvironmentVMNetworkDeviceRateLimit: schema.TypeFloat, + mkResourceVirtualEnvironmentVMNetworkDeviceVLANID: schema.TypeInt, }) operatingSystemSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMOperatingSystem) @@ -398,10 +310,8 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMOperatingSystemType, }) - testSchemaValueTypes(t, operatingSystemSchema, []string{ - mkResourceVirtualEnvironmentVMOperatingSystemType, - }, []schema.ValueType{ - schema.TypeString, + testSchemaValueTypes(t, operatingSystemSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMOperatingSystemType: schema.TypeString, }) serialDeviceSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMSerialDevice) @@ -410,10 +320,8 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMSerialDeviceDevice, }) - testSchemaValueTypes(t, serialDeviceSchema, []string{ - mkResourceVirtualEnvironmentVMSerialDeviceDevice, - }, []schema.ValueType{ - schema.TypeString, + testSchemaValueTypes(t, serialDeviceSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMSerialDeviceDevice: schema.TypeString, }) vgaSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMVGA) @@ -424,13 +332,9 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) { mkResourceVirtualEnvironmentVMVGAType, }) - testSchemaValueTypes(t, vgaSchema, []string{ - mkResourceVirtualEnvironmentVMVGAEnabled, - mkResourceVirtualEnvironmentVMVGAMemory, - mkResourceVirtualEnvironmentVMVGAType, - }, []schema.ValueType{ - schema.TypeBool, - schema.TypeInt, - schema.TypeString, + testSchemaValueTypes(t, vgaSchema, map[string]schema.ValueType{ + mkResourceVirtualEnvironmentVMVGAEnabled: schema.TypeBool, + mkResourceVirtualEnvironmentVMVGAMemory: schema.TypeInt, + mkResourceVirtualEnvironmentVMVGAType: schema.TypeString, }) } diff --git a/proxmoxtf/utils.go b/proxmoxtf/utils.go index 6aaacdbc..fb9e62fd 100644 --- a/proxmoxtf/utils.go +++ b/proxmoxtf/utils.go @@ -397,14 +397,14 @@ func testRequiredArguments(t *testing.T, s *schema.Resource, keys []string) { } } -func testSchemaValueTypes(t *testing.T, s *schema.Resource, keys []string, types []schema.ValueType) { - for i, v := range keys { - if s.Schema[v] == nil { - t.Fatalf("Error in Schema: Missing definition for \"%s\"", v) +func testSchemaValueTypes(t *testing.T, s *schema.Resource, f map[string]schema.ValueType) { + for fn, ft := range f { + if s.Schema[fn] == nil { + t.Fatalf("Error in Schema: Missing definition for \"%s\"", fn) } - if s.Schema[v].Type != types[i] { - t.Fatalf("Error in Schema: Argument \"%s\" is not of type \"%v\"", v, types[i]) + if s.Schema[fn].Type != ft { + t.Fatalf("Error in Schema: Argument or attribute \"%s\" is not of type \"%v\"", fn, ft) } } }