remove DELETE IN directives in types.proto operator's test file (#19479)

This commit is contained in:
Marco André Dinis 2022-12-19 15:13:28 +00:00 committed by GitHub
parent 6c858c09ee
commit 63bc0e660f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -168,23 +168,23 @@ message DatabaseServerV3 {
message DatabaseServerSpecV3 {
// Description is a free-form text describing this database server.
//
// DEPRECATED: Moved to DatabaseSpecV3. DELETE IN 9.0.
// DEPRECATED: Moved to DatabaseSpecV3. D 9.0.
string Description = 1 [ (gogoproto.jsontag) = "description,omitempty", deprecated = true ];
// Protocol is the database type e.g. postgres, mysql, etc.
//
// DEPRECATED: Moved to DatabaseSpecV3. DELETE IN 9.0.
// DEPRECATED: Moved to DatabaseSpecV3. D 9.0.
string Protocol = 2 [ (gogoproto.jsontag) = "protocol", deprecated = true ];
// URI is the database connection address.
//
// DEPRECATED: Moved to DatabaseSpecV3. DELETE IN 9.0.
// DEPRECATED: Moved to DatabaseSpecV3. D 9.0.
string URI = 3 [ (gogoproto.jsontag) = "uri", deprecated = true ];
// CACert is an optional base64-encoded database CA certificate.
//
// DEPRECATED: Moved to DatabaseSpecV3. DELETE IN 9.0.
// DEPRECATED: Moved to DatabaseSpecV3. D 9.0.
bytes CACert = 4 [ (gogoproto.jsontag) = "ca_cert,omitempty", deprecated = true ];
// AWS contains AWS specific settings for RDS/Aurora databases.
//
// DEPRECATED: Moved to DatabaseSpecV3. DELETE IN 9.0.
// DEPRECATED: Moved to DatabaseSpecV3. D 9.0.
AWS AWS = 5 [ (gogoproto.nullable) = false, (gogoproto.jsontag) = "aws", deprecated = true ];
// Version is the Teleport version that the server is running.
string Version = 6 [ (gogoproto.jsontag) = "version" ];
@ -194,7 +194,7 @@ message DatabaseServerSpecV3 {
string HostID = 8 [ (gogoproto.jsontag) = "host_id" ];
// DynamicLabels is the database server dynamic labels.
//
// DEPRECATED: Moved to DatabaseSpecV3. DELETE IN 9.0.
// DEPRECATED: Moved to DatabaseSpecV3. D 9.0.
map<string, CommandLabelV2> DynamicLabels = 9 [
(gogoproto.nullable) = false,
(gogoproto.jsontag) = "dynamic_labels,omitempty",
@ -205,7 +205,7 @@ message DatabaseServerSpecV3 {
[ (gogoproto.nullable) = false, (gogoproto.jsontag) = "rotation,omitempty" ];
// GCP contains parameters specific to GCP Cloud SQL databases.
//
// DEPRECATED: Moved to DatabaseSpecV3. DELETE IN 9.0.
// DEPRECATED: Moved to DatabaseSpecV3. D 9.0.
GCPCloudSQL GCP = 11
[ (gogoproto.nullable) = false, (gogoproto.jsontag) = "gcp,omitempty", deprecated = true ];
// Database is the database proxied by this database server.
@ -247,7 +247,7 @@ message DatabaseSpecV3 {
string URI = 2 [ (gogoproto.jsontag) = "uri" ];
// CACert is the PEM-encoded database CA certificate.
//
// DEPRECATED: Moved to TLS.CACert. DELETE IN 10.0.
// DEPRECATED: Moved to TLS.CACert. D 10.0.
string CACert = 3 [ (gogoproto.jsontag) = "ca_cert,omitempty", deprecated = true ];
// DynamicLabels is the database dynamic labels.
map<string, CommandLabelV2> DynamicLabels = 4
@ -428,7 +428,7 @@ message ServerV2 {
}
// ServerV2List is a list of servers.
// DELETE IN 8.0.0 only used in deprecated GetNodes rpc
// D 8.0.0 only used in deprecated GetNodes rpc
message ServerV2List {
// Servers is a list of servers.
repeated ServerV2 Servers = 1;
@ -457,7 +457,7 @@ message ServerSpecV2 {
string Version = 7 [ (gogoproto.jsontag) = "version" ];
// Apps is a list of applications this server is proxying.
//
// DELETE IN 9.0. Deprecated, moved to AppServerSpecV3.
// D 9.0. Deprecated, moved to AppServerSpecV3.
repeated App Apps = 9 [ (gogoproto.jsontag) = "apps,omitempty", deprecated = true ];
// KubernetesClusters is a list of kubernetes clusters provided by this
// Proxy or KubeService server.
@ -547,7 +547,7 @@ message AppSpecV3 {
// App is a specific application that a server proxies.
//
// DELETE IN 9.0. Deprecated, use AppV3.
// D 9.0. Deprecated, use AppV3.
message App {
// Name is the name of the application.
string Name = 1 [ (gogoproto.jsontag) = "name" ];
@ -658,7 +658,7 @@ message CertAuthorityV2 {
message CertAuthoritySpecV2 {
// Type is either user or host certificate authority
string Type = 1 [ (gogoproto.jsontag) = "type", (gogoproto.casttype) = "CertAuthType" ];
// DELETE IN(2.7.0) this field is deprecated,
// D(2.7.0) this field is deprecated,
// as resource name matches cluster name after migrations.
// and this property is enforced by the auth server code.
// ClusterName identifies cluster name this authority serves,
@ -2650,7 +2650,7 @@ message OIDCConnectorSpecV3 {
// back to the identity provider after successful authentication.
// This should match the URL on the Provider's side.
//
// DELETE IN 11.0.0 in favor of RedirectURLs
// D 11.0.0 in favor of RedirectURLs
string RedirectURL = 4 [ (gogoproto.jsontag) = "-" ];
// ACR is an Authentication Context Class Reference value. The meaning of the ACR
// value is context-specific and varies for identity providers.
@ -2905,7 +2905,7 @@ message GithubConnectorSpecV3 {
string RedirectURL = 3 [ (gogoproto.jsontag) = "redirect_url" ];
// TeamsToLogins maps Github team memberships onto allowed logins/roles.
//
// DELETE IN 11.0.0
// D 11.0.0
// Deprecated: use GithubTeamsToRoles instead.
repeated TeamMapping TeamsToLogins = 4
[ (gogoproto.nullable) = false, (gogoproto.jsontag) = "teams_to_logins" ];
@ -3119,7 +3119,7 @@ message GithubClaims {
// TeamMapping represents a single team membership mapping.
//
// DELETE IN 11.0.0
// D 11.0.0
message TeamMapping {
// Organization is a Github organization a user belongs to.
string Organization = 1 [ (gogoproto.jsontag) = "organization" ];