Skip to content

Commit

Permalink
Improve wording for missing resource debug log statements
Browse files Browse the repository at this point in the history
  • Loading branch information
mwudka committed Dec 1, 2022
1 parent 1680793 commit 3b02369
Show file tree
Hide file tree
Showing 18 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion tfe/resource_tfe_agent_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func resourceTFEAgentPoolRead(d *schema.ResourceData, meta interface{}) error {
agentPool, err := tfeClient.AgentPools.Read(ctx, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] agent pool %s does no longer exist", d.Id())
log.Printf("[DEBUG] agent pool %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_oauth_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func resourceTFEOAuthClientRead(d *schema.ResourceData, meta interface{}) error
oc, err := tfeClient.OAuthClients.Read(ctx, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] OAuth client %s does no longer exist", d.Id())
log.Printf("[DEBUG] OAuth client %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_organization.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func resourceTFEOrganizationRead(d *schema.ResourceData, meta interface{}) error
org, err := tfeClient.Organizations.Read(ctx, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Organization %s does no longer exist", d.Id())
log.Printf("[DEBUG] Organization %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_organization_membership.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func resourceTFEOrganizationMembershipRead(d *schema.ResourceData, meta interfac

if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Membership %s does no longer exist", d.Id())
log.Printf("[DEBUG] Membership %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_organization_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func resourceTFEOrganizationTokenRead(d *schema.ResourceData, meta interface{})
_, err := tfeClient.OrganizationTokens.Read(ctx, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Token for organization %s does no longer exist", d.Id())
log.Printf("[DEBUG] Token for organization %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func resourceTFEPolicyRead(d *schema.ResourceData, meta interface{}) error {
policy, err := tfeClient.Policies.Read(ctx, d.Id())
if err != nil {
if errors.Is(err, tfe.ErrResourceNotFound) {
log.Printf("[DEBUG] Policy %s does no longer exist", d.Id())
log.Printf("[DEBUG] Policy %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_policy_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ func resourceTFEPolicySetRead(d *schema.ResourceData, meta interface{}) error {
policySet, err := tfeClient.PolicySets.Read(ctx, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Policy set %s does no longer exist", d.Id())
log.Printf("[DEBUG] Policy set %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_policy_set_parameter.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func resourceTFEPolicySetParameterRead(d *schema.ResourceData, meta interface{})
parameter, err := tfeClient.PolicySetParameters.Read(ctx, policySet.ID, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] PolicySetParameter %s does no longer exist", d.Id())
log.Printf("[DEBUG] PolicySetParameter %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_project.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func resourceTFEProjectRead(ctx context.Context, d *schema.ResourceData, meta in
project, err := tfeClient.Projects.Read(ctx, d.Id())
if err != nil {
if errors.Is(err, tfe.ErrResourceNotFound) {
log.Printf("[DEBUG] Project %s does no longer exist", d.Id())
log.Printf("[DEBUG] Project %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_sentinel_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func resourceTFESentinelPolicyRead(d *schema.ResourceData, meta interface{}) err
policy, err := tfeClient.Policies.Read(ctx, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Sentinel policy %s does no longer exist", d.Id())
log.Printf("[DEBUG] Sentinel policy %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_ssh_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func resourceTFESSHKeyRead(d *schema.ResourceData, meta interface{}) error {
sshKey, err := tfeClient.SSHKeys.Read(ctx, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] SSH key %s does no longer exist", d.Id())
log.Printf("[DEBUG] SSH key %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_team.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func resourceTFETeamRead(d *schema.ResourceData, meta interface{}) error {
team, err := tfeClient.Teams.Read(ctx, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Team %s does no longer exist", d.Id())
log.Printf("[DEBUG] Team %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_team_access.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ func resourceTFETeamAccessRead(d *schema.ResourceData, meta interface{}) error {
tmAccess, err := tfeClient.TeamAccess.Read(ctx, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Team access %s does no longer exist", d.Id())
log.Printf("[DEBUG] Team access %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions tfe/resource_tfe_team_member.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func resourceTFETeamMemberRead(d *schema.ResourceData, meta interface{}) error {
users, err := tfeClient.TeamMembers.List(ctx, teamID)
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] User %q does no longer exist", d.Id())
log.Printf("[DEBUG] User %q no longer exists", d.Id())
d.SetId("")
return nil
}
Expand All @@ -92,7 +92,7 @@ func resourceTFETeamMemberRead(d *schema.ResourceData, meta interface{}) error {
}

if !found {
log.Printf("[DEBUG] User %q does no longer exist", d.Id())
log.Printf("[DEBUG] User %q no longer exists", d.Id())
d.SetId("")
}

Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_team_organization_member.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func resourceTFETeamOrganizationMemberRead(d *schema.ResourceData, meta interfac
organizationMemberships, err := tfeClient.TeamMembers.ListOrganizationMemberships(ctx, teamID)
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Organization membership %q does no longer exist", d.Id())
log.Printf("[DEBUG] Organization membership %q no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_team_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func resourceTFETeamTokenRead(d *schema.ResourceData, meta interface{}) error {
_, err := tfeClient.TeamTokens.Read(ctx, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Token for team %s does no longer exist", d.Id())
log.Printf("[DEBUG] Token for team %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tfe/resource_tfe_terraform_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func resourceTFETerraformVersionRead(d *schema.ResourceData, meta interface{}) e
v, err := tfeClient.Admin.TerraformVersions.Read(ctx, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Terraform version %s does no longer exist", d.Id())
log.Printf("[DEBUG] Terraform version %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions tfe/resource_tfe_variable.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ func resourceTFEVariableRead(d *schema.ResourceData, meta interface{}) error {
variable, err := tfeClient.Variables.Read(ctx, ws.ID, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Variable %s does no longer exist", d.Id())
log.Printf("[DEBUG] Variable %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down Expand Up @@ -266,7 +266,7 @@ func resourceTFEVariableSetVariableRead(d *schema.ResourceData, meta interface{}
variable, err := tfeClient.VariableSetVariables.Read(ctx, vs.ID, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Variable %s does no longer exist", d.Id())
log.Printf("[DEBUG] Variable %s no longer exists", d.Id())
d.SetId("")
return nil
}
Expand Down

0 comments on commit 3b02369

Please sign in to comment.