Add ping to shared API (#276)

stackrox · Dec 10, 2020 · a458309 · a458309
1 parent 42411cd
commit a458309
Show file tree

Hide file tree

Showing 6 changed files with 590 additions and 23 deletions.
diff --git a/api/v1/ping/service.go b/api/v1/ping/service.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	apiGRPC "github.com/stackrox/scanner/api/grpc"
-	v1 "github.com/stackrox/scanner/generated/api/v1"
+	v1 "github.com/stackrox/scanner/generated/shared/api/v1"
 	"google.golang.org/grpc"
 )
 

diff --git a/e2etests/no_license_test.go b/e2etests/no_license_test.go
@@ -14,8 +14,7 @@ import (
 	"testing"
 	"time"
 
-	v1 "github.com/stackrox/scanner/generated/api/v1"
-	sharedV1 "github.com/stackrox/scanner/generated/shared/api/v1"
+	v1 "github.com/stackrox/scanner/generated/shared/api/v1"
 	"github.com/stackrox/scanner/pkg/licenses"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -87,23 +86,23 @@ func TestScannerRejectsLicenseGRPC(t *testing.T) {
 	_, err := pingClient.Ping(ctx, &v1.Empty{})
 	require.NoError(t, err)
 
-	scanClient := sharedV1.NewScanServiceClient(conn)
+	scanClient := v1.NewScanServiceClient(conn)
 
-	methods := []func(ctx context.Context, scanClient sharedV1.ScanServiceClient) error{
-		func(ctx context.Context, scanClient sharedV1.ScanServiceClient) error {
-			_, err := scanClient.GetLanguageLevelComponents(ctx, &sharedV1.GetLanguageLevelComponentsRequest{})
+	methods := []func(ctx context.Context, scanClient v1.ScanServiceClient) error{
+		func(ctx context.Context, scanClient v1.ScanServiceClient) error {
+			_, err := scanClient.GetLanguageLevelComponents(ctx, &v1.GetLanguageLevelComponentsRequest{})
 			return err
 		},
-		func(ctx context.Context, scanClient sharedV1.ScanServiceClient) error {
-			_, err := scanClient.GetScan(ctx, &sharedV1.GetScanRequest{})
+		func(ctx context.Context, scanClient v1.ScanServiceClient) error {
+			_, err := scanClient.GetScan(ctx, &v1.GetScanRequest{})
 			return err
 		},
-		func(ctx context.Context, scanClient sharedV1.ScanServiceClient) error {
-			_, err := scanClient.ScanImage(ctx, &sharedV1.ScanImageRequest{})
+		func(ctx context.Context, scanClient v1.ScanServiceClient) error {
+			_, err := scanClient.ScanImage(ctx, &v1.ScanImageRequest{})
 			return err
 		},
-		func(ctx context.Context, scanClient sharedV1.ScanServiceClient) error {
-			_, err := scanClient.GetVulnerabilities(ctx, &sharedV1.GetVulnerabilitiesRequest{})
+		func(ctx context.Context, scanClient v1.ScanServiceClient) error {
+			_, err := scanClient.GetVulnerabilities(ctx, &v1.GetVulnerabilitiesRequest{})
 			return err
 		},
 	}