Move RDS package to the top-level. (#293)

Move RDS package to the top-level (cloudprober/targets/rds -> cloudprober/rds). RDS is becoming a core part of cloudprober now. Moving it one level-up will make it easier to find and explore the RDS code. Currently it goes too deep. In follow up changes I'd also like to move provider packages ("gcp" and "kubernetes") from the "rds/server" directory to "rds" and add some convenient interfaces to create RDS clients for these providers and surface other information. For example, there should am easy and straight-forward way to access default lameduck topic or lameduck message format from RDS configs. PiperOrigin-RevId: 275602304
google · Oct 19, 2019 · ee717b0 · ee717b0
1 parent 5de55ba
commit ee717b0
Show file tree

Hide file tree

Showing 48 changed files with 334 additions and 336 deletions.
diff --git a/config/proto/config.pb.go b/config/proto/config.pb.go
diff --git a/config/proto/config.proto b/config/proto/config.proto
@@ -3,10 +3,10 @@ syntax = "proto2";
 package cloudprober;
 
 import "github.com/google/cloudprober/probes/proto/config.proto";
+import "github.com/google/cloudprober/rds/server/proto/config.proto";
 import "github.com/google/cloudprober/servers/proto/config.proto";
 import "github.com/google/cloudprober/surfacers/proto/config.proto";
 import "github.com/google/cloudprober/targets/proto/targets.proto";
-import "github.com/google/cloudprober/targets/rds/server/proto/config.proto";
 import "github.com/google/cloudprober/targets/rtc/rtcreporter/proto/rtcreporter.proto";
 
 message ProberConfig {
@@ -61,7 +61,7 @@ message ProberConfig {
   // Next tag: 107
 
   // Resource discovery server
-  optional targets.rds.ServerConf rds_server = 95;
+  optional rds.ServerConf rds_server = 95;
 
   // Port for the default HTTP server. This port is also used for prometheus
   // exporter (URL /metrics). Default port is 9313. If not specified in the

diff --git a/config/runconfig/runconfig.go b/config/runconfig/runconfig.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"sync"
 
-	rdsserver "github.com/google/cloudprober/targets/rds/server"
+	rdsserver "github.com/google/cloudprober/rds/server"
 	"google.golang.org/grpc"
 )
 

diff --git a/prober/prober.go b/prober/prober.go
@@ -38,12 +38,12 @@ import (
 	"github.com/google/cloudprober/probes"
 	"github.com/google/cloudprober/probes/options"
 	probes_configpb "github.com/google/cloudprober/probes/proto"
+	rdsserver "github.com/google/cloudprober/rds/server"
 	"github.com/google/cloudprober/servers"
 	"github.com/google/cloudprober/surfacers"
 	"github.com/google/cloudprober/sysvars"
 	"github.com/google/cloudprober/targets"
 	"github.com/google/cloudprober/targets/lameduck"
-	rdsserver "github.com/google/cloudprober/targets/rds/server"
 	"github.com/google/cloudprober/targets/rtc/rtcreporter"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/targets/rds/client/client.go → rds/client/client.go b/targets/rds/client/client.go → rds/client/client.go
@@ -26,10 +26,10 @@ import (
 	"time"
 
 	"github.com/google/cloudprober/logger"
+	configpb "github.com/google/cloudprober/rds/client/proto"
+	pb "github.com/google/cloudprober/rds/proto"
+	spb "github.com/google/cloudprober/rds/proto"
 	"github.com/google/cloudprober/targets/endpoint"
-	configpb "github.com/google/cloudprober/targets/rds/client/proto"
-	pb "github.com/google/cloudprober/targets/rds/proto"
-	spb "github.com/google/cloudprober/targets/rds/proto"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 )

diff --git a/targets/rds/client/client_test.go → rds/client/client_test.go b/targets/rds/client/client_test.go → rds/client/client_test.go
@@ -22,10 +22,10 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/google/cloudprober/logger"
-	configpb "github.com/google/cloudprober/targets/rds/client/proto"
-	pb "github.com/google/cloudprober/targets/rds/proto"
-	"github.com/google/cloudprober/targets/rds/server"
-	serverpb "github.com/google/cloudprober/targets/rds/server/proto"
+	configpb "github.com/google/cloudprober/rds/client/proto"
+	pb "github.com/google/cloudprober/rds/proto"
+	"github.com/google/cloudprober/rds/server"
+	serverpb "github.com/google/cloudprober/rds/server/proto"
 )
 
 type testProvider struct {

diff --git a/targets/rds/client/cmd/client.go → rds/client/cmd/client.go b/targets/rds/client/cmd/client.go → rds/client/cmd/client.go
@@ -25,9 +25,9 @@ import (
 	"github.com/golang/protobuf/proto"
 
 	"github.com/google/cloudprober/logger"
-	"github.com/google/cloudprober/targets/rds/client"
-	configpb "github.com/google/cloudprober/targets/rds/client/proto"
-	pb "github.com/google/cloudprober/targets/rds/proto"
+	"github.com/google/cloudprober/rds/client"
+	configpb "github.com/google/cloudprober/rds/client/proto"
+	pb "github.com/google/cloudprober/rds/proto"
 )
 
 var (

diff --git a/targets/rds/client/proto/config.pb.go → rds/client/proto/config.pb.go b/targets/rds/client/proto/config.pb.go → rds/client/proto/config.pb.go
diff --git a/targets/rds/client/proto/config.proto → rds/client/proto/config.proto b/targets/rds/client/proto/config.proto → rds/client/proto/config.proto
@@ -7,9 +7,9 @@
 // }
 syntax = "proto2";
 
-package cloudprober.targets.rds;
+package cloudprober.rds;
 
-import "github.com/google/cloudprober/targets/rds/proto/rds.proto";
+import "github.com/google/cloudprober/rds/proto/rds.proto";
 
 // ClientConf represents resource discovery service (RDS) based targets.
 // Next tag: 5

diff --git a/targets/rds/examples/cloudprober_rds.cfg → rds/examples/cloudprober_rds.cfg b/targets/rds/examples/cloudprober_rds.cfg → rds/examples/cloudprober_rds.cfg
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ import ( @@
     	"fmt"
     	"sync"
-    	rdsserver "github.com/google/cloudprober/targets/rds/server"
+    	rdsserver "github.com/google/cloudprober/rds/server"
     	"google.golang.org/grpc"
     )
@@ Expand Down @@