[v18] Adds scope to ServerV2 in SSH heartbeats

api/proto/teleport/legacy/client/proto/inventory.proto

@@ -99,6 +99,9 @@ message UpstreamInventoryHello {
   string ExternalUpgraderVersion = 6;
   // UpdaterInfo is used by Teleport to send information about how the Teleport updater is doing.
   types.UpdaterV2Info UpdaterInfo = 8;
+  // The advertized scope of the instance. An instance's scope can not change once assigned, so future
+  // heartbeats must include a scope value matching the one declared in the hello message.
+  string scope = 9;
 }
 
 // UpstreamInventoryAgentMetadata is the message sent up the inventory control stream containing

api/proto/teleport/legacy/types/types.proto

@@ -208,6 +208,8 @@ message DatabaseServerV3 {
     (gogoproto.nullable) = false,
     (gogoproto.jsontag) = "status"
   ];
+  // The advertized scope of the server which can not change once assigned.
+  string scope = 7;
 }
 
 // DatabaseServerSpecV3 is the database server spec.
@@ -923,6 +925,8 @@ message ServerV2 {
     (gogoproto.nullable) = false,
     (gogoproto.jsontag) = "spec"
   ];
+  // The advertized scope of the server which can not change once assigned.
+  string scope = 6;
 }
 
 // ServerSpecV2 is a specification for V2 Server
@@ -1030,6 +1034,8 @@ message AppServerV3 {
     (gogoproto.nullable) = false,
     (gogoproto.jsontag) = "spec"
   ];
+  // The advertized scope of the server which can not change once assigned.
+  string scope = 6;
 }
 
 // AppServerSpecV3 is the app access server spec.
@@ -5240,6 +5246,8 @@ message KubernetesServerV3 {
   ];
   // Status is the Kubernetes server status.
   KubernetesServerStatusV3 status = 6;
+  // The advertized scope of the server which can not change once assigned.
+  string scope = 7;
 }
 
 // KubernetesServerSpecV3 is the Kubernetes server spec.

api/proto/teleport/presence/v1/relay_server.proto

@@ -58,4 +58,7 @@ message RelayServer {
     bool terminating = 6;
   }
   Spec spec = 5;
+  // The advertized scope of the server. A server's scope can not change once assigned, so
+  // heartbeats must include a scope value matching the one declared in the hello message.
+  string scope = 6;
 }

api/types/appserver.go

@@ -68,6 +68,8 @@ type AppServer interface {
 	// GetRelayIDs returns the list of Relay host IDs that the app server is
 	// connected to.
 	GetRelayIDs() []string
+	// GetScope returns the scope this server belongs to.
+	GetScope() string
 }
 
 // NewAppServerV3 creates a new app server instance.
@@ -353,6 +355,11 @@ func (s *AppServerV3) MatchSearch(values []string) bool {
 	return MatchSearch(nil, values, nil)
 }
 
+// GetScope returns the scope this server belongs to.
+func (s *AppServerV3) GetScope() string {
+	return s.Scope
+}
+
 // AppServers represents a list of app servers.
 type AppServers []AppServer
 

api/types/databaseserver.go

@@ -71,6 +71,8 @@ type DatabaseServer interface {
 	GetTargetHealthStatus() TargetHealthStatus
 	// SetTargetHealthStatus sets target health status
 	SetTargetHealthStatus(status TargetHealthStatus)
+	// GetScope returns the scope this server belongs to.
+	GetScope() string
 }
 
 // NewDatabaseServerV3 creates a new database server instance.
@@ -304,6 +306,11 @@ func (s *DatabaseServerV3) Copy() DatabaseServer {
 	return utils.CloneProtoMsg(s)
 }
 
+// GetScope returns the scope this server belongs to.
+func (s *DatabaseServerV3) GetScope() string {
+	return s.Scope
+}
+
 // CloneResource returns a copy of this database server object.
 func (s *DatabaseServerV3) CloneResource() ResourceWithLabels {
 	return s.Copy()

api/types/kubernetes_server.go

@@ -72,6 +72,8 @@ type KubeServer interface {
 	// GetRelayIDs returns the list of Relay host IDs that the kube server is
 	// connected to.
 	GetRelayIDs() []string
+	// GetScope returns the scope this server belongs to.
+	GetScope() string
 }
 
 // NewKubernetesServerV3 creates a new kube server instance.
@@ -380,6 +382,11 @@ func (s *KubernetesServerV3) GetStatus() *KubernetesServerStatusV3 {
 	return s.Status
 }
 
+// GetScope returns the scope this server belongs to.
+func (s *KubernetesServerV3) GetScope() string {
+	return s.Scope
+}
+
 // GetTargetHealth gets the health of a Kubernetes cluster.
 func (s *KubernetesServerStatusV3) GetTargetHealth() *TargetHealth {
 	if s == nil {

api/types/server.go

@@ -112,6 +112,8 @@ type Server interface {
 
 	// GetGitHub returns the GitHub server spec.
 	GetGitHub() *GitHubServerMetadata
+	// GetScope returns the scope this server belongs to.
+	GetScope() string
 }
 
 // NewServer creates an instance of Server.
@@ -749,6 +751,11 @@ func (s *ServerV2) SetCloudMetadata(meta *CloudMetadata) {
 	s.Spec.CloudMetadata = meta
 }
 
+// GetScope returns the scope this server belongs to.
+func (s *ServerV2) GetScope() string {
+	return s.Scope
+}
+
 // CommandLabel is a label that has a value as a result of the
 // output generated by running command, e.g. hostname
 type CommandLabel interface {