awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-08 08:27:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed to exec to execute, and cleanup 🧼

Browse Source
This commit is contained in:
Daniel Hougaard
2024-03-01 07:26:31 +01:00
parent 9fcdf17a04
commit 4a2a5f42a8
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/packages/cmd/agent.go
+6 -9
View File
@@ -74,10 +74,10 @@ type Template struct {
Config struct { // Configurations for the template Config struct { // Configurations for the template
PollingInterval string `yaml:"polling-interval"` // How often to poll for changes in the secret PollingInterval string `yaml:"polling-interval"` // How often to poll for changes in the secret
Exec struct { Execute struct {
Command string `yaml:"command"` // Command to execute once the template has been rendered Command string `yaml:"command"` // Command to execute once the template has been rendered
Timeout int64 `yaml:"timeout"` // Timeout for the command Timeout int64 `yaml:"timeout"` // Timeout for the command
} `yaml:"exec"` // Command to execute once the template has been rendered } `yaml:"execute"` // Command to execute once the template has been rendered
} `yaml:"config"` } `yaml:"config"`
} }
@@ -262,7 +262,6 @@ type TokenManager struct {
} }
func NewTokenManager(fileDeposits []Sink, templates []Template, clientIdPath string, clientSecretPath string, newAccessTokenNotificationChan chan bool, removeClientSecretOnRead bool, exitAfterAuth bool) *TokenManager { func NewTokenManager(fileDeposits []Sink, templates []Template, clientIdPath string, clientSecretPath string, newAccessTokenNotificationChan chan bool, removeClientSecretOnRead bool, exitAfterAuth bool) *TokenManager {
log.Info().Msgf("Token manager done, templates: %+v", templates[0])
return &TokenManager{ return &TokenManager{
filePaths: fileDeposits, filePaths: fileDeposits,
templates: templates, templates: templates,
@@ -451,9 +450,6 @@ func (tm *TokenManager) WriteTokenToFiles() {
} }
func (tm *TokenManager) WriteTemplateToFile(bytes *bytes.Buffer, template *Template) { func (tm *TokenManager) WriteTemplateToFile(bytes *bytes.Buffer, template *Template) {
log.Info().Msgf("template engine started...")
if err := WriteBytesToFile(bytes, template.DestinationPath); err != nil { if err := WriteBytesToFile(bytes, template.DestinationPath); err != nil {
log.Error().Msgf("template engine: unable to write secrets to path because %s. Will try again on next cycle", err) log.Error().Msgf("template engine: unable to write secrets to path because %s. Will try again on next cycle", err)
return return
@@ -482,8 +478,8 @@ func (tm *TokenManager) MonitorSecretChanges(secretTemplate Template, sigChan ch
var currentEtag string var currentEtag string
var firstRun = true var firstRun = true
execTimeout := secretTemplate.Config.Exec.Timeout execTimeout := secretTemplate.Config.Execute.Timeout
execCommand := secretTemplate.Config.Exec.Command execCommand := secretTemplate.Config.Execute.Command
for { for {
token := tm.GetToken() token := tm.GetToken()
@@ -612,7 +608,8 @@ var agentCmd = &cobra.Command{
go tm.ManageTokenLifecycle() go tm.ManageTokenLifecycle()
for _, template := range agentConfig.Templates { for i, template := range agentConfig.Templates {
log.Info().Msgf("template engine started for template %v...", i+1)
go tm.MonitorSecretChanges(template, sigChan) go tm.MonitorSecretChanges(template, sigChan)
} }