diff --git a/.github/actions/repo/index.html b/.github/actions/repo/index.html index 56091f27..9c4d8241 100644 --- a/.github/actions/repo/index.html +++ b/.github/actions/repo/index.html @@ -17,8 +17,8 @@

authentik Platform packages

Desktop packages

diff --git a/.vscode/launch.json b/.vscode/launch.json index 7cb95b36..d27dc6b2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "type": "go", "request": "launch", "mode": "auto", - "program": "${workspaceFolder}/cmd/agent_local/", + "program": "${workspaceFolder}/cmd/agent/", "buildFlags": ["-tags=debug"] }, { diff --git a/Makefile b/Makefile index bb51fd08..fe30fc06 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ test-integration: $(MAKE) test TEST_FLAGS=-tags=integration test-agent: - go run -v ./cmd/agent_local/ + go run -v ./cmd/agent/ test-setup: go run -v ./cmd/cli setup -v http://authentik:9000 @@ -115,10 +115,10 @@ cli/%: "$(MAKE)" -C "${TOP}/cmd/cli" $* sysd/%: - "$(MAKE)" -C "${TOP}/cmd/agent_system" $* + "$(MAKE)" -C "${TOP}/cmd/sysd" $* agent/%: - "$(MAKE)" -C "${TOP}/cmd/agent_local" $* + "$(MAKE)" -C "${TOP}/cmd/agent" $* browser-ext/%: "$(MAKE)" -C "${TOP}/browser-ext/" $* diff --git a/README.md b/README.md index c88f533a..da02d6b3 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ The primary supported development environment is devcontainers included with thi To build all the packages and install them on the dev container, run `make test-full` -The local agent is required for most testing; create a new terminal and run `./bin/agent_local/ak-agent`. +The local agent is required for most testing; create a new terminal and run `./bin/agent/ak-agent`. ### macOS Dependencies diff --git a/cmd/agent_local/Makefile b/cmd/agent/Makefile similarity index 97% rename from cmd/agent_local/Makefile rename to cmd/agent/Makefile index 856bcdf4..de7fb0da 100644 --- a/cmd/agent_local/Makefile +++ b/cmd/agent/Makefile @@ -1,6 +1,6 @@ include ../../common.mk -TARGET := agent_local +TARGET := agent ifeq ($(OS),Windows_NT) BINARY_NAME := ak-agent.exe else @@ -43,7 +43,7 @@ package-darwin: clean build cp "$(shell grep -Rl io.goauthentik.platform.agent ~/Library/MobileDevice/Provisioning\ Profiles)" "${TOP}/bin/${TARGET}/${MACOS_APP_NAME}/Contents/embedded.provisionprofile" cp "${TOP}/bin/${TARGET}/${BINARY_NAME}" "${TOP}/bin/${TARGET}/${MACOS_APP_NAME}/Contents/MacOS/" cp "${TOP}/bin/cli/ak" "${TOP}/bin/${TARGET}/${MACOS_APP_NAME}/Contents/MacOS/" - cp "${TOP}/bin/agent_system/ak-sysd" "${TOP}/bin/${TARGET}/${MACOS_APP_NAME}/Contents/MacOS/" + cp "${TOP}/bin/sysd/ak-sysd" "${TOP}/bin/${TARGET}/${MACOS_APP_NAME}/Contents/MacOS/" cp "${TOP}/bin/browser_support/ak-browser-support" "${TOP}/bin/${TARGET}/${MACOS_APP_NAME}/Contents/MacOS/ak-browser-support" ln -s "ak" "${TOP}/bin/${TARGET}/${MACOS_APP_NAME}/Contents/MacOS/ak-vault" || true cp -R "${TOP}/bin/psso/PSSO.appex" "${TOP}/bin/${TARGET}/${MACOS_APP_NAME}/Contents/PlugIns/PSSO.appex" || true diff --git a/cmd/agent_local/main.go b/cmd/agent/main.go similarity index 93% rename from cmd/agent_local/main.go rename to cmd/agent/main.go index 53179a36..613f5e9f 100644 --- a/cmd/agent_local/main.go +++ b/cmd/agent/main.go @@ -4,7 +4,7 @@ import ( "os" log "github.com/sirupsen/logrus" - agent "goauthentik.io/platform/pkg/agent_local" + "goauthentik.io/platform/pkg/agent" systemlog "goauthentik.io/platform/pkg/platform/log" "goauthentik.io/platform/pkg/platform/pstr" "goauthentik.io/platform/pkg/shared" diff --git a/cmd/agent_local/package/linux/etc/systemd/user/ak-agent.service b/cmd/agent/package/linux/etc/systemd/user/ak-agent.service similarity index 100% rename from cmd/agent_local/package/linux/etc/systemd/user/ak-agent.service rename to cmd/agent/package/linux/etc/systemd/user/ak-agent.service diff --git a/cmd/agent_local/package/linux/nfpm.yaml b/cmd/agent/package/linux/nfpm.yaml similarity index 94% rename from cmd/agent_local/package/linux/nfpm.yaml rename to cmd/agent/package/linux/nfpm.yaml index 76771afb..41a9c0df 100644 --- a/cmd/agent_local/package/linux/nfpm.yaml +++ b/cmd/agent/package/linux/nfpm.yaml @@ -12,7 +12,7 @@ license: "MIT" scripts: postinstall: ./package/linux/postinst.sh contents: - - src: ../../bin/agent_local/ak-agent + - src: ../../bin/agent/ak-agent dst: /usr/bin/ak-agent - src: ./package/linux/etc/systemd/user/ak-agent.service dst: /etc/systemd/user/ak-agent.service diff --git a/cmd/agent_local/package/linux/postinst.sh b/cmd/agent/package/linux/postinst.sh similarity index 100% rename from cmd/agent_local/package/linux/postinst.sh rename to cmd/agent/package/linux/postinst.sh diff --git a/cmd/agent_local/package/linux/usr/share/polkit-1/actions/io.goauthentik.platform.policy b/cmd/agent/package/linux/usr/share/polkit-1/actions/io.goauthentik.platform.policy similarity index 100% rename from cmd/agent_local/package/linux/usr/share/polkit-1/actions/io.goauthentik.platform.policy rename to cmd/agent/package/linux/usr/share/polkit-1/actions/io.goauthentik.platform.policy diff --git a/cmd/agent_local/package/macos/authentik Agent.app/Contents/Info.plist b/cmd/agent/package/macos/authentik Agent.app/Contents/Info.plist similarity index 100% rename from cmd/agent_local/package/macos/authentik Agent.app/Contents/Info.plist rename to cmd/agent/package/macos/authentik Agent.app/Contents/Info.plist diff --git a/cmd/agent_local/package/macos/authentik Agent.app/Contents/Resources/browser-host-chrome.json b/cmd/agent/package/macos/authentik Agent.app/Contents/Resources/browser-host-chrome.json similarity index 100% rename from cmd/agent_local/package/macos/authentik Agent.app/Contents/Resources/browser-host-chrome.json rename to cmd/agent/package/macos/authentik Agent.app/Contents/Resources/browser-host-chrome.json diff --git a/cmd/agent_local/package/macos/authentik Agent.app/Contents/Resources/browser-host-firefox.json b/cmd/agent/package/macos/authentik Agent.app/Contents/Resources/browser-host-firefox.json similarity index 100% rename from cmd/agent_local/package/macos/authentik Agent.app/Contents/Resources/browser-host-firefox.json rename to cmd/agent/package/macos/authentik Agent.app/Contents/Resources/browser-host-firefox.json diff --git a/cmd/agent_local/package/macos/authentik Agent.app/Contents/Resources/icon.icns b/cmd/agent/package/macos/authentik Agent.app/Contents/Resources/icon.icns similarity index 100% rename from cmd/agent_local/package/macos/authentik Agent.app/Contents/Resources/icon.icns rename to cmd/agent/package/macos/authentik Agent.app/Contents/Resources/icon.icns diff --git a/cmd/agent_local/package/macos/authentikEndpoint.entitlements b/cmd/agent/package/macos/authentikEndpoint.entitlements similarity index 100% rename from cmd/agent_local/package/macos/authentikEndpoint.entitlements rename to cmd/agent/package/macos/authentikEndpoint.entitlements diff --git a/cmd/agent_local/package/macos/distribution.xml b/cmd/agent/package/macos/distribution.xml similarity index 100% rename from cmd/agent_local/package/macos/distribution.xml rename to cmd/agent/package/macos/distribution.xml diff --git a/cmd/agent_local/package/macos/scripts/daemon.plist b/cmd/agent/package/macos/scripts/daemon.plist similarity index 100% rename from cmd/agent_local/package/macos/scripts/daemon.plist rename to cmd/agent/package/macos/scripts/daemon.plist diff --git a/cmd/agent_local/package/macos/scripts/postinstall b/cmd/agent/package/macos/scripts/postinstall similarity index 100% rename from cmd/agent_local/package/macos/scripts/postinstall rename to cmd/agent/package/macos/scripts/postinstall diff --git a/cmd/agent_local/package/macos/scripts/preinstall b/cmd/agent/package/macos/scripts/preinstall similarity index 100% rename from cmd/agent_local/package/macos/scripts/preinstall rename to cmd/agent/package/macos/scripts/preinstall diff --git a/cmd/agent_local/package/macos/scripts/sysd-config.json b/cmd/agent/package/macos/scripts/sysd-config.json similarity index 100% rename from cmd/agent_local/package/macos/scripts/sysd-config.json rename to cmd/agent/package/macos/scripts/sysd-config.json diff --git a/cmd/agent_local/package/windows/.gitignore b/cmd/agent/package/windows/.gitignore similarity index 100% rename from cmd/agent_local/package/windows/.gitignore rename to cmd/agent/package/windows/.gitignore diff --git a/cmd/agent_local/package/windows/Package.wxs b/cmd/agent/package/windows/Package.wxs similarity index 98% rename from cmd/agent_local/package/windows/Package.wxs rename to cmd/agent/package/windows/Package.wxs index 970a0c4d..39e97b4f 100644 --- a/cmd/agent_local/package/windows/Package.wxs +++ b/cmd/agent/package/windows/Package.wxs @@ -40,10 +40,10 @@ + Source="$(env.ROOT)/cmd/sysd/package/windows/config.json" /> diff --git a/cmd/agent_local/package/windows/UI.wxs b/cmd/agent/package/windows/UI.wxs similarity index 100% rename from cmd/agent_local/package/windows/UI.wxs rename to cmd/agent/package/windows/UI.wxs diff --git a/cmd/agent_local/package/windows/agent.wixproj b/cmd/agent/package/windows/agent.wixproj similarity index 100% rename from cmd/agent_local/package/windows/agent.wixproj rename to cmd/agent/package/windows/agent.wixproj diff --git a/cmd/agent_local/package/windows/browser-host-chrome.json b/cmd/agent/package/windows/browser-host-chrome.json similarity index 100% rename from cmd/agent_local/package/windows/browser-host-chrome.json rename to cmd/agent/package/windows/browser-host-chrome.json diff --git a/cmd/agent_local/package/windows/browser-host-firefox.json b/cmd/agent/package/windows/browser-host-firefox.json similarity index 100% rename from cmd/agent_local/package/windows/browser-host-firefox.json rename to cmd/agent/package/windows/browser-host-firefox.json diff --git a/cmd/agent_local/package/windows/resources/WixUIBannerBmp.png b/cmd/agent/package/windows/resources/WixUIBannerBmp.png similarity index 100% rename from cmd/agent_local/package/windows/resources/WixUIBannerBmp.png rename to cmd/agent/package/windows/resources/WixUIBannerBmp.png diff --git a/cmd/agent_local/package/windows/resources/WixUIDialogBmp.png b/cmd/agent/package/windows/resources/WixUIDialogBmp.png similarity index 100% rename from cmd/agent_local/package/windows/resources/WixUIDialogBmp.png rename to cmd/agent/package/windows/resources/WixUIDialogBmp.png diff --git a/cmd/agent_local/package/windows/resources/icon.ico b/cmd/agent/package/windows/resources/icon.ico similarity index 100% rename from cmd/agent_local/package/windows/resources/icon.ico rename to cmd/agent/package/windows/resources/icon.ico diff --git a/cmd/agent_system/Makefile b/cmd/sysd/Makefile similarity index 98% rename from cmd/agent_system/Makefile rename to cmd/sysd/Makefile index ddf68e54..2898a3b2 100644 --- a/cmd/agent_system/Makefile +++ b/cmd/sysd/Makefile @@ -1,6 +1,6 @@ include ../../common.mk -TARGET := agent_system +TARGET := sysd ifeq ($(OS),Windows_NT) BINARY_NAME := ak-sysd.exe else diff --git a/cmd/agent_system/main.go b/cmd/sysd/main.go similarity index 62% rename from cmd/agent_system/main.go rename to cmd/sysd/main.go index 612f04c4..387ccc79 100644 --- a/cmd/agent_system/main.go +++ b/cmd/sysd/main.go @@ -1,12 +1,12 @@ package main import ( - agentsystem "goauthentik.io/platform/pkg/agent_system/cli" "goauthentik.io/platform/pkg/shared" + "goauthentik.io/platform/pkg/sysd/cli" ) func main() { shared.Start("ak-platform-agent-system", false, func() { - agentsystem.Execute() + cli.Execute() }) } diff --git a/cmd/agent_system/package/linux/browser-host-chrome.json b/cmd/sysd/package/linux/browser-host-chrome.json similarity index 100% rename from cmd/agent_system/package/linux/browser-host-chrome.json rename to cmd/sysd/package/linux/browser-host-chrome.json diff --git a/cmd/agent_system/package/linux/browser-host-firefox.json b/cmd/sysd/package/linux/browser-host-firefox.json similarity index 100% rename from cmd/agent_system/package/linux/browser-host-firefox.json rename to cmd/sysd/package/linux/browser-host-firefox.json diff --git a/cmd/agent_system/package/linux/config.json b/cmd/sysd/package/linux/config.json similarity index 100% rename from cmd/agent_system/package/linux/config.json rename to cmd/sysd/package/linux/config.json diff --git a/cmd/agent_system/package/linux/nfpm.yaml b/cmd/sysd/package/linux/nfpm.yaml similarity index 92% rename from cmd/agent_system/package/linux/nfpm.yaml rename to cmd/sysd/package/linux/nfpm.yaml index 9828c7b4..f91c63fa 100644 --- a/cmd/agent_system/package/linux/nfpm.yaml +++ b/cmd/sysd/package/linux/nfpm.yaml @@ -12,14 +12,14 @@ license: "MIT" scripts: postinstall: ./package/linux/postinst.sh contents: - - src: ../../bin/agent_system/ak-sysd + - src: ../../bin/sysd/ak-sysd dst: /usr/bin/ak-sysd - src: ./package/linux/usr/lib/systemd/system/ak-sysd.service dst: /usr/lib/systemd/system/ak-sysd.service - src: ./package/linux/config.json dst: /etc/authentik/config.json type: config - - src: ../../bin/agent_system/completions/agent_system.bash + - src: ../../bin/sysd/completions/sysd.bash dst: /etc/bash_completion.d/ak-sysd - dst: /etc/authentik/domains type: dir diff --git a/cmd/agent_system/package/linux/postinst.sh b/cmd/sysd/package/linux/postinst.sh similarity index 100% rename from cmd/agent_system/package/linux/postinst.sh rename to cmd/sysd/package/linux/postinst.sh diff --git a/cmd/agent_system/package/linux/usr/lib/systemd/system/ak-sysd.service b/cmd/sysd/package/linux/usr/lib/systemd/system/ak-sysd.service similarity index 100% rename from cmd/agent_system/package/linux/usr/lib/systemd/system/ak-sysd.service rename to cmd/sysd/package/linux/usr/lib/systemd/system/ak-sysd.service diff --git a/cmd/agent_system/package/windows/config.json b/cmd/sysd/package/windows/config.json similarity index 100% rename from cmd/agent_system/package/windows/config.json rename to cmd/sysd/package/windows/config.json diff --git a/common.mk b/common.mk index 71515164..936e4766 100644 --- a/common.mk +++ b/common.mk @@ -31,7 +31,7 @@ endef define go_generate_resources go tool goversioninfo \ - -icon="${TOP}/cmd/agent_local/package/windows/resources/icon.ico" \ + -icon="${TOP}/cmd/agent/package/windows/resources/icon.ico" \ -company="Authentik Security Inc." \ -copyright="2025 Authentik Security Inc." \ -file-version=${VERSION} \ diff --git a/pkg/agent_local/agent.go b/pkg/agent/agent.go similarity index 93% rename from pkg/agent_local/agent.go rename to pkg/agent/agent.go index 886c6800..f043572b 100644 --- a/pkg/agent_local/agent.go +++ b/pkg/agent/agent.go @@ -1,4 +1,4 @@ -package agentlocal +package agent import ( "os" @@ -7,8 +7,8 @@ import ( "github.com/nightlyone/lockfile" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_local/config" - "goauthentik.io/platform/pkg/agent_local/tray" + "goauthentik.io/platform/pkg/agent/config" + "goauthentik.io/platform/pkg/agent/tray" "goauthentik.io/platform/pkg/ak/token" "goauthentik.io/platform/pkg/pb" systemlog "goauthentik.io/platform/pkg/platform/log" diff --git a/pkg/agent_local/client/cache.go b/pkg/agent/client/cache.go similarity index 100% rename from pkg/agent_local/client/cache.go rename to pkg/agent/client/cache.go diff --git a/pkg/agent_local/client/client.go b/pkg/agent/client/client.go similarity index 100% rename from pkg/agent_local/client/client.go rename to pkg/agent/client/client.go diff --git a/pkg/agent_local/config/config.go b/pkg/agent/config/config.go similarity index 93% rename from pkg/agent_local/config/config.go rename to pkg/agent/config/config.go index 2dade766..c7377a60 100644 --- a/pkg/agent_local/config/config.go +++ b/pkg/agent/config/config.go @@ -5,7 +5,7 @@ import ( "github.com/adrg/xdg" "github.com/fsnotify/fsnotify" - "goauthentik.io/platform/pkg/agent_local/types" + "goauthentik.io/platform/pkg/agent/types" "goauthentik.io/platform/pkg/storage/cfgmgr" ) diff --git a/pkg/agent_local/config/schemav1.go b/pkg/agent/config/schemav1.go similarity index 100% rename from pkg/agent_local/config/schemav1.go rename to pkg/agent/config/schemav1.go diff --git a/pkg/agent_local/config/schemav1_keyring.go b/pkg/agent/config/schemav1_keyring.go similarity index 100% rename from pkg/agent_local/config/schemav1_keyring.go rename to pkg/agent/config/schemav1_keyring.go diff --git a/pkg/agent_local/grpc.go b/pkg/agent/grpc.go similarity index 95% rename from pkg/agent_local/grpc.go rename to pkg/agent/grpc.go index 752ed074..ba90096f 100644 --- a/pkg/agent_local/grpc.go +++ b/pkg/agent/grpc.go @@ -1,10 +1,10 @@ -package agentlocal +package agent import ( "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" grpc_sentry "github.com/johnbellone/grpc-middleware-sentry" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_local/types" + "goauthentik.io/platform/pkg/agent/types" "goauthentik.io/platform/pkg/pb" "goauthentik.io/platform/pkg/platform/grpc_creds" systemlog "goauthentik.io/platform/pkg/platform/log" diff --git a/pkg/agent_local/grpc_auth.go b/pkg/agent/grpc_auth.go similarity index 99% rename from pkg/agent_local/grpc_auth.go rename to pkg/agent/grpc_auth.go index 38895cd8..18731993 100644 --- a/pkg/agent_local/grpc_auth.go +++ b/pkg/agent/grpc_auth.go @@ -1,4 +1,4 @@ -package agentlocal +package agent import ( "context" diff --git a/pkg/agent_local/grpc_auth_device_token.go b/pkg/agent/grpc_auth_device_token.go similarity index 98% rename from pkg/agent_local/grpc_auth_device_token.go rename to pkg/agent/grpc_auth_device_token.go index 4aab4281..9b4db738 100644 --- a/pkg/agent_local/grpc_auth_device_token.go +++ b/pkg/agent/grpc_auth_device_token.go @@ -1,4 +1,4 @@ -package agentlocal +package agent import ( "context" diff --git a/pkg/agent_local/grpc_auth_token_exchange.go b/pkg/agent/grpc_auth_token_exchange.go similarity index 98% rename from pkg/agent_local/grpc_auth_token_exchange.go rename to pkg/agent/grpc_auth_token_exchange.go index c0e5b87b..b21aa66c 100644 --- a/pkg/agent_local/grpc_auth_token_exchange.go +++ b/pkg/agent/grpc_auth_token_exchange.go @@ -1,4 +1,4 @@ -package agentlocal +package agent import ( "context" diff --git a/pkg/agent_local/grpc_config.go b/pkg/agent/grpc_config.go similarity index 93% rename from pkg/agent_local/grpc_config.go rename to pkg/agent/grpc_config.go index c66f8c43..9052245a 100644 --- a/pkg/agent_local/grpc_config.go +++ b/pkg/agent/grpc_config.go @@ -1,10 +1,10 @@ -package agentlocal +package agent import ( "context" "maps" - "goauthentik.io/platform/pkg/agent_local/config" + "goauthentik.io/platform/pkg/agent/config" "goauthentik.io/platform/pkg/pb" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/agent_local/grpc_local_auth.go b/pkg/agent/grpc_local_auth.go similarity index 96% rename from pkg/agent_local/grpc_local_auth.go rename to pkg/agent/grpc_local_auth.go index a830bc62..b4863282 100644 --- a/pkg/agent_local/grpc_local_auth.go +++ b/pkg/agent/grpc_local_auth.go @@ -1,4 +1,4 @@ -package agentlocal +package agent import ( "context" diff --git a/pkg/agent_local/grpc_whoami.go b/pkg/agent/grpc_whoami.go similarity index 99% rename from pkg/agent_local/grpc_whoami.go rename to pkg/agent/grpc_whoami.go index ec8a58cf..2f63d495 100644 --- a/pkg/agent_local/grpc_whoami.go +++ b/pkg/agent/grpc_whoami.go @@ -1,4 +1,4 @@ -package agentlocal +package agent import ( "context" diff --git a/pkg/agent_local/local_cache.go b/pkg/agent/local_cache.go similarity index 98% rename from pkg/agent_local/local_cache.go rename to pkg/agent/local_cache.go index 4a2435cc..430d0f1f 100644 --- a/pkg/agent_local/local_cache.go +++ b/pkg/agent/local_cache.go @@ -1,4 +1,4 @@ -package agentlocal +package agent import ( "context" diff --git a/pkg/agent_local/lock.go b/pkg/agent/lock.go similarity index 94% rename from pkg/agent_local/lock.go rename to pkg/agent/lock.go index 60dfa26d..550656a6 100644 --- a/pkg/agent_local/lock.go +++ b/pkg/agent/lock.go @@ -1,4 +1,4 @@ -package agentlocal +package agent import ( "github.com/adrg/xdg" diff --git a/pkg/agent_local/tray/icon/icon.go b/pkg/agent/tray/icon/icon.go similarity index 100% rename from pkg/agent_local/tray/icon/icon.go rename to pkg/agent/tray/icon/icon.go diff --git a/pkg/agent_local/tray/icon/icon.ico b/pkg/agent/tray/icon/icon.ico similarity index 100% rename from pkg/agent_local/tray/icon/icon.ico rename to pkg/agent/tray/icon/icon.ico diff --git a/pkg/agent_local/tray/icon/icon_dark.png b/pkg/agent/tray/icon/icon_dark.png similarity index 100% rename from pkg/agent_local/tray/icon/icon_dark.png rename to pkg/agent/tray/icon/icon_dark.png diff --git a/pkg/agent_local/tray/icon/icon_light.png b/pkg/agent/tray/icon/icon_light.png similarity index 100% rename from pkg/agent_local/tray/icon/icon_light.png rename to pkg/agent/tray/icon/icon_light.png diff --git a/pkg/agent_local/tray/items.go b/pkg/agent/tray/items.go similarity index 95% rename from pkg/agent_local/tray/items.go rename to pkg/agent/tray/items.go index 37e003df..3c20503b 100644 --- a/pkg/agent_local/tray/items.go +++ b/pkg/agent/tray/items.go @@ -6,10 +6,10 @@ import ( "github.com/cli/browser" "github.com/kolide/systray" "github.com/mergestat/timediff" - "goauthentik.io/platform/pkg/agent_local/config" - "goauthentik.io/platform/pkg/agent_system/client" + "goauthentik.io/platform/pkg/agent/config" "goauthentik.io/platform/pkg/ak/token" "goauthentik.io/platform/pkg/meta" + "goauthentik.io/platform/pkg/sysd/client" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/agent_local/tray/tray.go b/pkg/agent/tray/tray.go similarity index 95% rename from pkg/agent_local/tray/tray.go rename to pkg/agent/tray/tray.go index b575a7e8..47fe758c 100644 --- a/pkg/agent_local/tray/tray.go +++ b/pkg/agent/tray/tray.go @@ -8,8 +8,8 @@ import ( "github.com/kolide/systray" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_local/config" - "goauthentik.io/platform/pkg/agent_local/tray/icon" + "goauthentik.io/platform/pkg/agent/config" + "goauthentik.io/platform/pkg/agent/tray/icon" systemlog "goauthentik.io/platform/pkg/platform/log" "goauthentik.io/platform/pkg/shared/events" "goauthentik.io/platform/pkg/storage/cfgmgr" diff --git a/pkg/agent_local/types/socket.go b/pkg/agent/types/socket.go similarity index 100% rename from pkg/agent_local/types/socket.go rename to pkg/agent/types/socket.go diff --git a/pkg/agent_system/components_linux.go b/pkg/agent_system/components_linux.go deleted file mode 100644 index b0edeb6a..00000000 --- a/pkg/agent_system/components_linux.go +++ /dev/null @@ -1,26 +0,0 @@ -//go:build linux - -package agentsystem - -import ( - agentstarter "goauthentik.io/platform/pkg/agent_system/agent_starter" - "goauthentik.io/platform/pkg/agent_system/auth" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/ctrl" - "goauthentik.io/platform/pkg/agent_system/device" - "goauthentik.io/platform/pkg/agent_system/directory" - "goauthentik.io/platform/pkg/agent_system/ping" - "goauthentik.io/platform/pkg/agent_system/session" -) - -func (sm *SystemAgent) RegisterPlatformComponents() map[string]component.Constructor { - return map[string]component.Constructor{ - agentstarter.ID: agentstarter.NewServer, - auth.ID: auth.NewServer, - device.ID: device.NewServer, - directory.ID: directory.NewServer, - ping.ID: ping.NewServer, - session.ID: session.NewMonitor, - ctrl.ID: ctrl.NewServer, - } -} diff --git a/pkg/agent_system/components_windows.go b/pkg/agent_system/components_windows.go deleted file mode 100644 index fa0f9e84..00000000 --- a/pkg/agent_system/components_windows.go +++ /dev/null @@ -1,24 +0,0 @@ -//go:build windows - -package agentsystem - -import ( - agentstarter "goauthentik.io/platform/pkg/agent_system/agent_starter" - "goauthentik.io/platform/pkg/agent_system/auth" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/ctrl" - "goauthentik.io/platform/pkg/agent_system/device" - "goauthentik.io/platform/pkg/agent_system/ping" - "goauthentik.io/platform/pkg/agent_system/session" -) - -func (sm *SystemAgent) RegisterPlatformComponents() map[string]component.Constructor { - return map[string]component.Constructor{ - agentstarter.ID: agentstarter.NewServer, - auth.ID: auth.NewServer, - device.ID: device.NewServer, - ping.ID: ping.NewServer, - session.ID: session.NewMonitor, - ctrl.ID: ctrl.NewServer, - } -} diff --git a/pkg/ak/token/exchange.go b/pkg/ak/token/exchange.go index 32f548c5..d75473f2 100644 --- a/pkg/ak/token/exchange.go +++ b/pkg/ak/token/exchange.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - "goauthentik.io/platform/pkg/agent_local/config" + "goauthentik.io/platform/pkg/agent/config" "goauthentik.io/platform/pkg/ak" "goauthentik.io/platform/pkg/meta" systemlog "goauthentik.io/platform/pkg/platform/log" diff --git a/pkg/ak/token/exchange_cached.go b/pkg/ak/token/exchange_cached.go index 3fd04310..5e16b4ad 100644 --- a/pkg/ak/token/exchange_cached.go +++ b/pkg/ak/token/exchange_cached.go @@ -3,7 +3,7 @@ package token import ( "time" - "goauthentik.io/platform/pkg/agent_local/config" + "goauthentik.io/platform/pkg/agent/config" systemlog "goauthentik.io/platform/pkg/platform/log" "goauthentik.io/platform/pkg/storage" ) diff --git a/pkg/ak/token/token_multiple.go b/pkg/ak/token/token_multiple.go index 8812020e..6580b065 100644 --- a/pkg/ak/token/token_multiple.go +++ b/pkg/ak/token/token_multiple.go @@ -4,7 +4,7 @@ import ( "sync" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_local/config" + "goauthentik.io/platform/pkg/agent/config" systemlog "goauthentik.io/platform/pkg/platform/log" "goauthentik.io/platform/pkg/shared/events" "goauthentik.io/platform/pkg/storage/cfgmgr" diff --git a/pkg/ak/token/token_profile.go b/pkg/ak/token/token_profile.go index 5870aa4e..4b7e5224 100644 --- a/pkg/ak/token/token_profile.go +++ b/pkg/ak/token/token_profile.go @@ -10,7 +10,7 @@ import ( "github.com/avast/retry-go/v4" "github.com/golang-jwt/jwt/v5" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_local/config" + "goauthentik.io/platform/pkg/agent/config" "goauthentik.io/platform/pkg/ak" systemlog "goauthentik.io/platform/pkg/platform/log" ) diff --git a/pkg/ak/token/token_profile_renew.go b/pkg/ak/token/token_profile_renew.go index de5b510c..066dfb6a 100644 --- a/pkg/ak/token/token_profile_renew.go +++ b/pkg/ak/token/token_profile_renew.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - "goauthentik.io/platform/pkg/agent_local/config" + "goauthentik.io/platform/pkg/agent/config" "goauthentik.io/platform/pkg/ak" "goauthentik.io/platform/pkg/meta" ) diff --git a/pkg/ak/urls.go b/pkg/ak/urls.go index 08cb8aaa..a43d494a 100644 --- a/pkg/ak/urls.go +++ b/pkg/ak/urls.go @@ -5,7 +5,7 @@ import ( "net/url" "goauthentik.io/api/v3" - "goauthentik.io/platform/pkg/agent_local/config" + "goauthentik.io/platform/pkg/agent/config" ) type URLSet struct { diff --git a/pkg/browser_support/handler.go b/pkg/browser_support/handler.go index 439e8cd8..721619f6 100644 --- a/pkg/browser_support/handler.go +++ b/pkg/browser_support/handler.go @@ -4,12 +4,12 @@ import ( "context" log "github.com/sirupsen/logrus" - aclient "goauthentik.io/platform/pkg/agent_local/client" - "goauthentik.io/platform/pkg/agent_local/types" - sclient "goauthentik.io/platform/pkg/agent_system/client" + aclient "goauthentik.io/platform/pkg/agent/client" + "goauthentik.io/platform/pkg/agent/types" "goauthentik.io/platform/pkg/browser_support/native_messaging" "goauthentik.io/platform/pkg/pb" systemlog "goauthentik.io/platform/pkg/platform/log" + sclient "goauthentik.io/platform/pkg/sysd/client" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/cli/auth/aws/aws.go b/pkg/cli/auth/aws/aws.go index 2d7e6df8..f106dfeb 100644 --- a/pkg/cli/auth/aws/aws.go +++ b/pkg/cli/auth/aws/aws.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/sts" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_local/client" + "goauthentik.io/platform/pkg/agent/client" "goauthentik.io/platform/pkg/pb" ) diff --git a/pkg/cli/auth/device/device.go b/pkg/cli/auth/device/device.go index 0fe4459b..8d8bf7c5 100644 --- a/pkg/cli/auth/device/device.go +++ b/pkg/cli/auth/device/device.go @@ -5,7 +5,7 @@ import ( "time" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_local/client" + "goauthentik.io/platform/pkg/agent/client" "goauthentik.io/platform/pkg/pb" ) diff --git a/pkg/cli/auth/k8s/k8s.go b/pkg/cli/auth/k8s/k8s.go index 0e402e1b..4fe71cd4 100644 --- a/pkg/cli/auth/k8s/k8s.go +++ b/pkg/cli/auth/k8s/k8s.go @@ -5,7 +5,7 @@ import ( "time" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_local/client" + "goauthentik.io/platform/pkg/agent/client" "goauthentik.io/platform/pkg/pb" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientauthenticationv1 "k8s.io/client-go/pkg/apis/clientauthentication/v1" diff --git a/pkg/cli/auth/raw/raw.go b/pkg/cli/auth/raw/raw.go index 44b032e6..8efefb81 100644 --- a/pkg/cli/auth/raw/raw.go +++ b/pkg/cli/auth/raw/raw.go @@ -4,7 +4,7 @@ import ( "context" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_local/client" + "goauthentik.io/platform/pkg/agent/client" "goauthentik.io/platform/pkg/pb" ) diff --git a/pkg/cli/auth/vault/vault.go b/pkg/cli/auth/vault/vault.go index 300d65fd..0e1d1005 100644 --- a/pkg/cli/auth/vault/vault.go +++ b/pkg/cli/auth/vault/vault.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/vault-client-go" "github.com/hashicorp/vault-client-go/schema" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_local/client" + "goauthentik.io/platform/pkg/agent/client" "goauthentik.io/platform/pkg/pb" ) diff --git a/pkg/cli/auth_aws.go b/pkg/cli/auth_aws.go index 0cf72f60..27d22913 100644 --- a/pkg/cli/auth_aws.go +++ b/pkg/cli/auth_aws.go @@ -5,7 +5,7 @@ import ( "os" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_local/client" + "goauthentik.io/platform/pkg/agent/client" "goauthentik.io/platform/pkg/cli/auth/aws" ) diff --git a/pkg/cli/auth_kubectl.go b/pkg/cli/auth_kubectl.go index 2636d711..7db2af99 100644 --- a/pkg/cli/auth_kubectl.go +++ b/pkg/cli/auth_kubectl.go @@ -5,7 +5,7 @@ import ( "os" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_local/client" + "goauthentik.io/platform/pkg/agent/client" "goauthentik.io/platform/pkg/cli/auth/k8s" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientauthenticationv1 "k8s.io/client-go/pkg/apis/clientauthentication/v1" diff --git a/pkg/cli/auth_raw.go b/pkg/cli/auth_raw.go index 84b8dc16..33fda915 100644 --- a/pkg/cli/auth_raw.go +++ b/pkg/cli/auth_raw.go @@ -6,7 +6,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_local/client" + "goauthentik.io/platform/pkg/agent/client" "goauthentik.io/platform/pkg/cli/auth/raw" ) diff --git a/pkg/cli/auth_vault.go b/pkg/cli/auth_vault.go index 91c3a768..9d3d290e 100644 --- a/pkg/cli/auth_vault.go +++ b/pkg/cli/auth_vault.go @@ -4,7 +4,7 @@ import ( "os" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_local/client" + "goauthentik.io/platform/pkg/agent/client" "goauthentik.io/platform/pkg/cli/auth/vault" ) diff --git a/pkg/cli/config_list_profiles.go b/pkg/cli/config_list_profiles.go index f95f9fc4..f4ebb276 100644 --- a/pkg/cli/config_list_profiles.go +++ b/pkg/cli/config_list_profiles.go @@ -6,7 +6,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_local/client" + "goauthentik.io/platform/pkg/agent/client" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/cli/config_setup.go b/pkg/cli/config_setup.go index 4d09faa0..c5ce4e25 100644 --- a/pkg/cli/config_setup.go +++ b/pkg/cli/config_setup.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_local/client" + "goauthentik.io/platform/pkg/agent/client" "goauthentik.io/platform/pkg/cli/setup" "goauthentik.io/platform/pkg/pb" ) diff --git a/pkg/cli/root.go b/pkg/cli/root.go index 77a89f55..99e09dbe 100644 --- a/pkg/cli/root.go +++ b/pkg/cli/root.go @@ -7,7 +7,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_local/types" + "goauthentik.io/platform/pkg/agent/types" "goauthentik.io/platform/pkg/meta" ) diff --git a/pkg/cli/setup/setup.go b/pkg/cli/setup/setup.go index 4e549d59..6f79afb3 100644 --- a/pkg/cli/setup/setup.go +++ b/pkg/cli/setup/setup.go @@ -6,7 +6,7 @@ import ( "github.com/cli/browser" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_local/config" + "goauthentik.io/platform/pkg/agent/config" "goauthentik.io/platform/pkg/ak" "goauthentik.io/platform/vnd/oauth" ) diff --git a/pkg/cli/ssh.go b/pkg/cli/ssh.go index bd272484..2e0192d3 100644 --- a/pkg/cli/ssh.go +++ b/pkg/cli/ssh.go @@ -17,8 +17,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/skeema/knownhosts" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_local/client" - "goauthentik.io/platform/pkg/agent_local/types" + "goauthentik.io/platform/pkg/agent/client" + "goauthentik.io/platform/pkg/agent/types" "goauthentik.io/platform/pkg/cli/auth/device" "goauthentik.io/platform/pkg/pb" "goauthentik.io/platform/pkg/platform/socket" diff --git a/pkg/cli/system_status.go b/pkg/cli/system_status.go index a81eb979..bef44777 100644 --- a/pkg/cli/system_status.go +++ b/pkg/cli/system_status.go @@ -8,9 +8,9 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_system/client" - "goauthentik.io/platform/pkg/agent_system/types" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/client" + "goauthentik.io/platform/pkg/sysd/types" ) var systemStatusCmd = &cobra.Command{ diff --git a/pkg/cli/whoami.go b/pkg/cli/whoami.go index ab257d4a..380b40fa 100644 --- a/pkg/cli/whoami.go +++ b/pkg/cli/whoami.go @@ -6,7 +6,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_local/client" + "goauthentik.io/platform/pkg/agent/client" "goauthentik.io/platform/pkg/pb" ) diff --git a/pkg/agent_system/agent.go b/pkg/sysd/agent.go similarity index 97% rename from pkg/agent_system/agent.go rename to pkg/sysd/agent.go index 5ee1ad6d..061832f4 100644 --- a/pkg/agent_system/agent.go +++ b/pkg/sysd/agent.go @@ -1,4 +1,4 @@ -package agentsystem +package sysd import ( "context" @@ -13,15 +13,15 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery" grpc_sentry "github.com/johnbellone/grpc-middleware-sentry" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/config" - "goauthentik.io/platform/pkg/agent_system/types" systemlog "goauthentik.io/platform/pkg/platform/log" "goauthentik.io/platform/pkg/platform/pstr" "goauthentik.io/platform/pkg/platform/socket" "goauthentik.io/platform/pkg/shared/events" "goauthentik.io/platform/pkg/storage/cfgmgr" "goauthentik.io/platform/pkg/storage/state" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/config" + "goauthentik.io/platform/pkg/sysd/types" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/agent_system/agent_int_test.go b/pkg/sysd/agent_int_test.go similarity index 80% rename from pkg/agent_system/agent_int_test.go rename to pkg/sysd/agent_int_test.go index b02ec290..9fb8689c 100644 --- a/pkg/agent_system/agent_int_test.go +++ b/pkg/sysd/agent_int_test.go @@ -1,6 +1,6 @@ //go:build integration -package agentsystem_test +package sysd_test import ( "fmt" @@ -10,14 +10,14 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" - agentsystem "goauthentik.io/platform/pkg/agent_system" - agentstarter "goauthentik.io/platform/pkg/agent_system/agent_starter" - "goauthentik.io/platform/pkg/agent_system/client" - "goauthentik.io/platform/pkg/agent_system/config" - "goauthentik.io/platform/pkg/agent_system/directory" - "goauthentik.io/platform/pkg/agent_system/types" "goauthentik.io/platform/pkg/pb" "goauthentik.io/platform/pkg/platform/pstr" + "goauthentik.io/platform/pkg/sysd" + agentstarter "goauthentik.io/platform/pkg/sysd/agent_starter" + "goauthentik.io/platform/pkg/sysd/client" + "goauthentik.io/platform/pkg/sysd/config" + "goauthentik.io/platform/pkg/sysd/directory" + "goauthentik.io/platform/pkg/sysd/types" ) const testConfig = `{ @@ -54,7 +54,7 @@ func initConfig(t *testing.T) string { func TestAgent(t *testing.T) { log.SetLevel(log.DebugLevel) initConfig(t) - agent, err := agentsystem.New(agentsystem.SystemAgentOptions{ + agent, err := sysd.New(sysd.SystemAgentOptions{ DisabledComponents: []string{agentstarter.ID}, SocketPath: func(id string) pstr.PlatformString { return pstr.PlatformString{ @@ -71,7 +71,7 @@ func TestAgent(t *testing.T) { func TestAgent_Join(t *testing.T) { log.SetLevel(log.DebugLevel) td := initConfig(t) - agent, err := agentsystem.New(agentsystem.SystemAgentOptions{ + agent, err := sysd.New(sysd.SystemAgentOptions{ DisabledComponents: []string{agentstarter.ID}, SocketPath: func(id string) pstr.PlatformString { return pstr.PlatformString{ diff --git a/pkg/agent_system/agent_starter/starter.go b/pkg/sysd/agent_starter/starter.go similarity index 95% rename from pkg/agent_system/agent_starter/starter.go rename to pkg/sysd/agent_starter/starter.go index e4e34bd4..0de58542 100644 --- a/pkg/agent_system/agent_starter/starter.go +++ b/pkg/sysd/agent_starter/starter.go @@ -7,11 +7,11 @@ import ( "github.com/avast/retry-go/v4" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/config" - "goauthentik.io/platform/pkg/agent_system/session" "goauthentik.io/platform/pkg/platform/pstr" "goauthentik.io/platform/pkg/shared/events" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/config" + "goauthentik.io/platform/pkg/sysd/session" "goauthentik.io/platform/vnd/fleet/orbit/pkg/execuser" userpkg "goauthentik.io/platform/vnd/fleet/orbit/pkg/user" "google.golang.org/grpc" diff --git a/pkg/agent_system/auth/apple.go b/pkg/sysd/auth/apple.go similarity index 100% rename from pkg/agent_system/auth/apple.go rename to pkg/sysd/auth/apple.go diff --git a/pkg/agent_system/auth/auth.go b/pkg/sysd/auth/auth.go similarity index 91% rename from pkg/agent_system/auth/auth.go rename to pkg/sysd/auth/auth.go index 42d22afc..7be4b067 100644 --- a/pkg/agent_system/auth/auth.go +++ b/pkg/sysd/auth/auth.go @@ -5,10 +5,10 @@ import ( "sync" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/config" - "goauthentik.io/platform/pkg/agent_system/types" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/config" + "goauthentik.io/platform/pkg/sysd/types" "google.golang.org/grpc" ) diff --git a/pkg/agent_system/auth/authz.go b/pkg/sysd/auth/authz.go similarity index 89% rename from pkg/agent_system/auth/authz.go rename to pkg/sysd/auth/authz.go index 8a771b9b..7aeccfeb 100644 --- a/pkg/agent_system/auth/authz.go +++ b/pkg/sysd/auth/authz.go @@ -3,9 +3,9 @@ package auth import ( "context" - "goauthentik.io/platform/pkg/agent_local/client" - "goauthentik.io/platform/pkg/agent_system/session" + "goauthentik.io/platform/pkg/agent/client" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/session" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/agent_system/auth/interactive.go b/pkg/sysd/auth/interactive.go similarity index 100% rename from pkg/agent_system/auth/interactive.go rename to pkg/sysd/auth/interactive.go diff --git a/pkg/agent_system/auth/interactive_async.go b/pkg/sysd/auth/interactive_async.go similarity index 94% rename from pkg/agent_system/auth/interactive_async.go rename to pkg/sysd/auth/interactive_async.go index 3a052b37..fd2c77ae 100644 --- a/pkg/agent_system/auth/interactive_async.go +++ b/pkg/sysd/auth/interactive_async.go @@ -6,9 +6,9 @@ import ( "encoding/hex" "github.com/pkg/errors" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/ak" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/config" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/agent_system/auth/interactive_test.go b/pkg/sysd/auth/interactive_test.go similarity index 97% rename from pkg/agent_system/auth/interactive_test.go rename to pkg/sysd/auth/interactive_test.go index 7da7749b..c78343a3 100644 --- a/pkg/agent_system/auth/interactive_test.go +++ b/pkg/sysd/auth/interactive_test.go @@ -11,11 +11,11 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "goauthentik.io/api/v3" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/config" - "goauthentik.io/platform/pkg/agent_system/session" "goauthentik.io/platform/pkg/ak" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/config" + "goauthentik.io/platform/pkg/sysd/session" "goauthentik.io/platform/pkg/testutils" ) diff --git a/pkg/agent_system/auth/interactive_txn.go b/pkg/sysd/auth/interactive_txn.go similarity index 98% rename from pkg/agent_system/auth/interactive_txn.go rename to pkg/sysd/auth/interactive_txn.go index 3391b780..79d8c278 100644 --- a/pkg/agent_system/auth/interactive_txn.go +++ b/pkg/sysd/auth/interactive_txn.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" "goauthentik.io/api/v3" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/ak" "goauthentik.io/platform/pkg/ak/flow" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/config" ) const QSToken = "ak-auth-ia-token" diff --git a/pkg/agent_system/auth/token.go b/pkg/sysd/auth/token.go similarity index 97% rename from pkg/agent_system/auth/token.go rename to pkg/sysd/auth/token.go index f6214a1f..08924d49 100644 --- a/pkg/agent_system/auth/token.go +++ b/pkg/sysd/auth/token.go @@ -8,9 +8,9 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" - "goauthentik.io/platform/pkg/agent_system/session" "goauthentik.io/platform/pkg/ak/token" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/session" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/agent_system/auth/token_test.go b/pkg/sysd/auth/token_test.go similarity index 96% rename from pkg/agent_system/auth/token_test.go rename to pkg/sysd/auth/token_test.go index 7396107c..35cd769e 100644 --- a/pkg/agent_system/auth/token_test.go +++ b/pkg/sysd/auth/token_test.go @@ -8,9 +8,9 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "goauthentik.io/api/v3" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/ak" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/config" "goauthentik.io/platform/pkg/testutils" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/pkg/agent_system/check/check.go b/pkg/sysd/check/check.go similarity index 100% rename from pkg/agent_system/check/check.go rename to pkg/sysd/check/check.go diff --git a/pkg/agent_system/check/check_agent.go b/pkg/sysd/check/check_agent.go similarity index 94% rename from pkg/agent_system/check/check_agent.go rename to pkg/sysd/check/check_agent.go index 93a0e5a8..93e2c173 100644 --- a/pkg/agent_system/check/check_agent.go +++ b/pkg/sysd/check/check_agent.go @@ -5,9 +5,9 @@ import ( "fmt" "net" - "goauthentik.io/platform/pkg/agent_system/types" "goauthentik.io/platform/pkg/pb" "goauthentik.io/platform/pkg/platform/socket" + "goauthentik.io/platform/pkg/sysd/types" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/types/known/emptypb" diff --git a/pkg/agent_system/check/check_nss.go b/pkg/sysd/check/check_nss.go similarity index 96% rename from pkg/agent_system/check/check_nss.go rename to pkg/sysd/check/check_nss.go index 14a38ffc..89bbdc47 100644 --- a/pkg/agent_system/check/check_nss.go +++ b/pkg/sysd/check/check_nss.go @@ -5,7 +5,7 @@ import ( "errors" "strings" - "goauthentik.io/platform/pkg/agent_system/client" + "goauthentik.io/platform/pkg/sysd/client" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/agent_system/check/check_pam.go b/pkg/sysd/check/check_pam.go similarity index 100% rename from pkg/agent_system/check/check_pam.go rename to pkg/sysd/check/check_pam.go diff --git a/pkg/agent_system/check/utils.go b/pkg/sysd/check/utils.go similarity index 100% rename from pkg/agent_system/check/utils.go rename to pkg/sysd/check/utils.go diff --git a/pkg/agent_system/cli/agent.go b/pkg/sysd/cli/agent.go similarity index 96% rename from pkg/agent_system/cli/agent.go rename to pkg/sysd/cli/agent.go index 882e2ab6..a0a0c36b 100644 --- a/pkg/agent_system/cli/agent.go +++ b/pkg/sysd/cli/agent.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_system/config" systemlog "goauthentik.io/platform/pkg/platform/log" "goauthentik.io/platform/pkg/platform/pstr" + "goauthentik.io/platform/pkg/sysd/config" ) var ( diff --git a/pkg/agent_system/cli/agent_unix.go b/pkg/sysd/cli/agent_unix.go similarity index 66% rename from pkg/agent_system/cli/agent_unix.go rename to pkg/sysd/cli/agent_unix.go index 179069f4..66457683 100644 --- a/pkg/agent_system/cli/agent_unix.go +++ b/pkg/sysd/cli/agent_unix.go @@ -4,11 +4,11 @@ package cli import ( "github.com/spf13/cobra" - agentsystem "goauthentik.io/platform/pkg/agent_system" + "goauthentik.io/platform/pkg/sysd" ) func runAgentPlatform(cmd *cobra.Command, args []string) error { - agent, err := agentsystem.New(agentsystem.SystemAgentOptions{ + agent, err := sysd.New(sysd.SystemAgentOptions{ DisabledComponents: disabledComponents, }) if err != nil { diff --git a/pkg/agent_system/cli/agent_windows.go b/pkg/sysd/cli/agent_windows.go similarity index 80% rename from pkg/agent_system/cli/agent_windows.go rename to pkg/sysd/cli/agent_windows.go index 122828db..b974b4ce 100644 --- a/pkg/agent_system/cli/agent_windows.go +++ b/pkg/sysd/cli/agent_windows.go @@ -4,14 +4,14 @@ package cli import ( "github.com/spf13/cobra" - agentsystem "goauthentik.io/platform/pkg/agent_system" windowssvc "goauthentik.io/platform/pkg/platform/windows_svc" + "goauthentik.io/platform/pkg/sysd" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/debug" ) func runAgentPlatform(cmd *cobra.Command, args []string) error { - agent, err := agentsystem.New(agentsystem.SystemAgentOptions{ + agent, err := sysd.New(sysd.SystemAgentOptions{ DisabledComponents: disabledComponents, }) if err != nil { diff --git a/pkg/agent_system/cli/domains.go b/pkg/sysd/cli/domains.go similarity index 100% rename from pkg/agent_system/cli/domains.go rename to pkg/sysd/cli/domains.go diff --git a/pkg/agent_system/cli/domains_join.go b/pkg/sysd/cli/domains_join.go similarity index 97% rename from pkg/agent_system/cli/domains_join.go rename to pkg/sysd/cli/domains_join.go index 9193cf98..4c72904a 100644 --- a/pkg/agent_system/cli/domains_join.go +++ b/pkg/sysd/cli/domains_join.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_system/client" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/client" "golang.org/x/term" ) diff --git a/pkg/agent_system/cli/root.go b/pkg/sysd/cli/root.go similarity index 89% rename from pkg/agent_system/cli/root.go rename to pkg/sysd/cli/root.go index 08b9f5e6..7b0b3c8a 100644 --- a/pkg/agent_system/cli/root.go +++ b/pkg/sysd/cli/root.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_system/config" - "goauthentik.io/platform/pkg/agent_system/types" "goauthentik.io/platform/pkg/meta" + "goauthentik.io/platform/pkg/sysd/config" + "goauthentik.io/platform/pkg/sysd/types" ) var configFile string diff --git a/pkg/agent_system/cli/troubleshoot.go b/pkg/sysd/cli/troubleshoot.go similarity index 100% rename from pkg/agent_system/cli/troubleshoot.go rename to pkg/sysd/cli/troubleshoot.go diff --git a/pkg/agent_system/cli/troubleshoot_check.go b/pkg/sysd/cli/troubleshoot_check.go similarity index 87% rename from pkg/agent_system/cli/troubleshoot_check.go rename to pkg/sysd/cli/troubleshoot_check.go index 5f6c8bf6..86763023 100644 --- a/pkg/agent_system/cli/troubleshoot_check.go +++ b/pkg/sysd/cli/troubleshoot_check.go @@ -2,7 +2,7 @@ package cli import ( "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_system/check" + "goauthentik.io/platform/pkg/sysd/check" ) var troubleshootCheckCmd = &cobra.Command{ diff --git a/pkg/agent_system/cli/troubleshoot_facts.go b/pkg/sysd/cli/troubleshoot_facts.go similarity index 100% rename from pkg/agent_system/cli/troubleshoot_facts.go rename to pkg/sysd/cli/troubleshoot_facts.go diff --git a/pkg/agent_system/cli/troubleshoot_inspect.go b/pkg/sysd/cli/troubleshoot_inspect.go similarity index 94% rename from pkg/agent_system/cli/troubleshoot_inspect.go rename to pkg/sysd/cli/troubleshoot_inspect.go index 0d7066f4..de32267c 100644 --- a/pkg/agent_system/cli/troubleshoot_inspect.go +++ b/pkg/sysd/cli/troubleshoot_inspect.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "goauthentik.io/platform/pkg/agent_system/client" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/client" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/agent_system/client/client.go b/pkg/sysd/client/client.go similarity index 97% rename from pkg/agent_system/client/client.go rename to pkg/sysd/client/client.go index a4d3f982..6ca1b69b 100644 --- a/pkg/agent_system/client/client.go +++ b/pkg/sysd/client/client.go @@ -7,11 +7,11 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" grpc_sentry "github.com/johnbellone/grpc-middleware-sentry" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_system/types" "goauthentik.io/platform/pkg/pb" systemlog "goauthentik.io/platform/pkg/platform/log" "goauthentik.io/platform/pkg/platform/pstr" "goauthentik.io/platform/pkg/platform/socket" + "goauthentik.io/platform/pkg/sysd/types" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/pkg/agent_system/component/component.go b/pkg/sysd/component/component.go similarity index 97% rename from pkg/agent_system/component/component.go rename to pkg/sysd/component/component.go index 27bbcdb5..89597022 100644 --- a/pkg/agent_system/component/component.go +++ b/pkg/sysd/component/component.go @@ -6,9 +6,9 @@ import ( log "github.com/sirupsen/logrus" "goauthentik.io/api/v3" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/shared/events" "goauthentik.io/platform/pkg/storage/state" + "goauthentik.io/platform/pkg/sysd/config" "google.golang.org/grpc" ) diff --git a/pkg/agent_system/component/testing.go b/pkg/sysd/component/testing.go similarity index 95% rename from pkg/agent_system/component/testing.go rename to pkg/sysd/component/testing.go index 0b8b902e..d919d5ee 100644 --- a/pkg/agent_system/component/testing.go +++ b/pkg/sysd/component/testing.go @@ -6,9 +6,9 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "goauthentik.io/api/v3" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/shared/events" "goauthentik.io/platform/pkg/storage/state" + "goauthentik.io/platform/pkg/sysd/config" ) type TestRegistry struct { diff --git a/pkg/agent_system/components_darwin.go b/pkg/sysd/components_darwin.go similarity index 50% rename from pkg/agent_system/components_darwin.go rename to pkg/sysd/components_darwin.go index f943f612..a26dfe07 100644 --- a/pkg/agent_system/components_darwin.go +++ b/pkg/sysd/components_darwin.go @@ -1,14 +1,14 @@ //go:build darwin -package agentsystem +package sysd import ( - agentstarter "goauthentik.io/platform/pkg/agent_system/agent_starter" - "goauthentik.io/platform/pkg/agent_system/auth" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/ctrl" - "goauthentik.io/platform/pkg/agent_system/device" - "goauthentik.io/platform/pkg/agent_system/ping" + agentstarter "goauthentik.io/platform/pkg/sysd/agent_starter" + "goauthentik.io/platform/pkg/sysd/auth" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/ctrl" + "goauthentik.io/platform/pkg/sysd/device" + "goauthentik.io/platform/pkg/sysd/ping" ) func (sm *SystemAgent) RegisterPlatformComponents() map[string]component.Constructor { diff --git a/pkg/sysd/components_linux.go b/pkg/sysd/components_linux.go new file mode 100644 index 00000000..8e4668e7 --- /dev/null +++ b/pkg/sysd/components_linux.go @@ -0,0 +1,26 @@ +//go:build linux + +package sysd + +import ( + agentstarter "goauthentik.io/platform/pkg/sysd/agent_starter" + "goauthentik.io/platform/pkg/sysd/auth" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/ctrl" + "goauthentik.io/platform/pkg/sysd/device" + "goauthentik.io/platform/pkg/sysd/directory" + "goauthentik.io/platform/pkg/sysd/ping" + "goauthentik.io/platform/pkg/sysd/session" +) + +func (sm *SystemAgent) RegisterPlatformComponents() map[string]component.Constructor { + return map[string]component.Constructor{ + agentstarter.ID: agentstarter.NewServer, + auth.ID: auth.NewServer, + device.ID: device.NewServer, + directory.ID: directory.NewServer, + ping.ID: ping.NewServer, + session.ID: session.NewMonitor, + ctrl.ID: ctrl.NewServer, + } +} diff --git a/pkg/sysd/components_windows.go b/pkg/sysd/components_windows.go new file mode 100644 index 00000000..8b6c91f1 --- /dev/null +++ b/pkg/sysd/components_windows.go @@ -0,0 +1,24 @@ +//go:build windows + +package sysd + +import ( + agentstarter "goauthentik.io/platform/pkg/sysd/agent_starter" + "goauthentik.io/platform/pkg/sysd/auth" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/ctrl" + "goauthentik.io/platform/pkg/sysd/device" + "goauthentik.io/platform/pkg/sysd/ping" + "goauthentik.io/platform/pkg/sysd/session" +) + +func (sm *SystemAgent) RegisterPlatformComponents() map[string]component.Constructor { + return map[string]component.Constructor{ + agentstarter.ID: agentstarter.NewServer, + auth.ID: auth.NewServer, + device.ID: device.NewServer, + ping.ID: ping.NewServer, + session.ID: session.NewMonitor, + ctrl.ID: ctrl.NewServer, + } +} diff --git a/pkg/agent_system/config/config.go b/pkg/sysd/config/config.go similarity index 100% rename from pkg/agent_system/config/config.go rename to pkg/sysd/config/config.go diff --git a/pkg/agent_system/config/domain.go b/pkg/sysd/config/domain.go similarity index 100% rename from pkg/agent_system/config/domain.go rename to pkg/sysd/config/domain.go diff --git a/pkg/agent_system/config/domain_testing.go b/pkg/sysd/config/domain_testing.go similarity index 100% rename from pkg/agent_system/config/domain_testing.go rename to pkg/sysd/config/domain_testing.go diff --git a/pkg/agent_system/config/domains_enroll.go b/pkg/sysd/config/domains_enroll.go similarity index 100% rename from pkg/agent_system/config/domains_enroll.go rename to pkg/sysd/config/domains_enroll.go diff --git a/pkg/agent_system/config/domains_managed.go b/pkg/sysd/config/domains_managed.go similarity index 100% rename from pkg/agent_system/config/domains_managed.go rename to pkg/sysd/config/domains_managed.go diff --git a/pkg/agent_system/ctrl/ctrl.go b/pkg/sysd/ctrl/ctrl.go similarity index 85% rename from pkg/agent_system/ctrl/ctrl.go rename to pkg/sysd/ctrl/ctrl.go index 322fb1e1..92509647 100644 --- a/pkg/agent_system/ctrl/ctrl.go +++ b/pkg/sysd/ctrl/ctrl.go @@ -2,9 +2,9 @@ package ctrl import ( log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/types" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/types" "google.golang.org/grpc" ) diff --git a/pkg/agent_system/ctrl/domain.go b/pkg/sysd/ctrl/domain.go similarity index 96% rename from pkg/agent_system/ctrl/domain.go rename to pkg/sysd/ctrl/domain.go index a058cb02..66acdf9f 100644 --- a/pkg/agent_system/ctrl/domain.go +++ b/pkg/sysd/ctrl/domain.go @@ -4,8 +4,8 @@ import ( "context" "github.com/pkg/errors" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/config" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/pkg/agent_system/ctrl/troubleshoot.go b/pkg/sysd/ctrl/troubleshoot.go similarity index 96% rename from pkg/agent_system/ctrl/troubleshoot.go rename to pkg/sysd/ctrl/troubleshoot.go index f08700a2..11a01f5e 100644 --- a/pkg/agent_system/ctrl/troubleshoot.go +++ b/pkg/sysd/ctrl/troubleshoot.go @@ -4,8 +4,8 @@ import ( "context" "go.etcd.io/bbolt" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/config" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/agent_system/device/checkin.go b/pkg/sysd/device/checkin.go similarity index 94% rename from pkg/agent_system/device/checkin.go rename to pkg/sysd/device/checkin.go index 6b0c85a9..f9cf55a4 100644 --- a/pkg/agent_system/device/checkin.go +++ b/pkg/sysd/device/checkin.go @@ -6,10 +6,10 @@ import ( "time" "github.com/pkg/errors" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/ak" "goauthentik.io/platform/pkg/platform/facts" "goauthentik.io/platform/pkg/platform/facts/common" + "goauthentik.io/platform/pkg/sysd/config" ) func (ds *Server) checkIn(ctx context.Context, dom *config.DomainConfig) error { diff --git a/pkg/agent_system/device/checkin_int_test.go b/pkg/sysd/device/checkin_int_test.go similarity index 75% rename from pkg/agent_system/device/checkin_int_test.go rename to pkg/sysd/device/checkin_int_test.go index 70158e95..7d5b3756 100644 --- a/pkg/agent_system/device/checkin_int_test.go +++ b/pkg/sysd/device/checkin_int_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/config" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/config" ) func TestCheckin(t *testing.T) { diff --git a/pkg/agent_system/device/device.go b/pkg/sysd/device/device.go similarity index 91% rename from pkg/agent_system/device/device.go rename to pkg/sysd/device/device.go index 78a3afe8..a672a38c 100644 --- a/pkg/agent_system/device/device.go +++ b/pkg/sysd/device/device.go @@ -6,12 +6,12 @@ import ( log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/config" - "goauthentik.io/platform/pkg/agent_system/types" "goauthentik.io/platform/pkg/pb" "goauthentik.io/platform/pkg/shared/events" "goauthentik.io/platform/pkg/storage/cfgmgr" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/config" + "goauthentik.io/platform/pkg/sysd/types" "google.golang.org/grpc" ) diff --git a/pkg/agent_system/device/signed.go b/pkg/sysd/device/signed.go similarity index 97% rename from pkg/agent_system/device/signed.go rename to pkg/sysd/device/signed.go index c41f0360..6337454f 100644 --- a/pkg/agent_system/device/signed.go +++ b/pkg/sysd/device/signed.go @@ -9,11 +9,11 @@ import ( "github.com/MicahParks/keyfunc/v3" "github.com/golang-jwt/jwt/v5" "github.com/mitchellh/mapstructure" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/ak/token" "goauthentik.io/platform/pkg/pb" "goauthentik.io/platform/pkg/platform/facts/common" "goauthentik.io/platform/pkg/platform/facts/hardware" + "goauthentik.io/platform/pkg/sysd/config" ) func (ds *Server) validateChallenge(ctx context.Context, rawToken string) (*token.Token, *config.DomainConfig, error) { diff --git a/pkg/agent_system/directory/directory.go b/pkg/sysd/directory/directory.go similarity index 95% rename from pkg/agent_system/directory/directory.go rename to pkg/sysd/directory/directory.go index 0a2af6e7..49a7558a 100644 --- a/pkg/agent_system/directory/directory.go +++ b/pkg/sysd/directory/directory.go @@ -6,11 +6,11 @@ import ( log "github.com/sirupsen/logrus" "goauthentik.io/api/v3" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/types" "goauthentik.io/platform/pkg/pb" "goauthentik.io/platform/pkg/shared/events" "goauthentik.io/platform/pkg/storage/cfgmgr" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/types" "google.golang.org/grpc" ) diff --git a/pkg/agent_system/directory/directory_test.go b/pkg/sysd/directory/directory_test.go similarity index 96% rename from pkg/agent_system/directory/directory_test.go rename to pkg/sysd/directory/directory_test.go index 9281ac7b..3830afc3 100644 --- a/pkg/agent_system/directory/directory_test.go +++ b/pkg/sysd/directory/directory_test.go @@ -6,9 +6,9 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "goauthentik.io/api/v3" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/config" ) func testNSS(t *testing.T, dc *config.DomainConfig) Server { diff --git a/pkg/agent_system/directory/fetcher.go b/pkg/sysd/directory/fetcher.go similarity index 97% rename from pkg/agent_system/directory/fetcher.go rename to pkg/sysd/directory/fetcher.go index 62365472..d8607882 100644 --- a/pkg/agent_system/directory/fetcher.go +++ b/pkg/sysd/directory/fetcher.go @@ -8,10 +8,10 @@ import ( "time" "goauthentik.io/api/v3" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/ak" "goauthentik.io/platform/pkg/pb" "goauthentik.io/platform/pkg/shared/events" + "goauthentik.io/platform/pkg/sysd/config" ) func (directory *Server) startFetch() { diff --git a/pkg/agent_system/directory/fetcher_test.go b/pkg/sysd/directory/fetcher_test.go similarity index 96% rename from pkg/agent_system/directory/fetcher_test.go rename to pkg/sysd/directory/fetcher_test.go index 0bc2a443..a06de4dd 100644 --- a/pkg/agent_system/directory/fetcher_test.go +++ b/pkg/sysd/directory/fetcher_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "goauthentik.io/api/v3" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/ak" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/config" ) func TestFetcher(t *testing.T) { diff --git a/pkg/agent_system/directory/group.go b/pkg/sysd/directory/group.go similarity index 100% rename from pkg/agent_system/directory/group.go rename to pkg/sysd/directory/group.go diff --git a/pkg/agent_system/directory/group_test.go b/pkg/sysd/directory/group_test.go similarity index 95% rename from pkg/agent_system/directory/group_test.go rename to pkg/sysd/directory/group_test.go index 281177d0..0ac01dd0 100644 --- a/pkg/agent_system/directory/group_test.go +++ b/pkg/sysd/directory/group_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" "goauthentik.io/api/v3" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/config" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/agent_system/directory/user.go b/pkg/sysd/directory/user.go similarity index 100% rename from pkg/agent_system/directory/user.go rename to pkg/sysd/directory/user.go diff --git a/pkg/agent_system/directory/user_test.go b/pkg/sysd/directory/user_test.go similarity index 95% rename from pkg/agent_system/directory/user_test.go rename to pkg/sysd/directory/user_test.go index 932a45a4..3b59ea29 100644 --- a/pkg/agent_system/directory/user_test.go +++ b/pkg/sysd/directory/user_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" "goauthentik.io/api/v3" - "goauthentik.io/platform/pkg/agent_system/config" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/config" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/agent_system/ping/ping.go b/pkg/sysd/ping/ping.go similarity index 89% rename from pkg/agent_system/ping/ping.go rename to pkg/sysd/ping/ping.go index 694689ed..4dddd92c 100644 --- a/pkg/agent_system/ping/ping.go +++ b/pkg/sysd/ping/ping.go @@ -4,10 +4,10 @@ import ( "context" log "github.com/sirupsen/logrus" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/types" "goauthentik.io/platform/pkg/meta" "goauthentik.io/platform/pkg/pb" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/types" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/agent_system/session/session.go b/pkg/sysd/session/session.go similarity index 98% rename from pkg/agent_system/session/session.go rename to pkg/sysd/session/session.go index 73255b51..d37f5218 100644 --- a/pkg/agent_system/session/session.go +++ b/pkg/sysd/session/session.go @@ -12,11 +12,11 @@ import ( "github.com/gorilla/securecookie" log "github.com/sirupsen/logrus" "go.etcd.io/bbolt" - "goauthentik.io/platform/pkg/agent_system/component" - "goauthentik.io/platform/pkg/agent_system/types" "goauthentik.io/platform/pkg/ak/token" "goauthentik.io/platform/pkg/pb" "goauthentik.io/platform/pkg/shared/events" + "goauthentik.io/platform/pkg/sysd/component" + "goauthentik.io/platform/pkg/sysd/types" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/agent_system/session/terminate_linux.go b/pkg/sysd/session/terminate_linux.go similarity index 100% rename from pkg/agent_system/session/terminate_linux.go rename to pkg/sysd/session/terminate_linux.go diff --git a/pkg/agent_system/session/terminate_other.go b/pkg/sysd/session/terminate_other.go similarity index 100% rename from pkg/agent_system/session/terminate_other.go rename to pkg/sysd/session/terminate_other.go diff --git a/pkg/agent_system/types/events.go b/pkg/sysd/types/events.go similarity index 100% rename from pkg/agent_system/types/events.go rename to pkg/sysd/types/events.go diff --git a/pkg/agent_system/types/paths.go b/pkg/sysd/types/paths.go similarity index 100% rename from pkg/agent_system/types/paths.go rename to pkg/sysd/types/paths.go diff --git a/pkg/agent_system/types/socket.go b/pkg/sysd/types/socket.go similarity index 100% rename from pkg/agent_system/types/socket.go rename to pkg/sysd/types/socket.go diff --git a/pkg/agent_system/types/state.go b/pkg/sysd/types/state.go similarity index 100% rename from pkg/agent_system/types/state.go rename to pkg/sysd/types/state.go