config/test: remove deprecated tests

some of these tests were relying on the fact that the unmarshal of the configuration does not panic but it's against yaml lib definition: if the lib can not unmarshal, it will just panic. we also drop tests regarding hyphen -> underscore conversation: this support is removed. Signed-off-by: Mathieu Tortuyaux <[email protected]>
flatcar · Feb 23, 2024 · 95ceb15 · 95ceb15
1 parent 1bbfd30
commit 95ceb15
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 135 deletions.
diff --git a/config/config_test.go b/config/config_test.go
@@ -34,15 +34,11 @@ func TestNewCloudConfig(t *testing.T) {
 			config:   CloudConfig{WriteFiles: []File{{Path: "underscore"}}},
 		},
 		{
-			contents: "#cloud-config\nwrite-files:\n  - path: hyphen",
-			config:   CloudConfig{WriteFiles: []File{{Path: "hyphen"}}},
-		},
-		{
-			contents: "#cloud-config\ncoreos:\n  update:\n    reboot-strategy: off",
+			contents: "#cloud-config\ncoreos:\n  update:\n    reboot_strategy: off",
 			config:   CloudConfig{CoreOS: CoreOS{Update: Update{RebootStrategy: "off"}}},
 		},
 		{
-			contents: "#cloud-config\ncoreos:\n  update:\n    reboot-strategy: false",
+			contents: "#cloud-config\ncoreos:\n  update:\n    reboot_strategy: false",
 			config:   CloudConfig{CoreOS: CoreOS{Update: Update{RebootStrategy: "false"}}},
 		},
 		{
@@ -376,23 +372,6 @@ Address=10.209.171.177/19
 	}
 }
 
