Skip to content

Commit 0291e88

Browse files
MalloZupMalloZup
committed
Use only randomChars in testAcc helpers
- breaking change from Terraform v12: it doesn't allow other chars. Numbers and non letter will cause failures
1 parent c0e46b5 commit 0291e88

5 files changed

+90
-90
lines changed

‎libvirt/resource_libvirt_cloud_init_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212

1313
func TestAccLibvirtCloudInit_CreateCloudInitDiskAndUpdate(t *testing.T) {
1414
var volume libvirt.StorageVol
15-
randomResourceName := acctest.RandString(10)
15+
randomResourceName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
1616
// this structs are contents values we expect.
1717
expectedContents := Expected{UserData: "#cloud-config", NetworkConfig: "network:", MetaData: "instance-id: bamboo"}
1818
expectedContents2 := Expected{UserData: "#cloud-config2", NetworkConfig: "network2:", MetaData: "instance-id: bamboo2"}
1919
expectedContentsEmpty := Expected{UserData: "#cloud-config2", NetworkConfig: "", MetaData: ""}
20-
randomIsoName := acctest.RandString(10) + ".iso"
20+
randomIsoName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha) + ".iso"
2121
resource.Test(t, resource.TestCase{
2222
PreCheck: func() { testAccPreCheck(t) },
2323
Providers: testAccProviders,
@@ -97,7 +97,7 @@ func TestAccLibvirtCloudInit_CreateCloudInitDiskAndUpdate(t *testing.T) {
9797
// This test should fail without a proper "Exists" implementation
9898
func TestAccLibvirtCloudInit_ManuallyDestroyed(t *testing.T) {
9999
var volume libvirt.StorageVol
100-
randomResourceName := acctest.RandString(10)
100+
randomResourceName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
101101

102102
testAccCheckLibvirtCloudInitConfigBasic := fmt.Sprintf(`
103103
resource "libvirt_cloudinit_disk" "%s" {

‎libvirt/resource_libvirt_coreos_ignition_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
func TestAccLibvirtIgnition_Basic(t *testing.T) {
1414
var volume libvirt.StorageVol
15-
randomServiceName := acctest.RandString(10) + ".service"
15+
randomServiceName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha) + ".service"
1616
randomIgnitionName := acctest.RandString(9)
1717
var config = fmt.Sprintf(`
1818
data "ignition_systemd_unit" "acceptance-test-systemd" {

‎libvirt/resource_libvirt_domain_test.go‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818

1919
func TestAccLibvirtDomain_Basic(t *testing.T) {
2020
var domain libvirt.Domain
21-
randomResourceName := acctest.RandString(10)
22-
randomDomainName := acctest.RandString(10)
21+
randomResourceName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
22+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
2323
resource.Test(t, resource.TestCase{
2424
PreCheck: func() { testAccPreCheck(t) },
2525
Providers: testAccProviders,
@@ -46,8 +46,8 @@ func TestAccLibvirtDomain_Basic(t *testing.T) {
4646

4747
func TestAccLibvirtDomain_Detailed(t *testing.T) {
4848
var domain libvirt.Domain
49-
randomResourceName := acctest.RandString(10)
50-
randomDomainName := acctest.RandString(10)
49+
randomResourceName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
50+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
5151
resource.Test(t, resource.TestCase{
5252
PreCheck: func() { testAccPreCheck(t) },
5353
Providers: testAccProviders,
@@ -77,8 +77,8 @@ func TestAccLibvirtDomain_Detailed(t *testing.T) {
7777
func TestAccLibvirtDomain_Volume(t *testing.T) {
7878
var domain libvirt.Domain
7979
var volume libvirt.StorageVol
80-
randomVolumeName := acctest.RandString(10)
81-
randomDomainName := acctest.RandString(10)
80+
randomVolumeName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
81+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
8282
var configVolAttached = fmt.Sprintf(`
8383
resource "libvirt_volume" "%s" {
8484
name = "%s"
@@ -122,9 +122,9 @@ func TestAccLibvirtDomain_Volume(t *testing.T) {
122122
func TestAccLibvirtDomain_VolumeTwoDisks(t *testing.T) {
123123
var domain libvirt.Domain
124124
var volume libvirt.StorageVol
125-
randomVolumeName := acctest.RandString(10)
125+
randomVolumeName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
126126
randomVolumeName2 := acctest.RandString(9)
127-
randomDomainName := acctest.RandString(10)
127+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
128128

129129
var configVolAttached = fmt.Sprintf(`
130130
resource "libvirt_volume" "%s" {
@@ -181,9 +181,9 @@ func TestAccLibvirtDomain_VolumeDriver(t *testing.T) {
181181
var domain libvirt.Domain
182182
var volumeRaw libvirt.StorageVol
183183
var volumeQCOW2 libvirt.StorageVol
184-
randomVolumeQCOW2 := acctest.RandString(10)
184+
randomVolumeQCOW2 := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
185185
randomVolumeRaw := acctest.RandString(9)
186-
randomDomainName := acctest.RandString(10)
186+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
187187

188188
var config = fmt.Sprintf(`
189189
resource "libvirt_volume" "%s" {
@@ -235,8 +235,8 @@ func TestAccLibvirtDomain_VolumeDriver(t *testing.T) {
235235

236236
func TestAccLibvirtDomain_ScsiDisk(t *testing.T) {
237237
var domain libvirt.Domain
238-
randomVolumeName := acctest.RandString(10)
239-
randomDomainName := acctest.RandString(10)
238+
randomVolumeName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
239+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
240240
var configScsi = fmt.Sprintf(`
241241
resource "libvirt_volume" "%s" {
242242
name = "%s"
@@ -270,7 +270,7 @@ func TestAccLibvirtDomain_ScsiDisk(t *testing.T) {
270270

271271
func TestAccLibvirtDomain_URLDisk(t *testing.T) {
272272
var domain libvirt.Domain
273-
randomDomainName := acctest.RandString(10)
273+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
274274
fws := fileWebServer{}
275275
if err := fws.Start(); err != nil {
276276
t.Fatal(err)
@@ -319,7 +319,7 @@ func TestAccLibvirtDomain_URLDisk(t *testing.T) {
319319

320320
func TestAccLibvirtDomain_MultiISODisks(t *testing.T) {
321321
var domain libvirt.Domain
322-
randomDomainName := acctest.RandString(10)
322+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
323323

324324
isoPath, err := filepath.Abs("testdata/tcl.iso")
325325
if err != nil {
@@ -391,7 +391,7 @@ func TestAccLibvirtDomain_KernelInitrdCmdline(t *testing.T) {
391391
var domain libvirt.Domain
392392
var kernel libvirt.StorageVol
393393
var initrd libvirt.StorageVol
394-
randomDomainName := acctest.RandString(10)
394+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
395395

396396
var config = fmt.Sprintf(`
397397
resource "libvirt_volume" "kernel" {
@@ -442,8 +442,8 @@ func TestAccLibvirtDomain_KernelInitrdCmdline(t *testing.T) {
442442

443443
func TestAccLibvirtDomain_NetworkInterface(t *testing.T) {
444444
var domain libvirt.Domain
445-
randomDomainName := acctest.RandString(10)
446-
randomNetworkName := acctest.RandString(10)
445+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
446+
randomNetworkName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
447447

448448
currentDir, err := os.Getwd()
449449
if err != nil {
@@ -493,8 +493,8 @@ func TestAccLibvirtDomain_NetworkInterface(t *testing.T) {
493493
func TestAccLibvirtDomain_CheckDHCPEntries(t *testing.T) {
494494
var domain libvirt.Domain
495495
var network libvirt.Network
496-
randomDomainName := acctest.RandString(10)
497-
randomNetworkName := acctest.RandString(10)
496+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
497+
randomNetworkName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
498498

499499
var configWithDomain = fmt.Sprintf(`
500500
resource "libvirt_network" "%s" {
@@ -555,8 +555,8 @@ func TestAccLibvirtDomain_CheckDHCPEntries(t *testing.T) {
555555
func TestAccLibvirtDomain_Graphics(t *testing.T) {
556556
var domain libvirt.Domain
557557

558-
randomDomainName := acctest.RandString(10)
559-
randomVolumeName := acctest.RandString(10)
558+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
559+
randomVolumeName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
560560
var config = fmt.Sprintf(`
561561
resource "libvirt_volume" "%s" {
562562
name = "%s"
@@ -632,8 +632,8 @@ func TestAccLibvirtDomain_Graphics(t *testing.T) {
632632
func TestAccLibvirtDomain_IgnitionObject(t *testing.T) {
633633
var domain libvirt.Domain
634634
var volume libvirt.StorageVol
635-
randomDomainName := acctest.RandString(10)
636-
randomIgnitionName := acctest.RandString(10)
635+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
636+
randomIgnitionName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
637637
var config = fmt.Sprintf(`
638638
data "ignition_systemd_unit" "acceptance-test-systemd" {
639639
name = "example.service"
@@ -676,7 +676,7 @@ func TestAccLibvirtDomain_IgnitionObject(t *testing.T) {
676676

677677
func TestAccLibvirtDomain_Cpu(t *testing.T) {
678678
var domain libvirt.Domain
679-
randomDomainName := acctest.RandString(10)
679+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
680680

681681
var config = fmt.Sprintf(`
682682
resource "libvirt_domain" "%s" {
@@ -705,7 +705,7 @@ func TestAccLibvirtDomain_Cpu(t *testing.T) {
705705

706706
func TestAccLibvirtDomain_Video(t *testing.T) {
707707
var domain libvirt.Domain
708-
randomDomainName := acctest.RandString(10)
708+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
709709

710710
var config = fmt.Sprintf(`
711711
resource "libvirt_domain" "%s" {
@@ -734,7 +734,7 @@ func TestAccLibvirtDomain_Video(t *testing.T) {
734734

735735
func TestAccLibvirtDomain_Autostart(t *testing.T) {
736736
var domain libvirt.Domain
737-
randomDomainName := acctest.RandString(10)
737+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
738738
var autostartTrue = fmt.Sprintf(`
739739
resource "libvirt_domain" "%s" {
740740
name = "%s"
@@ -772,7 +772,7 @@ func TestAccLibvirtDomain_Autostart(t *testing.T) {
772772

773773
func TestAccLibvirtDomain_Filesystems(t *testing.T) {
774774
var domain libvirt.Domain
775-
randomDomainName := acctest.RandString(10)
775+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
776776

777777
var config = fmt.Sprintf(`
778778
resource "libvirt_domain" "%s" {
@@ -818,7 +818,7 @@ func TestAccLibvirtDomain_Filesystems(t *testing.T) {
818818

819819
func TestAccLibvirtDomain_Consoles(t *testing.T) {
820820
var domain libvirt.Domain
821-
randomDomainName := acctest.RandString(10)
821+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
822822
var config = fmt.Sprintf(`
823823
resource "libvirt_domain" "%s" {
824824
name = "%s"
@@ -1115,7 +1115,7 @@ func TestAccLibvirtDomainFirmware(t *testing.T) {
11151115

11161116
func subtestAccLibvirtDomainFirmwareNoTemplate(t *testing.T, NVRAMPath string, firmware string) {
11171117
var domain libvirt.Domain
1118-
randomDomainName := acctest.RandString(10)
1118+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
11191119
var config = fmt.Sprintf(`
11201120
resource "libvirt_domain" "%s" {
11211121
name = "terraform-test-firmware-no-template"
@@ -1151,7 +1151,7 @@ func subtestAccLibvirtDomainFirmwareTemplate(t *testing.T, NVRAMPath string, fir
11511151
if err != nil {
11521152
t.Fatal(err)
11531153
}
1154-
randomDomainName := acctest.RandString(10)
1154+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
11551155
var domain libvirt.Domain
11561156
var config = fmt.Sprintf(`
11571157
resource "libvirt_domain" "%s" {
@@ -1188,7 +1188,7 @@ func subtestAccLibvirtDomainFirmwareTemplate(t *testing.T, NVRAMPath string, fir
11881188

11891189
func TestAccLibvirtDomain_MachineType(t *testing.T) {
11901190
var domain libvirt.Domain
1191-
randomDomainName := acctest.RandString(10)
1191+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
11921192
// Using machine type of pc as this is earliest QEMU target
11931193
// and so most likely to be available
11941194
var config = fmt.Sprintf(`
@@ -1214,7 +1214,7 @@ func TestAccLibvirtDomain_MachineType(t *testing.T) {
12141214

12151215
func TestAccLibvirtDomain_ArchType(t *testing.T) {
12161216
var domain libvirt.Domain
1217-
randomDomainName := acctest.RandString(10)
1217+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
12181218
// Using i686 as architecture in case anyone running tests on an i686 only host
12191219
var config = fmt.Sprintf(`
12201220
resource "libvirt_domain" "%s" {
@@ -1275,8 +1275,8 @@ func testAccCheckLibvirtNetworkExists(name string, network *libvirt.Network) res
12751275
func TestAccLibvirtDomain_ShutoffDomain(t *testing.T) {
12761276
var domain libvirt.Domain
12771277
var volume libvirt.StorageVol
1278-
randomDomainName := acctest.RandString(10)
1279-
randomVolumeName := acctest.RandString(10)
1278+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
1279+
randomVolumeName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
12801280
resource.Test(t, resource.TestCase{
12811281
PreCheck: func() { testAccPreCheck(t) },
12821282
Providers: testAccProviders,
@@ -1333,7 +1333,7 @@ func TestAccLibvirtDomain_ShutoffMultiDomainsRunning(t *testing.T) {
13331333
}
13341334

13351335
func TestAccLibvirtDomain_CaseInsensitiveAttrs_MAC(t *testing.T) {
1336-
randomDomainName := acctest.RandString(10)
1336+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
13371337
var config = fmt.Sprintf(`
13381338
resource "libvirt_domain" "%s" {
13391339
name = "%s"
@@ -1401,7 +1401,7 @@ func testAccCheckLibvirtDomainStateEqual(name string, domain *libvirt.Domain, ex
14011401

14021402
func TestAccLibvirtDomain_Import(t *testing.T) {
14031403
var domain libvirt.Domain
1404-
randomDomainName := acctest.RandString(10)
1404+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
14051405

14061406
resource.Test(t, resource.TestCase{
14071407
PreCheck: func() { testAccPreCheck(t) },
@@ -1435,8 +1435,8 @@ func TestAccLibvirtDomain_Import(t *testing.T) {
14351435

14361436
func TestAccLibvirtDomain_XSLT_UnsupportedAttribute(t *testing.T) {
14371437
var domain libvirt.Domain
1438-
randomDomainName := acctest.RandString(10)
1439-
randomNetworkName := acctest.RandString(10)
1438+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
1439+
randomNetworkName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
14401440

14411441
var config = fmt.Sprintf(`
14421442
resource "libvirt_network" "%s" {
@@ -1499,8 +1499,8 @@ EOF
14991499
// schema attributes
15001500
func TestAccLibvirtDomain_XSLT_SupportedAttribute(t *testing.T) {
15011501
var domain libvirt.Domain
1502-
randomDomainName := acctest.RandString(10)
1503-
randomNetworkName := acctest.RandString(10)
1502+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
1503+
randomNetworkName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
15041504

15051505
var config = fmt.Sprintf(`
15061506
resource "libvirt_network" "%s" {
@@ -1557,8 +1557,8 @@ EOF
15571557
// as the supress diff function should take care of seeing they are equivalent
15581558
func TestAccLibvirtDomain_XSLT_Whitespace(t *testing.T) {
15591559
var domain libvirt.Domain
1560-
randomDomainName := acctest.RandString(10)
1561-
randomNetworkName := acctest.RandString(10)
1560+
randomDomainName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
1561+
randomNetworkName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
15621562

15631563
var config = fmt.Sprintf(`
15641564
resource "libvirt_network" "%s" {

0 commit comments

Comments
 (0)