diff --git a/cmd/adsysd/client/testdata/TestColorizePolicies/golden b/cmd/adsysd/client/testdata/TestColorizePolicies/golden index 29a3b4c91..bd17dd65b 100644 --- a/cmd/adsysd/client/testdata/TestColorizePolicies/golden +++ b/cmd/adsysd/client/testdata/TestColorizePolicies/golden @@ -1,19 +1,19 @@ -Policies from machine configuration: +Policies from machine configuration: - GPOName1 ({GPOId1}) - - dconf: + - dconf: - path/to/key1: ValueOfKey1 - path/to/key2: ValueOfKey2 - path/to/systemdefault: Locked to system default - - scripts: + - scripts: - path/to/key3: Disabled - GPOName2 ({GPOId2}) - - dconf: + - dconf: - path/to/keyGpo2-1: ValueOfKeyGpo2-1 -Policies from user configuration: +Policies from user configuration: - GPOName3 ({GPOId2}) - - dconf: + - dconf:  - path/to/key1: ValueOfKey1\nOn\nMultilines  - path/to/key2: ValueOfKey2 - - scripts: + - scripts:  - path/to/key3: Disabled diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_applied_gpos b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_applied_gpos index f46326359..11aed4f7a 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_applied_gpos +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_applied_gpos @@ -1,8 +1,8 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_default_domain_completion b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_default_domain_completion index f46326359..11aed4f7a 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_default_domain_completion +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_default_domain_completion @@ -1,8 +1,8 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_domain_username b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_domain_username index f46326359..11aed4f7a 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_domain_username +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_domain_username @@ -1,8 +1,8 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_with_overrides_(all) b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_with_overrides_(all) index 73bfed108..762b828ed 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_with_overrides_(all) +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_with_overrides_(all) @@ -1,31 +1,31 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - - dconf: + - dconf: - org/gnome/shell/common-key: machine value - - gdm: + - gdm: - dconf/org/gnome/desktop/interface/clock-format: 24h - dconf/org/gnome/desktop/interface/clock-show-date: false - dconf/org/gnome/desktop/interface/clock-show-weekday: true - - privilege: + - privilege: - allow-local-admins: Disabled - client-admins: bob@example.com,%mygroup@example2.com - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - - dconf: + - dconf: - org/gnome/shell/disabled-value: Locked to system default  - org/gnome/shell/common-key: user value - org/gnome/shell/common-key-user: user value on RnD Policy - org/gnome/shell/favorite-apps: 'libreoffice-writer.desktop'\n'snap-store_ubuntu-software.desktop'\n'yelp.desktop - - scripts: + - scripts: - logon: local-script-user-logon - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - - dconf: + - dconf: - org/gnome/desktop/background/picture-options: stretched - org/gnome/desktop/background/picture-uri: file:///usr/share/backgrounds/canonical.png  - org/gnome/shell/common-key-user: Locked to system default  - org/gnome/shell/favorite-apps: 'firefox.desktop'\n'thunderbird.desktop'\n'org.gnome.Nautilus.desktop' - - scripts: + - scripts: - logon: script-user-logon\nsubdirectory/other-logon - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_without_override b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_without_override index 8bdeddea8..33c8f56a8 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_without_override +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_without_override @@ -1,28 +1,28 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - - dconf: + - dconf: - org/gnome/shell/common-key: machine value - - gdm: + - gdm: - dconf/org/gnome/desktop/interface/clock-format: 24h - dconf/org/gnome/desktop/interface/clock-show-date: false - dconf/org/gnome/desktop/interface/clock-show-weekday: true - - privilege: + - privilege: - allow-local-admins: Disabled - client-admins: bob@example.com,%mygroup@example2.com - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - - dconf: + - dconf: - org/gnome/shell/disabled-value: Locked to system default - org/gnome/shell/common-key-user: user value on RnD Policy - org/gnome/shell/favorite-apps: 'libreoffice-writer.desktop'\n'snap-store_ubuntu-software.desktop'\n'yelp.desktop - - scripts: + - scripts: - logon: local-script-user-logon - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - - dconf: + - dconf: - org/gnome/desktop/background/picture-options: stretched - org/gnome/desktop/background/picture-uri: file:///usr/share/backgrounds/canonical.png - - scripts: + - scripts: - logon: script-user-logon\nsubdirectory/other-logon - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos index f46326359..11aed4f7a 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos @@ -1,8 +1,8 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos_with_mixed_case b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos_with_mixed_case index f46326359..11aed4f7a 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos_with_mixed_case +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos_with_mixed_case @@ -1,8 +1,8 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/go.mod b/go.mod index 5c29747ee..e7191265f 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/charmbracelet/glamour v0.6.0 github.com/charmbracelet/lipgloss v0.9.1 github.com/coreos/go-systemd/v22 v22.5.0 - github.com/fatih/color v1.15.0 + github.com/fatih/color v1.16.0 github.com/fsnotify/fsnotify v1.7.0 github.com/godbus/dbus/v5 v5.1.0 github.com/golang/protobuf v1.5.3 @@ -58,7 +58,7 @@ require ( github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-localereader v0.0.1 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect github.com/microcosm-cc/bluemonday v1.0.21 // indirect diff --git a/go.sum b/go.sum index 4314c2c66..4d8dc9710 100644 --- a/go.sum +++ b/go.sum @@ -81,8 +81,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= @@ -190,8 +190,8 @@ github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRH github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= -github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=