Merge branch 'master' into atburke/ec2-concurrent-write

gravitational · Jun 1, 2022 · 276e331 · 276e331
2 parents 04b319c + 4a056b9
commit 276e331
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 21 deletions.
diff --git a/lib/config/fileconf.go b/lib/config/fileconf.go
@@ -1019,11 +1019,6 @@ func (ssh *SSH) X11ServerConfig() (*x11.ServerConfig, error) {
 		}
 	}
 
-	// DELETE IN 10.0.0 (Joerger): yaml typo, use MaxDisplay.
-	if ssh.X11.MaxDisplays != nil && ssh.X11.MaxDisplay == nil {
-		ssh.X11.MaxDisplay = ssh.X11.MaxDisplays
-	}
-
 	cfg.MaxDisplay = cfg.DisplayOffset + x11.DefaultMaxDisplays
 	if ssh.X11.MaxDisplay != nil {
 		cfg.MaxDisplay = int(*ssh.X11.MaxDisplay)
@@ -1142,8 +1137,6 @@ type X11 struct {
 	// MaxDisplay tells the server what X11 display number to stop at when
 	// searching for an open X11 unix socket for XServer proxies.
 	MaxDisplay *uint `yaml:"max_display,omitempty"`
-	// DELETE IN 10.0.0 (Joerger): yaml typo, use MaxDisplay.
-	MaxDisplays *uint `yaml:"max_displays,omitempty"`
 }
 
 // Databases represents the database proxy service configuration.

diff --git a/lib/config/fileconf_test.go b/lib/config/fileconf_test.go
@@ -544,20 +544,6 @@ func TestX11Config(t *testing.T) {
 				DisplayOffset: x11.DefaultDisplayOffset,
 				MaxDisplay:    100,
 			},
-		}, {
-			// DELETE IN 10.0.0 (Joerger): yaml typo, use max_display.
-			desc: "max displays set",
-			mutate: func(cfg cfgMap) {
-				cfg["ssh_service"].(cfgMap)["x11"] = cfgMap{
-					"enabled":      "yes",
-					"max_displays": 100,
-				}
-			},
-			expectX11Config: &x11.ServerConfig{
-				Enabled:       true,
-				DisplayOffset: x11.DefaultDisplayOffset,
-				MaxDisplay:    100,
-			},
 		}, {
 			desc: "max display value capped",
 			mutate: func(cfg cfgMap) {