- Notifications
You must be signed in to change notification settings - Fork916
fix(cli): add backwards compat for old telemetry env and tests#15476
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
mafredri merged 7 commits intomainfrommafredri/fix-cli-add-backcompat-for-telemetry-and-testsNov 13, 2024
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
7 commits Select commitHold shift + click to select a range
d0a2b4b fix(cli): add backwards compat for old telemetry env and tests
mafredrie4eaf58 update serpent to fork
mafredri9b1e097 lint
mafredri6f6ddc2 remove debuglog
mafredri1ebcb3b bump serpent pr
mafredri3e60be1 bump serpent pr
mafredri5a63708 serpent 0.9.0
mafredriFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
33 changes: 33 additions & 0 deletionscli/server_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1620,6 +1620,39 @@ func TestServer_Production(t *testing.T) { | ||||||
| require.NoError(t, err) | ||||||
| } | ||||||
| //nolint:tparallel,paralleltest // This test sets environment variables. | ||||||
| func TestServer_TelemetryDisable(t *testing.T) { | ||||||
| // Set the default telemetry to true (normally disabled in tests). | ||||||
| t.Setenv("CODER_TEST_TELEMETRY_DEFAULT_ENABLE", "true") | ||||||
| //nolint:paralleltest // No need to reinitialise the variable tt (Go version). | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Nit: we should fix our linter. Suggested change
| ||||||
| for _, tt := range []struct { | ||||||
| key string | ||||||
| val string | ||||||
| want bool | ||||||
| }{ | ||||||
| {"", "", true}, | ||||||
| {"CODER_TELEMETRY_ENABLE", "true", true}, | ||||||
| {"CODER_TELEMETRY_ENABLE", "false", false}, | ||||||
| {"CODER_TELEMETRY", "true", true}, | ||||||
| {"CODER_TELEMETRY", "false", false}, | ||||||
| } { | ||||||
| t.Run(fmt.Sprintf("%s=%s", tt.key, tt.val), func(t *testing.T) { | ||||||
| t.Parallel() | ||||||
| var b bytes.Buffer | ||||||
| inv, _ := clitest.New(t, "server", "--write-config") | ||||||
| inv.Stdout = &b | ||||||
| inv.Environ.Set(tt.key, tt.val) | ||||||
| clitest.Run(t, inv) | ||||||
| var dv codersdk.DeploymentValues | ||||||
| err := yaml.Unmarshal(b.Bytes(), &dv) | ||||||
| require.NoError(t, err) | ||||||
| assert.Equal(t, tt.want, dv.Telemetry.Enable.Value()) | ||||||
| }) | ||||||
| } | ||||||
| } | ||||||
| //nolint:tparallel,paralleltest // This test cannot be run in parallel due to signal handling. | ||||||
| func TestServer_InterruptShutdown(t *testing.T) { | ||||||
| t.Skip("This test issues an interrupt signal which will propagate to the test runner.") | ||||||
30 changes: 22 additions & 8 deletionscodersdk/deployment.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletiongo.mod
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletionsgo.sum
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.