libvmi: rename WithCloudInitConfigDriveData consistently

The names of all other WithCloudInit* functions that set the UserData field end with `UserData`, not place `Data`. Let us conform. There are too many WithCloudInit* functions with long confusing names. This is left as a future excercise. Signed-off-by: Dan Kenigsberg <[email protected]>
aenix-io · Feb 3, 2024 · e2b38db · e2b38db
1 parent b97c9e2
commit e2b38db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/tests/compute/credentials_test.go b/tests/compute/credentials_test.go
@@ -228,7 +228,7 @@ var _ = SIGDescribe("Guest Access Credentials", func() {
 			})
 
 			vmi := libvmi.NewFedora(
-				libvmi.WithCloudInitConfigDriveData(userData),
+				libvmi.WithCloudInitConfigDriveUserData(userData),
 				withSSHPK(secretID, propagationMethod))
 			vmi = tests.RunVMIAndExpectLaunch(vmi, fedoraRunningTimeout)
 			verifySSHKeys(vmi)

diff --git a/tests/libvmi/cloudinit.go b/tests/libvmi/cloudinit.go
@@ -60,8 +60,8 @@ func WithCloudInitNoCloudNetworkData(data string) Option {
 	}
 }
 
-// WithCloudInitConfigDriveData adds cloud-init config-drive user data.
-func WithCloudInitConfigDriveData(data string) Option {
+// WithCloudInitConfigDriveUserData adds cloud-init config-drive user data.
+func WithCloudInitConfigDriveUserData(data string) Option {
 	return func(vmi *v1.VirtualMachineInstance) {
 		addDiskVolumeWithCloudInitConfigDrive(vmi, cloudInitDiskName, v1.DiskBusVirtio)
 

diff --git a/tests/vmi_cloudinit_test.go b/tests/vmi_cloudinit_test.go
@@ -220,7 +220,7 @@ var _ = Describe("[rfe_id:151][crit:high][vendor:[email protected]][level:compon
 					"#cloud-config\npassword: %s\nchpasswd: { expire: False }",
 					fedoraPassword,
 				)
-				vmi := libvmi.NewFedora(libvmi.WithCloudInitConfigDriveData(userData))
+				vmi := libvmi.NewFedora(libvmi.WithCloudInitConfigDriveUserData(userData))
 				// runStrategy := v1.RunStrategyManual
 				vm := &v1.VirtualMachine{
 					ObjectMeta: vmi.ObjectMeta,