X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fconfig%2Fgroups_test.go;h=e2666f1997876a6f2409de9614b2761d0ae39c53;hb=HEAD;hp=28aa82f7c9d02be4836b743e5f53528e12b2a4cc;hpb=bd6ba5af0268551d7ca59ba4bb52a72f30af3b53;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/config/groups_test.go b/cmd/safcm/config/groups_test.go
index 28aa82f..e2666f1 100644
--- a/cmd/safcm/config/groups_test.go
+++ b/cmd/safcm/config/groups_test.go
@@ -1,17 +1,5 @@
-// Copyright (C) 2021  Simon Ruderich
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright (C) 2021-2024  Simon Ruderich
 
 package config
 
@@ -29,7 +17,7 @@ func TestLoadGroups(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Chdir(cwd)
+	defer os.Chdir(cwd) //nolint:errcheck
 
 	err = os.Chdir("../testdata/project")
 	if err != nil {
@@ -55,7 +43,7 @@ func TestLoadGroups(t *testing.T) {
 		{
 			"../testdata/project",
 			&Config{
-				GroupOrder: []string{
+				GroupPriority: []string{
 					"detected_linux",
 					"detected_freebsd",
 				},
@@ -105,38 +93,38 @@ func TestLoadGroups(t *testing.T) {
 		{
 			"../testdata/project",
 			&Config{
-				GroupOrder: []string{
+				GroupPriority: []string{
 					"detected_freebsd",
 					"does-not-exist",
 				},
 			},
 			hosts,
 			nil,
-			fmt.Errorf("config.yaml: group_order: group \"does-not-exist\" does not exist"),
+			fmt.Errorf("config.yaml: group_priority: group \"does-not-exist\" does not exist"),
 		},
 		{
 			"../testdata/project",
 			&Config{
-				GroupOrder: []string{
+				GroupPriority: []string{
 					"detected_freebsd",
 					"special:group",
 				},
 			},
 			hosts,
 			nil,
-			fmt.Errorf("config.yaml: group_order: invalid group name \"special:group\""),
+			fmt.Errorf("config.yaml: group_priority: invalid group name \"special:group\""),
 		},
 		{
 			"../testdata/project",
 			&Config{
-				GroupOrder: []string{
+				GroupPriority: []string{
 					"detected_freebsd",
 					"group:remove",
 				},
 			},
 			hosts,
 			nil,
-			fmt.Errorf("config.yaml: group_order: invalid group name \"group:remove\""),
+			fmt.Errorf("config.yaml: group_priority: invalid group name \"group:remove\""),
 		},
 
 		{
@@ -186,7 +174,7 @@ func TestLoadGroups(t *testing.T) {
 			&Config{},
 			&Hosts{},
 			nil,
-			fmt.Errorf("groups.yaml: group \"1group2\": group \"does-not-exist\" not found"),
+			fmt.Errorf("groups.yaml: group \"group2\": member \"does-not-exist\" not found"),
 		},
 		{
 			"../testdata/group-invalid-name",
@@ -216,7 +204,7 @@ func TestResolveHostGroups(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Chdir(cwd)
+	defer os.Chdir(cwd) //nolint:errcheck
 
 	err = os.Chdir("../testdata/project")
 	if err != nil {
@@ -332,7 +320,7 @@ func TestTransitivelyDetectedGroups(t *testing.T) {
 	tests := []struct {
 		name   string
 		groups map[string][]string
-		exp    []string
+		exp    map[string]bool
 	}{
 
 		{
@@ -351,7 +339,7 @@ func TestTransitivelyDetectedGroups(t *testing.T) {
 					"d",
 				},
 			},
-			nil,
+			map[string]bool{},
 		},
 
 		{
@@ -367,8 +355,8 @@ func TestTransitivelyDetectedGroups(t *testing.T) {
 					"d",
 				},
 			},
-			[]string{
-				"group-a",
+			map[string]bool{
+				"group-a": true,
 			},
 		},
 
@@ -389,8 +377,8 @@ func TestTransitivelyDetectedGroups(t *testing.T) {
 					"d",
 				},
 			},
-			[]string{
-				"group-a",
+			map[string]bool{
+				"group-a": true,
 			},
 		},
 
@@ -418,12 +406,12 @@ func TestTransitivelyDetectedGroups(t *testing.T) {
 					"b",
 				},
 			},
-			[]string{
-				"group-a",
-				"group-b",
-				"group-c",
-				"group-d",
-				"group-e",
+			map[string]bool{
+				"group-a": true,
+				"group-b": true,
+				"group-c": true,
+				"group-d": true,
+				"group-e": true,
 			},
 		},
 
@@ -453,12 +441,12 @@ func TestTransitivelyDetectedGroups(t *testing.T) {
 					"b",
 				},
 			},
-			[]string{
-				"group-a",
-				"group-b",
-				"group-c",
-				"group-d",
-				"group-e",
+			map[string]bool{
+				"group-a": true,
+				"group-b": true,
+				"group-c": true,
+				"group-d": true,
+				"group-e": true,
 			},
 		},
 	}