remove port allocation code in favor of dapr runtime testing package (dapr#1245)

Signed-off-by: Amit Mor <amitm@at-bay.com>

Author: berndverst

tests/certification/flow/network/network.go

@@ -109,19 +109,3 @@ func InterruptNetwork(duration time.Duration, ipv4s []string, ipv6s []string, po
 		return nil
 	}
 }
-
-// Helper function to return a random unused port number. Consecutive calls to this function will return different port numbers.
-func GetAvailablePort() (int, error) {
-	addr, err := net.ResolveTCPAddr("tcp", "localhost:0")
-	if err != nil {
-		return -1, err
-	}
-
-	l, err := net.ListenTCP("tcp", addr)
-	if err != nil {
-		return -1, err
-	}
-	defer l.Close()
-
-	return l.Addr().(*net.TCPAddr).Port, nil
-}

tests/certification/secretstores/azure/keyvault/go.mod

@@ -85,7 +85,7 @@ require (
 	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stoewer/go-strcase v1.2.0 // indirect
-	github.com/tylertreat/comcast v1.0.1 // indirect
+	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.28.0 // indirect
 	go.opencensus.io v0.22.5 // indirect

tests/certification/secretstores/azure/keyvault/go.sum

@@ -1056,7 +1056,6 @@ github.com/toolkits/concurrent v0.0.0-20150624120057-a4371d70e3e3/go.mod h1:QDlp
 github.com/trusch/grpc-proxy v0.0.0-20190529073533-02b64529f274 h1:ChAMVBRng5Dsv0rnfOxUj7vg2M9D0rafbRY1N2EEAZ8=
 github.com/trusch/grpc-proxy v0.0.0-20190529073533-02b64529f274/go.mod h1:dzrPb02OTNDVimdCCBR1WAPu9a69n3VnfDyCX/GT/gE=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/tylertreat/comcast v1.0.1 h1:+B8add2s9PrhX4lx5gGqOKUTebGD7lzdfwKZHYoF98Y=
 github.com/tylertreat/comcast v1.0.1/go.mod h1:8mA9mMCnmAGjTnrWNKQ7PXsBy6FfguO+U9pSxifaka8=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=

tests/certification/secretstores/azure/keyvault/keyvault_test.go

@@ -17,11 +17,11 @@ import (
 	secretstore_env "github.com/dapr/components-contrib/secretstores/local/env"
 	secretstores_loader "github.com/dapr/dapr/pkg/components/secretstores"
 	"github.com/dapr/dapr/pkg/runtime"
+	dapr_testing "github.com/dapr/dapr/pkg/testing"
 	"github.com/dapr/kit/logger"
 
 	"github.com/dapr/components-contrib/tests/certification/embedded"
 	"github.com/dapr/components-contrib/tests/certification/flow"
-	"github.com/dapr/components-contrib/tests/certification/flow/network"
 	"github.com/dapr/components-contrib/tests/certification/flow/sidecar"
 	"github.com/dapr/go-sdk/client"
 )
@@ -31,11 +31,12 @@ const (
 )
 
 func TestKeyVault(t *testing.T) {
-	currentGrpcPort, err := network.GetAvailablePort()
-	assert.NoError(t, err)
-	currentHttpPort, err := network.GetAvailablePort()
+	ports, err := dapr_testing.GetFreePorts(2)
 	assert.NoError(t, err)
 
+	currentGrpcPort := ports[0]
+	currentHttpPort := ports[1]
+
 	log := logger.NewLogger("dapr.components")
 
 	testGetKnownSecret := func(ctx flow.Context) error {
@@ -76,10 +77,10 @@ func TestKeyVault(t *testing.T) {
 		Run()
 
 	// Currently port reuse is still not quite working in the Dapr runtime.
-	currentGrpcPort, err = network.GetAvailablePort()
-	assert.NoError(t, err)
-	currentHttpPort, err = network.GetAvailablePort()
+	ports, err = dapr_testing.GetFreePorts(2)
 	assert.NoError(t, err)
+	currentGrpcPort = ports[0]
+	currentHttpPort = ports[1]
 
 	flow.New(t, "keyvault authentication using certificate").
 		Step(sidecar.Run(sidecarName,