Skip to content

feat: add examples to api #5331

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 9 commits into from
Dec 9, 2022
Merged

feat: add examples to api #5331

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
300a763
feat: add examples to api
f0ssel Dec 6, 2022
da9fc00
add support for example id in route
f0ssel Dec 7, 2022
a9f04f3
move files
f0ssel Dec 7, 2022
90e6a9d
fix existing tests
f0ssel Dec 7, 2022
7084ceb
add tests
f0ssel Dec 7, 2022
50fb405
more tests
f0ssel Dec 7, 2022
b00a3b9
more tests
f0ssel Dec 7, 2022
85266d0
add icon and tag parsing
f0ssel Dec 9, 2022
9f3108f
remove extra test work
f0ssel Dec 9, 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
Prev Previous commit
Next Next commit
move files
  • Loading branch information
@f0ssel
f0ssel committed Dec 7, 2022
commit a9f04f3e4d8e6c4e7cbce68a7da416a2a445f99d
16 changes: 16 additions & 0 deletions coderd/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/coder/coder/coderd/rbac"
"github.com/coder/coder/coderd/telemetry"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/examples"
)

// Auto-importable templates. These can be auto-imported after the first user
Expand Down Expand Up @@ -564,6 +565,21 @@ func (api *API) templateDAUs(rw http.ResponseWriter, r *http.Request) {
httpapi.Write(ctx, rw, http.StatusOK, resp)
}

func (*API) templateExamples(rw http.ResponseWriter, r *http.Request) {
ctx := r.Context()

ex, err := examples.List()
if err != nil {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error fetching examples.",
Detail: err.Error(),
})
return
}

httpapi.Write(ctx, rw, http.StatusOK, ex)
}

type autoImportTemplateOpts struct {
name string
archive []byte
Expand Down
15 changes: 0 additions & 15 deletions coderd/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,21 +825,6 @@ func (api *API) putUserRoles(rw http.ResponseWriter, r *http.Request) {
httpapi.Write(ctx, rw, http.StatusOK, convertUser(updatedUser, organizationIDs))
}

func (_ *API) templateExamples(rw http.ResponseWriter, r *http.Request) {
ctx := r.Context()

ex, err := examples.List()
if err != nil {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error fetching examples.",
Detail: err.Error(),
})
return
}

httpapi.Write(ctx, rw, http.StatusOK, ex)
}

// updateSiteUserRoles will ensure only site wide roles are passed in as arguments.
// If an organization role is included, an error is returned.
func (api *API) updateSiteUserRoles(ctx context.Context, args database.UpdateUserRolesParams) (database.User, error) {
Expand Down