Remove a level of indirection from DumpOpenStackPorts

Author: mdbooth

test/e2e/shared/openstack.go

@@ -127,7 +127,7 @@ func dumpOpenStackImages(providerClient *gophercloud.ProviderClient, clientOpts
 	return nil
 }
 
-func DumpOpenStackPorts(e2eCtx *E2EContext, filter ports.ListOpts) (*[]ports.Port, error) {
+func DumpOpenStackPorts(e2eCtx *E2EContext, filter ports.ListOpts) ([]ports.Port, error) {
 	providerClient, clientOpts, err := getProviderClient(e2eCtx)
 	if err != nil {
 		_, _ = fmt.Fprintf(GinkgoWriter, "error creating provider client: %s\n", err)
@@ -149,7 +149,7 @@ func DumpOpenStackPorts(e2eCtx *E2EContext, filter ports.ListOpts) (*[]ports.Por
 	if err != nil {
 		return nil, fmt.Errorf("error extracting ports: %s", err)
 	}
-	return &portsList, nil
+	return portsList, nil
 }
 
 // getOpenStackServers gets all OpenStack servers at once, to save on DescribeInstances

test/e2e/suites/e2e/e2e_test.go

@@ -157,15 +157,15 @@ var _ = Describe("e2e tests", func() {
 			})
 
 			shared.Byf("Waiting for custom port to be created")
-			var plist *[]ports.Port
+			var plist []ports.Port
 			var err error
 			Eventually(func() int {
 				plist, err = shared.DumpOpenStackPorts(e2eCtx, ports.ListOpts{Description: "primary"})
 				Expect(err).To(BeNil())
-				return len(*plist)
+				return len(plist)
 			}, e2eCtx.E2EConfig.GetIntervals(specName, "wait-worker-nodes")...).Should(Equal(1))
 
-			port := (*plist)[0]
+			port := plist[0]
 			Expect(port.Description).To(Equal("primary"))
 		})
 		It("It should be creatable and deletable", func() {