installconfig/vsphere: add ResourcePool to Finder

The new Finder interface allows for mocking during test, but did not previously include the ResourcePool method.
openshift · Nov 15, 2021 · 31f42c7 · 31f42c7
1 parent aca54e3
commit 31f42c7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/pkg/asset/installconfig/vsphere/client.go b/pkg/asset/installconfig/vsphere/client.go
@@ -21,6 +21,7 @@ type Finder interface {
 	Folder(ctx context.Context, path string) (*object.Folder, error)
 	NetworkList(ctx context.Context, path string) ([]object.NetworkReference, error)
 	Network(ctx context.Context, path string) (object.NetworkReference, error)
+	ResourcePool(ctx context.Context, path string) (*object.ResourcePool, error)
 }
 
 // NewFinder creates a new client that conforms with the Finder interface and returns a

diff --git a/pkg/asset/installconfig/vsphere/mock/vsphereclient_mock.go b/pkg/asset/installconfig/vsphere/mock/vsphereclient_mock.go
diff --git a/pkg/asset/installconfig/vsphere/validation.go b/pkg/asset/installconfig/vsphere/validation.go
@@ -130,7 +130,7 @@ func resourcePoolExists(finder Finder, ic *types.InstallConfig, fldPath *field.P
 	ctx, cancel := context.WithTimeout(context.TODO(), 60*time.Second)
 	defer cancel()
 
-	if _, err = finder.ResourcePool(ctx, cfg.ResourcePool); err != nil {
+	if _, err := finder.ResourcePool(ctx, cfg.ResourcePool); err != nil {
 		return append(allErrs, field.Invalid(fldPath, cfg.ResourcePool, err.Error()))
 	}
 	return nil