Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2024-10-01 01:36:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use "new" config for YAML parsing directives

Browse Source
This commit is contained in:
Nils Hanke 2022-05-17 18:42:00 +02:00 committed by Paul Meyer
parent c9982b979c
commit 5fa23d4bec
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debugd/cdbg/cmd/deploy.go
View File

@ -16,7 +16,6 @@ import (
pb "github.com/edgelesssys/constellation/debugd/service" pb "github.com/edgelesssys/constellation/debugd/service"
configc "github.com/edgelesssys/constellation/internal/config" configc "github.com/edgelesssys/constellation/internal/config"
"github.com/edgelesssys/constellation/internal/constants" "github.com/edgelesssys/constellation/internal/constants"
"github.com/edgelesssys/constellation/internal/deploy/ssh"
"github.com/edgelesssys/constellation/internal/file" "github.com/edgelesssys/constellation/internal/file"
statec "github.com/edgelesssys/constellation/internal/state" statec "github.com/edgelesssys/constellation/internal/state"
"github.com/spf13/afero" "github.com/spf13/afero"
@ -109,7 +108,7 @@ type deployOnEndpointInput struct {
debugdEndpoint string debugdEndpoint string
coordinatorPath string coordinatorPath string
reader fileToStreamReader reader fileToStreamReader
authorizedKeys []ssh.UserKey authorizedKeys []configc.UserKey
systemdUnits []depl.SystemdUnit systemdUnits []depl.SystemdUnit
} }

4
debugd/cdbg/config/config.go
View File

@ -6,7 +6,7 @@ import (
"io/fs" "io/fs"
"github.com/edgelesssys/constellation/debugd/debugd/deploy" "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" "github.com/edgelesssys/constellation/internal/file"
) )
@ -17,7 +17,7 @@ type CDBGConfig struct {
// ConstellationDebugdConfig is the cdbg specific configuration. // ConstellationDebugdConfig is the cdbg specific configuration.
type ConstellationDebugdConfig struct { type ConstellationDebugdConfig struct {
AuthorizedKeys []ssh.UserKey `yaml:"authorizedKeys"` AuthorizedKeys []configc.UserKey `yaml:"authorizedKeys"`
CoordinatorPath string `yaml:"coordinatorPath"` CoordinatorPath string `yaml:"coordinatorPath"`
SystemdUnits []deploy.SystemdUnit `yaml:"systemdUnits,omitempty"` SystemdUnits []deploy.SystemdUnit `yaml:"systemdUnits,omitempty"`
} }