Prevent compliance runs from getting stuck with 0 desired results (stackrox/rox#3790)

misberner · web-flow · commit fe00621e95c7 · 2019-10-25T12:26:41.000-07:00
diff --git a/central/auth/service/service_impl.go b/central/auth/service/service_impl.go
@@ -1,12 +1,13 @@
 package service
 
 import (
+	"context"
+
 	"github.com/gogo/protobuf/types"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	v1 "github.com/stackrox/rox/generated/api/v1"
 	"github.com/stackrox/rox/pkg/grpc/authn"
 	"github.com/stackrox/rox/pkg/grpc/authz/allow"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/central/authprovider/service/service_impl.go b/central/authprovider/service/service_impl.go
@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"sort"
 
@@ -15,7 +16,6 @@ import (
 	"github.com/stackrox/rox/pkg/grpc/authz/allow"
 	"github.com/stackrox/rox/pkg/grpc/authz/perrpc"
 	"github.com/stackrox/rox/pkg/grpc/authz/user"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/central/cluster/service/service_impl.go b/central/cluster/service/service_impl.go
@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"strings"
@@ -20,7 +21,6 @@ import (
 	"github.com/stackrox/rox/pkg/grpc/authz/perrpc"
 	"github.com/stackrox/rox/pkg/grpc/authz/user"
 	"github.com/stackrox/rox/pkg/search"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/central/compliance/service/service_impl.go b/central/compliance/service/service_impl.go
@@ -1,6 +1,8 @@
 package service
 
 import (
+	"context"
+
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/stackrox/rox/central/cluster/datastore"
 	"github.com/stackrox/rox/central/compliance/aggregation"
@@ -14,7 +16,6 @@ import (
 	"github.com/stackrox/rox/pkg/grpc/authz/perrpc"
 	"github.com/stackrox/rox/pkg/grpc/authz/user"
 	"github.com/stackrox/rox/pkg/search"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/central/externalbackups/service/service_impl.go b/central/externalbackups/service/service_impl.go
@@ -1,6 +1,8 @@
 package service
 
 import (
+	"context"
+
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/stackrox/rox/central/externalbackups/datastore"
 	"github.com/stackrox/rox/central/externalbackups/manager"
@@ -15,7 +17,6 @@ import (
 	"github.com/stackrox/rox/pkg/protoconv/schedule"
 	"github.com/stackrox/rox/pkg/secrets"
 	"github.com/stackrox/rox/pkg/uuid"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/central/imageintegration/service/service_impl.go b/central/imageintegration/service/service_impl.go
@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"sort"
 
@@ -22,7 +23,6 @@ import (
 	"github.com/stackrox/rox/pkg/registries"
 	"github.com/stackrox/rox/pkg/scanners"
 	"github.com/stackrox/rox/pkg/secrets"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/central/metadata/service/service.go b/central/metadata/service/service.go
@@ -1,12 +1,13 @@
 package service
 
 import (
+	"context"
+
 	"github.com/stackrox/rox/central/license/manager"
 	v1 "github.com/stackrox/rox/generated/api/v1"
 	"github.com/stackrox/rox/pkg/concurrency"
 	"github.com/stackrox/rox/pkg/grpc"
 	"github.com/stackrox/rox/pkg/logging"
-	"golang.org/x/net/context"
 )
 
 var (
diff --git a/central/metadata/service/service_impl.go b/central/metadata/service/service_impl.go
@@ -1,14 +1,15 @@
 package service
 
 import (
+	"context"
+
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/stackrox/rox/central/license/manager"
 	v1 "github.com/stackrox/rox/generated/api/v1"
 	"github.com/stackrox/rox/pkg/buildinfo"
 	"github.com/stackrox/rox/pkg/concurrency"
 	"github.com/stackrox/rox/pkg/grpc/authz/allow"
 	"github.com/stackrox/rox/pkg/version"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 
diff --git a/central/notifier/service/service_impl.go b/central/notifier/service/service_impl.go
@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
@@ -17,7 +18,6 @@ import (
 	"github.com/stackrox/rox/pkg/grpc/authz/perrpc"
 	"github.com/stackrox/rox/pkg/grpc/authz/user"
 	"github.com/stackrox/rox/pkg/secrets"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/central/policy/service/service.go b/central/policy/service/service.go
@@ -1,6 +1,8 @@
 package service
 
 import (
+	"context"
+
 	clusterDataStore "github.com/stackrox/rox/central/cluster/datastore"
 	deploymentDataStore "github.com/stackrox/rox/central/deployment/datastore"
 	"github.com/stackrox/rox/central/detection"
@@ -13,7 +15,6 @@ import (
 	v1 "github.com/stackrox/rox/generated/api/v1"
 	"github.com/stackrox/rox/pkg/expiringcache"
 	"github.com/stackrox/rox/pkg/grpc"
-	"golang.org/x/net/context"
 )
 
 // Service provides the interface to the microservice that serves alert data.
diff --git a/central/policy/service/service_impl.go b/central/policy/service/service_impl.go
@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"sort"
 
@@ -28,7 +29,6 @@ import (
 	"github.com/stackrox/rox/pkg/policies"
 	"github.com/stackrox/rox/pkg/search"
 	"github.com/stackrox/rox/pkg/set"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/central/search/service/service.go b/central/search/service/service.go
@@ -1,6 +1,8 @@
 package service
 
 import (
+	"context"
+
 	alertDataStore "github.com/stackrox/rox/central/alert/datastore"
 	clusterDataStore "github.com/stackrox/rox/central/cluster/datastore"
 	"github.com/stackrox/rox/central/compliance/aggregation"
@@ -17,7 +19,6 @@ import (
 	v1 "github.com/stackrox/rox/generated/api/v1"
 	"github.com/stackrox/rox/pkg/grpc"
 	"github.com/stackrox/rox/pkg/logging"
-	"golang.org/x/net/context"
 )
 
 var (
diff --git a/central/serviceidentities/service/service.go b/central/serviceidentities/service/service.go
@@ -1,11 +1,12 @@
 package service
 
 import (
+	"context"
+
 	"github.com/stackrox/rox/central/serviceidentities/datastore"
 	v1 "github.com/stackrox/rox/generated/api/v1"
 	"github.com/stackrox/rox/pkg/grpc"
 	"github.com/stackrox/rox/pkg/logging"
-	"golang.org/x/net/context"
 )
 
 var (
diff --git a/pkg/docker/client/container.go b/pkg/docker/client/container.go
@@ -1,6 +1,7 @@
 package client
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"net/url"
@@ -10,7 +11,6 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/mailru/easyjson"
 	internalTypes "github.com/stackrox/rox/pkg/docker/types"
-	"golang.org/x/net/context"
 )
 
 // ContainerList returns the list of containers in the docker host.
diff --git a/pkg/docker/client/image.go b/pkg/docker/client/image.go
@@ -1,6 +1,7 @@
 package client
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"net/url"
@@ -11,7 +12,6 @@ import (
 	"github.com/docker/docker/api/types/versions"
 	"github.com/mailru/easyjson"
 	internalTypes "github.com/stackrox/rox/pkg/docker/types"
-	"golang.org/x/net/context"
 )
 
 // ImageList returns a list of images in the docker host.
diff --git a/pkg/docker/client/info.go b/pkg/docker/client/info.go
@@ -1,12 +1,12 @@
 package client
 
 import (
+	"context"
 	"encoding/json"
 	"net/url"
 
 	"github.com/docker/docker/api/types"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 // Info returns information about the docker server.
diff --git a/pkg/docker/client/network.go b/pkg/docker/client/network.go
@@ -2,13 +2,13 @@ package client
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 
 	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
 )
 
 // NetworkInspect returns the information for a specific network configured in the docker host.
diff --git a/pkg/docker/client/request.go b/pkg/docker/client/request.go
@@ -2,6 +2,7 @@ package client
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -15,8 +16,6 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/versions"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-	"golang.org/x/net/context/ctxhttp"
 )
 
 // serverResponse is a wrapper for http API responses.
@@ -79,7 +78,9 @@ func (cli *Client) sendRequest(ctx context.Context, method, path string, query u
 func (cli *Client) doRequest(ctx context.Context, req *http.Request) (serverResponse, error) {
 	serverResp := serverResponse{statusCode: -1, reqURL: req.URL}
 
-	resp, err := ctxhttp.Do(ctx, cli.client, req)
+	req = req.WithContext(ctx)
+
+	resp, err := cli.client.Do(req)
 	if err != nil {
 		if cli.scheme != "https" && strings.Contains(err.Error(), "malformed HTTP response") {
 			return serverResp, errors.Wrap(err, "Are you trying to connect to a TLS-enabled daemon without TLS?")
diff --git a/roxctl/deployment/check/check.go b/roxctl/deployment/check/check.go
@@ -1,6 +1,7 @@
 package check
 
 import (
+	"context"
 	"errors"
 	"io/ioutil"
 	"os"
@@ -13,7 +14,6 @@ import (
 	"github.com/stackrox/rox/roxctl/common"
 	"github.com/stackrox/rox/roxctl/common/flags"
 	"github.com/stackrox/rox/roxctl/common/report"
-	"golang.org/x/net/context"
 )
 
 var (
diff --git a/roxctl/image/check/check.go b/roxctl/image/check/check.go
@@ -1,6 +1,7 @@
 package check
 
 import (
+	"context"
 	"os"
 	"time"
 
@@ -12,7 +13,6 @@ import (
 	"github.com/stackrox/rox/roxctl/common"
 	"github.com/stackrox/rox/roxctl/common/flags"
 	"github.com/stackrox/rox/roxctl/common/report"
-	"golang.org/x/net/context"
 )
 
 // Command checks the image against image build lifecycle policies
diff --git a/roxctl/image/scan/scan.go b/roxctl/image/scan/scan.go
@@ -1,6 +1,7 @@
 package scan
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -10,7 +11,6 @@ import (
 	v1 "github.com/stackrox/rox/generated/api/v1"
 	"github.com/stackrox/rox/roxctl/common"
 	"github.com/stackrox/rox/roxctl/common/flags"
-	"golang.org/x/net/context"
 )
 
 // Command checks the image against image build lifecycle policies
diff --git a/sensor/common/compliance/command_handler_impl.go b/sensor/common/compliance/command_handler_impl.go
diff --git a/sensor/common/compliance/service.go b/sensor/common/compliance/service.go
diff --git a/sensor/common/compliance/service_impl.go b/sensor/common/compliance/service_impl.go
