Resource Library #301

vkorbes · 2018-02-16T23:58:54Z

Package resource implements tools for the discovery and filtering of resources in an API server.

Tests to be implemented in a subsequent PR.

k8s-ci-robot · 2018-02-16T23:58:58Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ellenkorbes
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: pwittrock

Assign the PR to them by writing /assign @pwittrock in a comment when ready.

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

vkorbes · 2018-02-17T00:00:32Z

/assign @apelisse
/assign @pwittrock

apelisse

This is great! Very clean. Thank you!

apelisse · 2018-02-17T04:18:03Z

pkg/framework/resource/doc.go

+
+The following (admittedly ludicrous) example adds a filter to the example above that excludes all resources that do not start with the letter "n":
+
+	type letterN struct {


Yeah, there is no reason not to have this as a compiled example.

apelisse · 2018-02-17T04:18:22Z

pkg/framework/resource/doc.go

+
+For example:
+
+	p := resource.NewParser(resources, discovery, apiGroup, apiVersion)


Same, I think this could be compiled. We can't test the output, but we can make sure it compiles.

Since the examples won't pass testing, isn't that possibly gonna create a problem for us later on?

if you don't have the // Output: comment in your example, they won't run, they won't fail. They will be compiled to make sure that they are up-to-date though (which is still valuable to us).

apelisse · 2018-02-17T04:18:49Z

pkg/framework/resource/doc.go

+	}
+
+	func (*letterN) Resource(r *resource.Resource) bool {
+		return string(r.Resource.Name[0]) == "n"


It'd be weird to have an empty resource name, but that could technically crash ;-)

apelisse · 2018-02-17T04:19:07Z

pkg/framework/resource/doc.go

+	type letterN struct {
+	}
+
+	func (*letterN) Resource(r *resource.Resource) bool {


Doesn't need to be pointer.

apelisse · 2018-02-17T04:19:17Z

pkg/framework/resource/doc.go

+		if err != nil {
+			panic(err)
+		}
+		r = r.Filter(&letterN{})


Doesn't have to be address (if you remove the two pointers above)

apelisse · 2018-02-17T04:34:33Z

pkg/framework/resource/parse.go

+
+// resource returns the resource name and true if it is a resource (not a subresource).
+// It returns the resource name and false it if it is a subresource.
+func (p *parser) resource(resource *v1.APIResource) (string, bool) {


naming return parameters?

apelisse · 2018-02-17T04:35:37Z

pkg/framework/resource/parse.go

+}
+
+// isGroupVersionMatch returns false if either group or version doesn't match with the API.
+func (p *parser) isGroupVersionMatch(group, version string) bool {


I'm wondering why we need that? If we could get rid of that, that'd simplify the creation of the parser. @pwittrock

apelisse · 2018-02-17T04:37:44Z

pkg/framework/resource/resource.go

+
+// Resource is an API Resource.
+type Resource struct {
+	Resource        v1.APIResource


I think we'd rather make these private by default, and change them to public as needed.

You sure? If I were to do this it'd break my filter examples (they depend on r.Resource.Name).

I tried it anyway and the IDE gave me:

Rename failed: /home/ellen/go/src/k8s.io/kubectl/pkg/framework/resource/resource.go:26:6: renaming this type "Resource" to "resource" would make it unexported /home/ellen/go/src/k8s.io/kubectl/pkg/framework/resource/poc/main.go:38:38: breaking references from packages such as "k8s.io/kubectl/pkg/framework/resource/poc" [...]

I did it by hand then and indeed it broke everything.

undefined: "k8s.io/kubectl/pkg/framework/resource".Resource

There's probably a way to do the filtering differently, but do we really have to?

Sorry if I was unclear. By "these", I meant "all these fields". If this one in particular is needed, let's keep it public, what about the others?

apelisse · 2018-02-17T04:37:50Z

pkg/framework/resource/resource.go

+
+// SubResource is an API subresource.
+type SubResource struct {
+	Resource        v1.APIResource


public -> private?

apelisse · 2018-02-17T04:38:53Z

pkg/framework/resource/parse.go

+}
+
+// indexResources indexes into maps the resources from the API resource list. It returns a map indexed by resource name, and a map indexed by GroupVersionResource objects.
+func (p *parser) indexResources(gvs []*v1.APIResourceList) (map[string][]*Resource, map[schema.GroupVersionResource]*Resource) {


Should the type be "Resources" here (first returned type)?

apelisse · 2018-02-17T04:41:40Z

Yeah, you should run gofmt too.

apelisse · 2018-02-17T04:42:35Z

pkg/framework/resource/parse.go

+	return true
+}
+
+// getOpenAPI retrieves a schema object from the API based on a GroupVersionResource triplet.


I'm not sure why this returns the Schema and bool. It's safe and sufficient to check if Schema is nil.

apelisse · 2018-02-20T17:39:18Z

This is great. Please fix the test so that we can merge it!

Thanks!

vkorbes · 2018-02-25T14:16:29Z

/retest

apelisse

Just had time for a cursory look, but I think it's pretty good. I have a bunch of nit, but I don't want these to block.

apelisse · 2018-02-27T05:17:16Z

pkg/framework/openapi/openapi_test.go

+	tst "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing"
+)
+
+var fakeSchema = tst.Fake{Path: filepath.Join("..", "..", "..", "..", "..", "api", "openapi-spec", "swagger.json")}


This can't work :-/

apelisse · 2018-02-27T05:17:34Z

pkg/framework/openapi/testing/BUILD

@@ -0,0 +1,33 @@
+package(default_visibility = ["//visibility:public"])


I think you can drop these files in general (bazel)

apelisse · 2018-02-27T05:18:08Z

pkg/framework/openapi/validation/validation.go

@@ -0,0 +1,141 @@
+/*


I'm not sure you need this package at all.

apelisse · 2018-02-27T05:20:57Z

pkg/framework/resource/resource.go

+	Resource        v1.APIResource
+	apiGroupVersion schema.GroupVersion
+	schema          openapi.Schema
+	SubResources    []*SubResource


Try to sort public and then private fields for readability

apelisse

Good job Ellen! Thank you so much 🎆

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 16, 2018

k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Feb 16, 2018

k8s-ci-robot assigned apelisse and pwittrock Feb 17, 2018

apelisse reviewed Feb 17, 2018

View reviewed changes

k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Feb 25, 2018

vkorbes force-pushed the clientlibmin branch 2 times, most recently from b88a3e6 to 50140c8 Compare February 25, 2018 14:13

apelisse reviewed Feb 27, 2018

View reviewed changes

vkorbes force-pushed the clientlibmin branch 3 times, most recently from b596d8a to d79f38d Compare March 5, 2018 22:15

vkorbes added 3 commits March 6, 2018 13:46

resource library

3be8109

rebase

a9cf135

added vendor directories

f893cb6

vkorbes force-pushed the clientlibmin branch from d79f38d to f893cb6 Compare March 6, 2018 16:57

apelisse approved these changes Mar 6, 2018

View reviewed changes

k8s-ci-robot merged commit f09aa18 into kubernetes:master Mar 6, 2018

Resource Library #301

Resource Library #301

vkorbes commented Feb 16, 2018 •

edited

k8s-ci-robot commented Feb 16, 2018

vkorbes commented Feb 17, 2018

apelisse left a comment

apelisse Feb 17, 2018

apelisse Feb 17, 2018

vkorbes Feb 20, 2018

apelisse Feb 20, 2018

apelisse Feb 17, 2018

apelisse Feb 17, 2018

apelisse Feb 17, 2018

apelisse Feb 17, 2018

apelisse Feb 17, 2018

apelisse Feb 17, 2018

vkorbes Feb 20, 2018

apelisse Feb 20, 2018

apelisse Feb 17, 2018

apelisse Feb 17, 2018

apelisse commented Feb 17, 2018

apelisse Feb 17, 2018

apelisse commented Feb 20, 2018

vkorbes commented Feb 25, 2018

apelisse left a comment

apelisse Feb 27, 2018

apelisse Feb 27, 2018

apelisse Feb 27, 2018

apelisse Feb 27, 2018

apelisse left a comment


		The following (admittedly ludicrous) example adds a filter to the example above that excludes all resources that do not start with the letter "n":

		type letterN struct {


		For example:

		p := resource.NewParser(resources, discovery, apiGroup, apiVersion)

		@@ -0,0 +1,33 @@
		package(default_visibility = ["//visibility:public"])

Resource Library #301

Resource Library #301

Conversation

vkorbes commented Feb 16, 2018 • edited

k8s-ci-robot commented Feb 16, 2018

vkorbes commented Feb 17, 2018

apelisse left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

apelisse commented Feb 17, 2018

Choose a reason for hiding this comment

apelisse commented Feb 20, 2018

vkorbes commented Feb 25, 2018

apelisse left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

apelisse left a comment

Choose a reason for hiding this comment

vkorbes commented Feb 16, 2018 •

edited