-// Assert that our interface conversion doesn't panic
-func TestCloudConfigKeysNotList(t *testing.T) {
-	contents := `
-ssh_authorized_keys:
-  - foo: bar
-`
-	cfg, err := NewCloudConfig(contents)
-	if err != nil {
-		t.Fatalf("Encountered unexpected error: %v", err)
-	}
-
-	keys := cfg.SSHAuthorizedKeys
-	if len(keys) != 0 {
-		t.Error("Parsed incorrect number of SSH keys")
-	}
-}
-
 func TestCloudConfigSerializationHeader(t *testing.T) {
 	cfg, _ := NewCloudConfig("")
 	contents := cfg.String()

diff --git a/config/validate/rules_test.go b/config/validate/rules_test.go
@@ -125,36 +125,11 @@ func TestCheckStructure(t *testing.T) {
 			entries: []Entry{{entryWarning, "deprecated key \"etcd\" (etcd is no longer shipped in Container Linux)", 2}, {entryWarning, "deprecated key \"proxy\" (etcd2 options no longer work for etcd)", 3}},
 		},
 
-		// Test for error on list of nodes
-		{
-			config: "coreos:\n  units:\n    - hello\n    - goodbye",
-			entries: []Entry{
-				{entryWarning, "incorrect type for \"units[0]\" (want struct)", 3},
-				{entryWarning, "incorrect type for \"units[1]\" (want struct)", 4},
-			},
-		},
-
 		// Test for incorrect types
 		// Want boolean
 		{
 			config: "coreos:\n  units:\n    - enable: true",
 		},
-		{
-			config:  "coreos:\n  units:\n    - enable: 4",
-			entries: []Entry{{entryWarning, "incorrect type for \"enable\" (want bool)", 3}},
-		},
-		{
-			config:  "coreos:\n  units:\n    - enable: bad",
-			entries: []Entry{{entryWarning, "incorrect type for \"enable\" (want bool)", 3}},
-		},
-		{
-			config:  "coreos:\n  units:\n    - enable:\n        bad:",
-			entries: []Entry{{entryWarning, "incorrect type for \"enable\" (want bool)", 3}},
-		},
-		{
-			config:  "coreos:\n  units:\n    - enable:\n      - bad",
-			entries: []Entry{{entryWarning, "incorrect type for \"enable\" (want bool)", 3}},
-		},
 		// Want string
 		{
 			config: "hostname: true",
@@ -165,96 +140,12 @@ func TestCheckStructure(t *testing.T) {
 		{
 			config: "hostname: host",
 		},
-		{
-			config:  "hostname:\n  name:",
-			entries: []Entry{{entryWarning, "incorrect type for \"hostname\" (want string)", 1}},
-		},
-		{
-			config:  "hostname:\n  - name",
-			entries: []Entry{{entryWarning, "incorrect type for \"hostname\" (want string)", 1}},
-		},
-		// Want struct
-		{
-			config:  "coreos: true",
-			entries: []Entry{{entryWarning, "incorrect type for \"coreos\" (want struct)", 1}},
-		},
-		{
-			config:  "coreos: 4",
-			entries: []Entry{{entryWarning, "incorrect type for \"coreos\" (want struct)", 1}},
-		},
-		{
-			config:  "coreos: hello",
-			entries: []Entry{{entryWarning, "incorrect type for \"coreos\" (want struct)", 1}},
-		},
-		{
-			config:  "coreos:\n  - hello",
-			entries: []Entry{{entryWarning, "incorrect type for \"coreos\" (want struct)", 1}},
-		},
-		// Want []string
-		{
-			config:  "ssh_authorized_keys: true",
-			entries: []Entry{{entryWarning, "incorrect type for \"ssh_authorized_keys\" (want []string)", 1}},
-		},
-		{
-			config:  "ssh_authorized_keys: 4",
-			entries: []Entry{{entryWarning, "incorrect type for \"ssh_authorized_keys\" (want []string)", 1}},
-		},
-		{
-			config:  "ssh_authorized_keys: key",
-			entries: []Entry{{entryWarning, "incorrect type for \"ssh_authorized_keys\" (want []string)", 1}},
-		},
-		{
-			config:  "ssh_authorized_keys:\n  key: value",
-			entries: []Entry{{entryWarning, "incorrect type for \"ssh_authorized_keys\" (want []string)", 1}},
-		},
 		{
 			config: "ssh_authorized_keys:\n  - key",
 		},
-		{
-			config:  "ssh_authorized_keys:\n  - key: value",
-			entries: []Entry{{entryWarning, "incorrect type for \"ssh_authorized_keys[0]\" (want string)", 2}},
-		},
-		// Want []struct
-		{
-			config:  "users:\n  true",
-			entries: []Entry{{entryWarning, "incorrect type for \"users\" (want []struct)", 1}},
-		},
-		{
-			config:  "users:\n  4",
-			entries: []Entry{{entryWarning, "incorrect type for \"users\" (want []struct)", 1}},
-		},
-		{
-			config:  "users:\n  bad",
-			entries: []Entry{{entryWarning, "incorrect type for \"users\" (want []struct)", 1}},
-		},
-		{
-			config:  "users:\n  bad:",
-			entries: []Entry{{entryWarning, "incorrect type for \"users\" (want []struct)", 1}},
-		},
 		{
 			config: "users:\n  - name: good",
 		},
-		// Want struct within array
-		{
-			config:  "users:\n  - true",
-			entries: []Entry{{entryWarning, "incorrect type for \"users[0]\" (want struct)", 2}},
-		},
-		{
-			config:  "users:\n  - name: hi\n  - true",
-			entries: []Entry{{entryWarning, "incorrect type for \"users[1]\" (want struct)", 3}},
-		},
-		{
-			config:  "users:\n  - 4",
-			entries: []Entry{{entryWarning, "incorrect type for \"users[0]\" (want struct)", 2}},
-		},
-		{
-			config:  "users:\n  - bad",
-			entries: []Entry{{entryWarning, "incorrect type for \"users[0]\" (want struct)", 2}},
-		},
-		{
-			config:  "users:\n  - - bad",
-			entries: []Entry{{entryWarning, "incorrect type for \"users[0]\" (want struct)", 2}},
-		},
 	}
 
 	for i, tt := range tests {

diff --git a/config/validate/validate_test.go b/config/validate/validate_test.go
@@ -28,7 +28,7 @@ func TestParseCloudConfig(t *testing.T) {
 	}{
 		{},
 		{
-			config: "	",
+			config:  "	",
 			entries: []Entry{{entryError, "found character that cannot start any token", 1}},
 		},
 		{
@@ -80,11 +80,11 @@ func TestValidateCloudConfig(t *testing.T) {
 			rules:  Rules,
 		},
 		{
-			config: "coreos:\n  update:\n    reboot-strategy: off",
+			config: "coreos:\n  update:\n    reboot_strategy: off",
 			rules:  Rules,
 		},
 		{
-			config: "coreos:\n  update:\n    reboot-strategy: false",
+			config: "coreos:\n  update:\n    reboot_strategy: false",
 			rules:  Rules,
 			report: Report{entries: []Entry{{entryError, "invalid value false", 3}}},
 		},