- Notifications
You must be signed in to change notification settings - Fork1.2k
chore: track terraform modules in telemetry#15450
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
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
34 commits Select commitHold shift + click to select a range
0f713ed add the workspace_modules table, add the module column to workspace_r…
hugodutka82c8a3c insert workspace modules on provisioner job completion
hugodutka307a57e add foreign key to job on workspace_modules
hugodutka2ae16fc don't return the root module
hugodutka7f2f155 add and populate the module_path column to workspace_resources
hugodutka863235d TestCompleteJob - Modules WIP
hugodutka993f0ab TemplateImport CompleteJob Modules test
hugodutkae8fbd40 TestCompleteJob Modules WorkspaceBuild
hugodutka5c542e5 add a test for returning modules in provision_test.go, fix test in re…
hugodutka9ec5ee1 make gen
hugodutka119a686 fix dbauthz tests
hugodutka3a5a025 add workspace modules and workspace resources's ModulePath to telemetry
hugodutka3377d22 add a workspace_modules fixture
hugodutka422b112 add a workspace resource's modulePath default to the e2e helper
hugodutka46b9b36 add modules default on PlanComplete for e2e tests
hugodutkaf3f4d5c lint
hugodutka93ed136 set module path to sentinel value when parsing failed and log an error
hugodutka301a153 change error string
hugodutka212e7d5 obfuscate workspace module source and version
hugodutkae9b7c46 fixes after rebase
hugodutka25cba6d change migration number
hugodutka780730f change fixture number
hugodutkab47a018 add index on created_at
hugodutka03be52e add a comment about using modules from plan instead of apply
hugodutka00b8131 convert sentinel string to an error
hugodutka4187fbf remove unnecessary comment
hugodutka7e82c3d don't fail if we can't get modules from disk
hugodutka42e57ca add a test for a malformed module
hugodutka368fc25 add a comment
hugodutka73b22cf combine assignment and conditional
hugodutka7b9d70a make isCoderModule into a top level function
hugodutkaea82313 use dbtestutil.NewDB instead of dbmem
hugodutka8564e9a make gen
hugodutkad11fc82 combine 2 more assignments and conditionals
hugodutkaFile 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
obfuscate workspace module source and version
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commit212e7d5ca20ad62420369164291240d505b195fe
There are no files selected for viewing
12 changes: 10 additions & 2 deletionscoderd/telemetry/telemetry.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 |
|---|---|---|
| @@ -677,12 +677,20 @@ func ConvertWorkspaceResourceMetadata(metadata database.WorkspaceResourceMetadat | ||
| } | ||
| func ConvertWorkspaceModule(module database.WorkspaceModule) WorkspaceModule { | ||
| isCoderModule := strings.Contains(module.Source, "registry.coder.com") | ||
| ||
| source := module.Source | ||
| version := module.Version | ||
| if !isCoderModule { | ||
| source = fmt.Sprintf("%x", sha256.Sum256([]byte(source))) | ||
| version = fmt.Sprintf("%x", sha256.Sum256([]byte(version))) | ||
| } | ||
| return WorkspaceModule{ | ||
| ID: module.ID, | ||
| JobID: module.JobID, | ||
| Transition: module.Transition, | ||
| Source:source, | ||
| Version:version, | ||
| Key: module.Key, | ||
| CreatedAt: module.CreatedAt, | ||
| } | ||
23 changes: 23 additions & 0 deletionscoderd/telemetry/telemetry_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 |
|---|---|---|
| @@ -5,6 +5,7 @@ import ( | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "net/url" | ||
| "sort" | ||
| "testing" | ||
| "time" | ||
| @@ -122,6 +123,28 @@ func TestTelemetry(t *testing.T) { | ||
| require.Len(t, snapshot.Users, 1) | ||
| require.Equal(t, snapshot.Users[0].EmailHashed, "bb44bf07cf9a2db0554bba63a03d822c927deae77df101874496df5a6a3e896d@coder.com") | ||
| }) | ||
| t.Run("HashedModule", func(t *testing.T) { | ||
| t.Parallel() | ||
| db := dbmem.New() | ||
| ||
| _ = dbgen.WorkspaceModule(t, db, database.WorkspaceModule{ | ||
| Source: "registry.coder.com/terraform/aws", | ||
| Version: "1.0.0", | ||
| }) | ||
| _ = dbgen.WorkspaceModule(t, db, database.WorkspaceModule{ | ||
| Source: "internal-url.com/some-module", | ||
| Version: "1.0.0", | ||
| }) | ||
| _, snapshot := collectSnapshot(t, db, nil) | ||
| require.Len(t, snapshot.WorkspaceModules, 2) | ||
| modules := snapshot.WorkspaceModules | ||
| sort.Slice(modules, func(i, j int) bool { | ||
| return modules[i].Source < modules[j].Source | ||
| }) | ||
| require.Equal(t, modules[0].Source, "921c61d6f3eef5118f3cae658d1518b378c5b02a4955a766c791440894d989c5") | ||
| require.Equal(t, modules[0].Version, "92521fc3cbd964bdc9f584a991b89fddaa5754ed1cc96d6d42445338669c1305") | ||
hugodutka marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| require.Equal(t, modules[1].Source, "registry.coder.com/terraform/aws") | ||
| require.Equal(t, modules[1].Version, "1.0.0") | ||
| }) | ||
| } | ||
| // nolint:paralleltest | ||
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.