Skip to content

Add periods to end of license warning text. #3933

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 2 commits into from
Sep 7, 2022
Merged

Add periods to end of license warning text. #3933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a05a11
Add periods to end of license warning text.
spikecurtis Sep 7, 2022
d46577c
Fix tests
spikecurtis Sep 7, 2022
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
4 changes: 2 additions & 2 deletions enterprise/coderd/features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func (s *featuresService) EntitlementsAPI(rw http.ResponseWriter, r *http.Reques
if n > e.activeUsers.limit {
resp.Warnings = append(resp.Warnings,
fmt.Sprintf(
"Your deployment has %d active users but is only licensed for %d",
"Your deployment has %d active users but is only licensed for %d.",
n, e.activeUsers.limit))
}
}
Expand All @@ -125,7 +125,7 @@ func (s *featuresService) EntitlementsAPI(rw http.ResponseWriter, r *http.Reques
}
if e.auditLogs.state == gracePeriod && s.enablements.AuditLogs {
resp.Warnings = append(resp.Warnings,
"Audit logging is enabled but your license for this feature is expired")
"Audit logging is enabled but your license for this feature is expired.")
}

httpapi.Write(rw, http.StatusOK, resp)
Expand Down
4 changes: 2 additions & 2 deletions enterprise/coderd/features_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ func TestFeaturesService_EntitlementsAPI(t *testing.T) {
assert.Nil(t, al.Actual)
assert.Len(t, result.Warnings, 2)
assert.Contains(t, result.Warnings,
"Your deployment has 5 active users but is only licensed for 4")
"Your deployment has 5 active users but is only licensed for 4.")
assert.Contains(t, result.Warnings,
"Audit logging is enabled but your license for this feature is expired")
"Audit logging is enabled but your license for this feature is expired.")
})
}

Expand Down