Skip to content
Open
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a7e2329
[#1587] Exclude a common part of CLI parser
fivitti Jan 2, 2025
ac04f65
[#1587] Working general CLI parser
fivitti Jan 3, 2025
ffd2cf4
[#1587] Fix the wrong argument
fivitti Jan 7, 2025
8808118
[#1587] Unify agent and server parsers
fivitti Jan 7, 2025
e301a43
[#1587] Verify the envvars
fivitti Jan 7, 2025
30c4d21
[#1587] Fix linter issues
fivitti Jan 7, 2025
c8ca1c5
[#1587] Verify system environment variables
fivitti Jan 7, 2025
81b857a
[#1587] Add unit tests
fivitti Jan 7, 2025
48add73
[#1587] Extend unit test
fivitti Jan 7, 2025
06ba0b6
[#1587] Fix unit tests
fivitti Jan 7, 2025
cfb6ec4
[#1587] Simplify utility
fivitti Jan 7, 2025
7a29eb8
[#1587] Fix linter issue
fivitti Jan 8, 2025
522be1b
[#1587] Remove redundant flags
fivitti Jan 8, 2025
c6657d4
[#1587] Add unit tests
fivitti Jan 8, 2025
bf98f00
[#1587] Add a Changelog entry
fivitti Jan 8, 2025
19b7c94
[#1587] Unify the CLI handling in the Stork tool
fivitti Jan 8, 2025
66db02f
[#1587] Move package
fivitti Jan 8, 2025
425910d
[#1587] Exclude app to a separate file
fivitti Jan 8, 2025
7b201bd
[#1587] Unexport structs
fivitti Jan 8, 2025
6569020
[#1587] Unify code-gen CLI
fivitti Jan 8, 2025
27c6b7c
[#1587] Remove unnecessary dependencies
fivitti Jan 8, 2025
185123d
[#1587] Rename structs
fivitti Jan 9, 2025
f1d16f2
[#1587] Add unit tests
fivitti Jan 9, 2025
60f2fe4
[#1587] Rephrase a sentence
fivitti Jan 9, 2025
1acfd8d
[#1587] Support hooks only for agent and server
fivitti Jan 9, 2025
9285a3c
[#1587] Add unit test
fivitti Jan 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[#1587] Verify system environment variables
  • Loading branch information
fivitti authored and tomaszmrugalski committed Jun 2, 2025
commit c8ca1c5dd378b10460e0d1f58457e12bfb07ea5f
96 changes: 46 additions & 50 deletions backend/appcfg/stork/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

flags "github.com/jessevdk/go-flags"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"isc.org/stork/hooks"
"isc.org/stork/hooksutil"
storkutil "isc.org/stork/util"
Expand Down Expand Up @@ -130,11 +131,14 @@ func (p *CLIParser) bootstrap() (*HookDirectorySettings, GroupedHookCLIFlags, er
}
p.substitutePlaceholdersInGroup(group)

// Verify the environment variables.
err = p.verifyEnvironmentFile(envFileSettings)
if err != nil {
return nil, nil, err
}

p.verifySystemEnvironmentVariables()

return hookDirectorySettings, allHookCLIFlags, nil
}

Expand Down Expand Up @@ -262,7 +266,7 @@ func (p *CLIParser) loadEnvironmentFile(envFileSettings *environmentFileSettings
}

// Verifies if all environment variables in the environment file are known.
// Returns an error if any of the environment variables is unknown.
// Prints a warning if any of the environment variables is unknown.
func (p *CLIParser) verifyEnvironmentFile(envFileSettings *environmentFileSettings) error {
if !envFileSettings.UseEnvFile {
// Nothing to do.
Expand All @@ -285,15 +289,52 @@ func (p *CLIParser) verifyEnvironmentFile(envFileSettings *environmentFileSettin
}

// Check if all environment variables are known.
var errs []error
for _, entry := range entries {
if _, exist := knownEnvironmentVariables[entry.GetKey()]; !exist {
err = errors.Errorf("unknown environment variable: '%s'", entry.GetKey())
errs = append(errs, err)
log.Warnf(
"Unknown environment variable: '%s' in the environment file: '%s'",
entry.GetKey(), envFileSettings.EnvFile,
)
}
}

return storkutil.CombineErrors("the environment file contains unknown environment variables", errs)
return nil
}

// Verifies if the system-wide environment variables doesn't contain any
// unknown Stork-specific environment variables.
func (p *CLIParser) verifySystemEnvironmentVariables() {
// Collect all known environment variables.
knownEnvironmentVariables := make(map[string]bool)
for _, group := range p.parser.Groups() {
for _, option := range group.Options() {
knownEnvironmentVariables[option.EnvKeyWithNamespace()] = true
}
}

// The prefix that is used for the Stork-specific environment variables.
applicationPrefix := fmt.Sprintf("STORK_%s_", strings.ToUpper(p.application))

// Iterate over all system-wide environment variables.
for _, env := range os.Environ() {
key, _, ok := strings.Cut(env, "=")
if !ok {
// It should never happen.
continue
}

if !strings.HasPrefix(key, applicationPrefix) {
// Not a Stork-specific environment variable.
continue
}

if _, exist := knownEnvironmentVariables[key]; exist {
// Known environment variable.
continue
}

log.Warnf("Unknown environment variable: '%s' set in a shell", key)
}
}

// Extracts the CLI flags from the hooks.
Expand Down Expand Up @@ -371,48 +412,3 @@ func getHookNamespaces(application string, hookName string) (flagNamespace, envN
envNamespace = strings.ToUpper(envNamespace)
return
}

// // Parses all CLI flags including the hooks-related ones.
// func (p *CLIParser) parseSettings(allHooksCLIFlags map[string]hooks.HookSettings) (*Settings, error) {
// settings := newSettings()

// parser := flags.NewParser(settings.GeneralSettings, flags.Default)
// parser.ShortDescription = p.shortDescription
// parser.LongDescription = p.longDescription

// databaseFlags := &dbops.DatabaseCLIFlags{}
// // Process Database specific args.
// _, err := parser.AddGroup("Database ConnectionFlags", "", databaseFlags)
// if err != nil {
// err = errors.Wrap(err, "cannot add the database group")
// return nil, err
// }

// // Process ReST API specific args.
// _, err = parser.AddGroup("HTTP ReST Server Flags", "", settings.RestAPISettings)
// if err != nil {
// err = errors.Wrap(err, "cannot add the ReST group")
// return nil, err
// }

// // Process agent comm specific args.
// _, err = parser.AddGroup("Agents Communication Flags", "", settings.AgentsSettings)
// if err != nil {
// err = errors.Wrap(err, "cannot add the agents group")
// return nil, err
// }

// // Do args parsing.
// if _, err = parser.Parse(); err != nil {
// err = errors.Wrap(err, "cannot parse the CLI flags")
// return nil, err
// }

// settings.DatabaseSettings, err = databaseFlags.ConvertToDatabaseSettings()
// if err != nil {
// return nil, err
// }
// settings.HooksSettings = allHooksCLIFlags

// return settings, nil
// }