Merge pull request #10 from LiliC/update-deps

Bump `prometheus/prometheus` dependancy

go.mod

@@ -2,28 +2,6 @@ module github.com/openshift/prom-label-proxy
 
 go 1.12
 
-require (
-	github.com/OneOfOne/xxhash v1.2.5 // indirect
-	github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
-	github.com/cespare/xxhash v1.0.0 // indirect
-	github.com/go-kit/kit v0.7.0 // indirect
-	github.com/go-logfmt/logfmt v0.3.0 // indirect
-	github.com/go-stack/stack v1.7.0 // indirect
-	github.com/golang/protobuf v1.1.0 // indirect
-	github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/oklog/ulid v1.0.0 // indirect
-	github.com/opentracing/opentracing-go v1.0.2 // indirect
-	github.com/pkg/errors v0.8.0 // indirect
-	github.com/prometheus/client_golang v0.8.0 // indirect
-	github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 // indirect
-	github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e // indirect
-	github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273 // indirect
-	github.com/prometheus/prometheus v2.3.2+incompatible
-	github.com/prometheus/tsdb v0.0.0-20180807144027-eeb3a7435a75 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/stretchr/testify v1.3.0 // indirect
-	golang.org/x/net v0.0.0-20180811021610-c39426892332 // indirect
-	golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect
-	golang.org/x/sys v0.0.0-20180814072032-4e1fef560951 // indirect
-)
+require github.com/prometheus/prometheus v2.3.2+incompatible
+
+replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.0.0-20190818123050-43acd0e2e93f

injectproxy/inject.go

@@ -9,27 +9,11 @@ import (
 
 func SetRecursive(node promql.Node, matchersToEnforce []*labels.Matcher) (err error) {
 	switch n := node.(type) {
-	case promql.Statements:
-		for _, s := range n {
-			if err := SetRecursive(s, matchersToEnforce); err != nil {
-				return err
-			}
-		}
-	case *promql.AlertStmt:
-		if err := SetRecursive(n.Expr, matchersToEnforce); err != nil {
-			return err
-		}
-
 	case *promql.EvalStmt:
 		if err := SetRecursive(n.Expr, matchersToEnforce); err != nil {
 			return err
 		}
 
-	case *promql.RecordStmt:
-		if err := SetRecursive(n.Expr, matchersToEnforce); err != nil {
-			return err
-		}
-
 	case promql.Expressions:
 		for _, e := range n {
 			if err := SetRecursive(e, matchersToEnforce); err != nil {
@@ -64,6 +48,11 @@ func SetRecursive(node promql.Node, matchersToEnforce []*labels.Matcher) (err er
 			return err
 		}
 
+	case *promql.SubqueryExpr:
+		if err := SetRecursive(n.Expr, matchersToEnforce); err != nil {
+			return err
+		}
+
 	case *promql.NumberLiteral, *promql.StringLiteral:
 	// nothing to do