Skip to content

feat: Enable workspace debug logging #6838

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 30, 2023
Merged

feat: Enable workspace debug logging #6838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3f57a28
feat: Enable workspace debug logging
mtojek Mar 28, 2023
1283b7c
Fix
mtojek Mar 28, 2023
aa69b59
Fix
mtojek Mar 28, 2023
245b505
Fix
mtojek Mar 28, 2023
2fb359c
fix
mtojek Mar 28, 2023
750cfc3
fix
mtojek Mar 28, 2023
a9a05d4
Enable RBAC
mtojek Mar 28, 2023
3a3147d
unit tests
mtojek Mar 29, 2023
96936ca
Fix
mtojek Mar 29, 2023
43611ed
fix
mtojek Mar 29, 2023
864d2b2
fix
mtojek Mar 29, 2023
02e5ddc
fix
mtojek Mar 29, 2023
35cf509
more tests
mtojek Mar 29, 2023
e7b1e3c
fix: workspacebuild_test use roles
mtojek Mar 30, 2023
f86005a
fix: swagger comment
mtojek Mar 30, 2023
e24db7f
fix: ctx.Done
mtojek Mar 30, 2023
1d3bccc
fix: address PR comments
mtojek Mar 30, 2023
af908fe
break loop
mtojek Mar 30, 2023
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
Fix
  • Loading branch information
@mtojek
mtojek committed Mar 29, 2023
commit 96936ca2e145b0b660fb878034cc7dbbfbb91fca
2 changes: 1 addition & 1 deletion provisioner/terraform/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ func readAndLog(sink logSink, r io.Reader, done chan<- any, level proto.LogLevel

logLevel := convertTerraformLogLevel(log.Level, sink)
if logLevel == proto.LogLevel_TRACE {
// Skip TRACE log entries as they produce a lot of noise
// Skip TRACE log entries as they produce a lot of noise.
//
// FIXME consider config.ProvisionerLogLevel to enable custom level logging
// instead of "just-debug-level" mode.
Expand Down
6 changes: 3 additions & 3 deletions provisioner/terraform/provision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (s *server) Provision(stream proto.DRPCProvisioner_ProvisionStream) error {
return xerrors.Errorf("initialize terraform: %w", err)
}
s.logger.Debug(ctx, "ran initialization")
env, err := provisionEnv(config, request.GetPlan().GetParameterValues(), request.GetPlan().GetRichParameterValues(), request.GetPlan().GetGitAuthProviders(), config.ProvisionerLogLevel)
env, err := provisionEnv(config, request.GetPlan().GetParameterValues(), request.GetPlan().GetRichParameterValues(), request.GetPlan().GetGitAuthProviders(), config.ProvisionerLogLevel != "")
if err != nil {
return err
}
Expand Down Expand Up @@ -205,7 +205,7 @@ func planVars(plan *proto.Provision_Plan) ([]string, error) {
return vars, nil
}

func provisionEnv(config *proto.Provision_Config, params []*proto.ParameterValue, richParams []*proto.RichParameterValue, gitAuth []*proto.GitAuthProvider, logLevel string) ([]string, error) {
func provisionEnv(config *proto.Provision_Config, params []*proto.ParameterValue, richParams []*proto.RichParameterValue, gitAuth []*proto.GitAuthProvider, verbose bool) ([]string, error) {
env := safeEnviron()
env = append(env,
"CODER_AGENT_URL="+config.Metadata.CoderUrl,
Expand Down Expand Up @@ -237,7 +237,7 @@ func provisionEnv(config *proto.Provision_Config, params []*proto.ParameterValue
env = append(env, provider.GitAuthAccessTokenEnvironmentVariable(gitAuth.Id)+"="+gitAuth.AccessToken)
}

if logLevel == "debug" {
if verbose {
// TF_LOG=JSON enables all kind of logging: trace-debug-info-warn-error.
// The idea behind using TF_LOG=JSON instead of TF_LOG=debug is ensuring the proper log format.
env = append(env, "TF_LOG=JSON")
Expand Down