Skip to content

composer: stop logging user_workloads_secret data in debug logs #18171

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

Open
naruto-lgtm wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −8
Open

composer: stop logging user_workloads_secret data in debug logs #18171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func resourceComposerUserWorkloadsSecretCreate(d *schema.ResourceData, meta inte
}

log.Printf("[DEBUG] Creating new UserWorkloadsSecret %q", secretName.ParentName())
resp, err := NewClient(config, userAgent).Projects.Locations.Environments.UserWorkloadsSecrets.Create(secretName.ParentName(), secret).Do()
_, err = NewClient(config, userAgent).Projects.Locations.Environments.UserWorkloadsSecrets.Create(secretName.ParentName(), secret).Do()
if err != nil {
return fmt.Errorf("Error creating UserWorkloadsSecret: %s", err)
}
Expand All @@ -113,8 +113,8 @@ func resourceComposerUserWorkloadsSecretCreate(d *schema.ResourceData, meta inte
}
d.SetId(id)

respJson, _ := resp.MarshalJSON()
log.Printf("[DEBUG] Finished creating UserWorkloadsSecret %q: %#v", d.Id(), string(respJson))
// The response body echoes the secret's "data" values, so only the id is logged.
log.Printf("[DEBUG] Finished creating UserWorkloadsSecret %q", d.Id())

return resourceComposerUserWorkloadsSecretRead(d, meta)
}
Expand Down Expand Up @@ -179,16 +179,15 @@ func resourceComposerUserWorkloadsSecretUpdate(d *schema.ResourceData, meta inte
Data: tpgresource.ConvertStringMap(d.Get("data").(map[string]interface{})),
}

secretJson, _ := secret.MarshalJSON()
log.Printf("[DEBUG] Updating UserWorkloadsSecret %q: %s", d.Id(), string(secretJson))
// secret.Data holds the Sensitive secret values, so the body is not logged.
log.Printf("[DEBUG] Updating UserWorkloadsSecret %q", d.Id())

resp, err := NewClient(config, userAgent).Projects.Locations.Environments.UserWorkloadsSecrets.Update(secretName.ResourceName(), secret).Do()
_, err = NewClient(config, userAgent).Projects.Locations.Environments.UserWorkloadsSecrets.Update(secretName.ResourceName(), secret).Do()
if err != nil {
return err
}

respJson, _ := resp.MarshalJSON()
log.Printf("[DEBUG] Finished updating UserWorkloadsSecret %q: %s", d.Id(), string(respJson))
log.Printf("[DEBUG] Finished updating UserWorkloadsSecret %q", d.Id())
}

return nil
Expand Down
Loading