Skip to content
Open
Show file tree
Hide file tree
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] Add unit tests
  • Loading branch information
fivitti authored and tomaszmrugalski committed Jun 2, 2025
commit 81b857aa67e812c5bb5bb4f30e1c94e21a037eaa
2 changes: 1 addition & 1 deletion backend/appcfg/stork/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

flags "github.com/jessevdk/go-flags"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
log "github.com/sirupsen/logrus"
"isc.org/stork/hooks"
"isc.org/stork/hooksutil"
storkutil "isc.org/stork/util"
Expand Down
77 changes: 77 additions & 0 deletions backend/appcfg/stork/cli_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package storkconfig

import (
"fmt"
"os"
"path"
"testing"
Expand Down Expand Up @@ -435,3 +436,79 @@ Help Options:

require.Equal(t, expectedHelp, string(stdout))
}

// Test that the unknown environment variables from the environment file are
// logged and ignored.
func TestVerifyEnvironmentFile(t *testing.T) {
// Arrange
restore := testutil.CreateEnvironmentRestorePoint()
defer restore()

sandbox := testutil.NewSandbox()
defer sandbox.Close()

envPath, _ := sandbox.Write("file.env", `
STORK_SERVER_TLS_CERT=tlsCert
STORK_SERVER_UNKNOWN=unknown
`)

type settings struct {
TLSCert string `long:"tls-cert" env:"STORK_SERVER_TLS_CERT" description:"The path to the TLS certificate"`
}
data := &settings{}

parser := NewCLIParser(flags.NewParser(data, flags.Default), "server", func() {})

// os.Setenv("STORK_SERVER_UNKNOWN", "unknown")
// os.Setenv("STORK_SERVER_TLS_CERT", "tlsCert")

// Act
var err error
stdout, _, captureErr := testutil.CaptureOutput(func() {
err = parser.verifyEnvironmentFile(&environmentFileSettings{
EnvFile: envPath,
UseEnvFile: true,
})
})

// Assert
require.NoError(t, err)
require.NoError(t, captureErr)

expectedLog := fmt.Sprintf(
`Unknown environment variable: 'STORK_SERVER_UNKNOWN' in the environment file: '%s'`,
envPath,
)
require.Contains(t, string(stdout), expectedLog)
require.NotContains(t, string(stdout), "TLS_CERT")
}

// Test that the unknown system-wide environment variables are logged and
// ignored.
func TestVerifySystemEnvironmentVariables(t *testing.T) {
// Arrange
restore := testutil.CreateEnvironmentRestorePoint()
defer restore()

type settings struct {
TLSCert string `long:"tls-cert" env:"STORK_SERVER_TLS_CERT" description:"The path to the TLS certificate"`
}
data := &settings{}

parser := NewCLIParser(flags.NewParser(data, flags.Default), "server", func() {})

os.Setenv("STORK_SERVER_UNKNOWN", "unknown")
os.Setenv("STORK_SERVER_TLS_CERT", "tlsCert")

// Act
stdout, _, captureErr := testutil.CaptureOutput(func() {
parser.verifySystemEnvironmentVariables()
})

// Assert
require.NoError(t, captureErr)

expectedLog := `Unknown environment variable: 'STORK_SERVER_UNKNOWN' set in a shell`
require.Contains(t, string(stdout), expectedLog)
require.NotContains(t, string(stdout), "TLS_CERT")
}