-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Implement a Template REST endpoint using the generic store #1040
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.
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
openshift-bot
merged 1 commit into
openshift:master
from
smarterclayton:add_template_api
Feb 18, 2015
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package client | ||
|
|
||
| import ( | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" | ||
|
|
||
| templateapi "github.com/openshift/origin/pkg/template/api" | ||
| ) | ||
|
|
||
| // FakeTemplates implements TemplateInterface. Meant to be embedded into a struct to get a default | ||
| // implementation. This makes faking out just the methods you want to test easier. | ||
| type FakeTemplates struct { | ||
| Fake *Fake | ||
| Namespace string | ||
| } | ||
|
|
||
| func (c *FakeTemplates) List(label, field labels.Selector) (*templateapi.TemplateList, error) { | ||
| c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "list-templates"}) | ||
| return &templateapi.TemplateList{}, nil | ||
| } | ||
|
|
||
| func (c *FakeTemplates) Get(name string) (*templateapi.Template, error) { | ||
| c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "get-template"}) | ||
| return &templateapi.Template{}, nil | ||
| } | ||
|
|
||
| func (c *FakeTemplates) Create(template *templateapi.Template) (*templateapi.Template, error) { | ||
| c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "create-template", Value: template}) | ||
| return &templateapi.Template{}, nil | ||
| } | ||
|
|
||
| func (c *FakeTemplates) Update(template *templateapi.Template) (*templateapi.Template, error) { | ||
| c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "update-template"}) | ||
| return &templateapi.Template{}, nil | ||
| } | ||
|
|
||
| func (c *FakeTemplates) Delete(name string) error { | ||
| c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "delete-template", Value: name}) | ||
| return nil | ||
| } | ||
|
|
||
| func (c *FakeTemplates) Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error) { | ||
| c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "watch-templates"}) | ||
| return nil, nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| package client | ||
|
|
||
| import ( | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" | ||
| "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" | ||
|
|
||
| templateapi "github.com/openshift/origin/pkg/template/api" | ||
| ) | ||
|
|
||
| // TemplatesNamespacer has methods to work with Template resources in a namespace | ||
| type TemplatesNamespacer interface { | ||
| Templates(namespace string) TemplateInterface | ||
| } | ||
|
|
||
| // TemplateInterface exposes methods on Template resources. | ||
| type TemplateInterface interface { | ||
| List(label, field labels.Selector) (*templateapi.TemplateList, error) | ||
| Get(name string) (*templateapi.Template, error) | ||
| Create(template *templateapi.Template) (*templateapi.Template, error) | ||
| Update(template *templateapi.Template) (*templateapi.Template, error) | ||
| Delete(name string) error | ||
| Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error) | ||
| } | ||
|
|
||
| // templates implements TemplatesNamespacer interface | ||
| type templates struct { | ||
| r *Client | ||
| ns string | ||
| } | ||
|
|
||
| // newTemplates returns a templates | ||
| func newTemplates(c *Client, namespace string) *templates { | ||
| return &templates{ | ||
| r: c, | ||
| ns: namespace, | ||
| } | ||
| } | ||
|
|
||
| // List returns a list of templates that match the label and field selectors. | ||
| func (c *templates) List(label, field labels.Selector) (result *templateapi.TemplateList, err error) { | ||
| result = &templateapi.TemplateList{} | ||
| err = c.r.Get(). | ||
| Namespace(c.ns). | ||
| Resource("templates"). | ||
| SelectorParam("labels", label). | ||
| SelectorParam("fields", field). | ||
| Do(). | ||
| Into(result) | ||
| return | ||
| } | ||
|
|
||
| // Get returns information about a particular template and error if one occurs. | ||
| func (c *templates) Get(name string) (result *templateapi.Template, err error) { | ||
| result = &templateapi.Template{} | ||
| err = c.r.Get().Namespace(c.ns).Resource("templates").Name(name).Do().Into(result) | ||
| return | ||
| } | ||
|
|
||
| // Create creates new template. Returns the server's representation of the template and error if one occurs. | ||
| func (c *templates) Create(template *templateapi.Template) (result *templateapi.Template, err error) { | ||
| result = &templateapi.Template{} | ||
| err = c.r.Post().Namespace(c.ns).Resource("templates").Body(template).Do().Into(result) | ||
| return | ||
| } | ||
|
|
||
| // Update updates the template on server. Returns the server's representation of the template and error if one occurs. | ||
| func (c *templates) Update(template *templateapi.Template) (result *templateapi.Template, err error) { | ||
| result = &templateapi.Template{} | ||
| err = c.r.Put().Namespace(c.ns).Resource("templates").Name(template.Name).Body(template).Do().Into(result) | ||
| return | ||
| } | ||
|
|
||
| // Delete deletes a template, returns error if one occurs. | ||
| func (c *templates) Delete(name string) (err error) { | ||
| err = c.r.Delete().Namespace(c.ns).Resource("templates").Name(name).Do().Error() | ||
| return | ||
| } | ||
|
|
||
| // Watch returns a watch.Interface that watches the requested templates | ||
| func (c *templates) Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error) { | ||
| return c.r.Get(). | ||
| Prefix("watch"). | ||
| Namespace(c.ns). | ||
| Resource("templates"). | ||
| Param("resourceVersion", resourceVersion). | ||
| SelectorParam("labels", label). | ||
| SelectorParam("fields", field). | ||
| Watch() | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is going to be confusing behavior for users i think. (that you are creating a template object, not creating the things defined in the template). can't immediately think of a way to fix it that retains consistency with the create verb, but it bothers me so i figured i'd note it in case someone else has a thought.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Create shouldn't create the things in the template anyway (otherwise the template isn't providing value) but yes, I agree.