From 5fa23d4becb3950adeca5b55cd2a1d0214f74d25 Mon Sep 17 00:00:00 2001 From: Nils Hanke Date: Tue, 17 May 2022 18:42:00 +0200 Subject: [PATCH] Use "new" config for YAML parsing directives --- debugd/cdbg/cmd/deploy.go | 3 +-- debugd/cdbg/config/config.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debugd/cdbg/cmd/deploy.go b/debugd/cdbg/cmd/deploy.go index 200222fbd..f8645f06c 100644 --- a/debugd/cdbg/cmd/deploy.go +++ b/debugd/cdbg/cmd/deploy.go @@ -16,7 +16,6 @@ import ( pb "github.com/edgelesssys/constellation/debugd/service" configc "github.com/edgelesssys/constellation/internal/config" "github.com/edgelesssys/constellation/internal/constants" - "github.com/edgelesssys/constellation/internal/deploy/ssh" "github.com/edgelesssys/constellation/internal/file" statec "github.com/edgelesssys/constellation/internal/state" "github.com/spf13/afero" @@ -109,7 +108,7 @@ type deployOnEndpointInput struct { debugdEndpoint string coordinatorPath string reader fileToStreamReader - authorizedKeys []ssh.UserKey + authorizedKeys []configc.UserKey systemdUnits []depl.SystemdUnit } diff --git a/debugd/cdbg/config/config.go b/debugd/cdbg/config/config.go index 0b9f97d58..075560a32 100644 --- a/debugd/cdbg/config/config.go +++ b/debugd/cdbg/config/config.go @@ -6,7 +6,7 @@ import ( "io/fs" "github.com/edgelesssys/constellation/debugd/debugd/deploy" - "github.com/edgelesssys/constellation/internal/deploy/ssh" + configc "github.com/edgelesssys/constellation/internal/config" "github.com/edgelesssys/constellation/internal/file" ) @@ -17,7 +17,7 @@ type CDBGConfig struct { // ConstellationDebugdConfig is the cdbg specific configuration. type ConstellationDebugdConfig struct { - AuthorizedKeys []ssh.UserKey `yaml:"authorizedKeys"` + AuthorizedKeys []configc.UserKey `yaml:"authorizedKeys"` CoordinatorPath string `yaml:"coordinatorPath"` SystemdUnits []deploy.SystemdUnit `yaml:"systemdUnits,omitempty"` }