Skip to content

Commit 60e0a5f

Browse files
cbencben
authored
Merge pull request #378 from cben/blacklist-processedtemplates
[v4.1.z] Don't try creating methods for /processedtemplates pseudo-entity
2 parents e686cc9 + 7610ecf commit 60e0a5f

5 files changed

+176
-0
lines changed

‎lib/kubeclient/common.rb

+3
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,9 @@ def load_entities
516516
@entities = {}
517517
fetch_entities['resources'].each do |resource|
518518
next if resource['name'].include?('/')
519+
# Not a regular entity, special functionality covered by `process_template`.
520+
# https://github.com/openshift/origin/issues/21668
521+
next if resource['kind'] == 'Template' && resource['name'] == 'processedtemplates'
519522
resource['kind'] ||=
520523
Kubeclient::Common::MissingKindCompatibility.resource_kind(resource['name'])
521524
entity = ClientMixin.parse_definition(resource['kind'], resource['name'])

‎test/json/template.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"apiVersion": "template.openshift.io/v1",
3+
"kind": "Template",
4+
"metadata": {
5+
"creationTimestamp": "2018-12-17T16:11:36Z",
6+
"name": "my-template",
7+
"namespace": "default",
8+
"resourceVersion": "21954",
9+
"selfLink": "/apis/template.openshift.io/v1/namespaces/default/templates/my-template",
10+
"uid": "6e03e3e6-0216-11e9-b1e0-68f728fac3ab"
11+
},
12+
"objects": [
13+
{
14+
"apiVersion": "v1",
15+
"kind": "Service",
16+
"metadata": {
17+
"name": "${NAME_PREFIX}my-service"
18+
}
19+
}
20+
],
21+
"parameters": [
22+
{
23+
"description": "Prefix for names",
24+
"name": "NAME_PREFIX"
25+
}
26+
]
27+
}

‎test/json/template.openshift.io_api_resource_list.json

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{
2+
"kind": "APIResourceList",
3+
"apiVersion": "v1",
4+
"groupVersion": "template.openshift.io/v1",
5+
"resources": [
6+
{
7+
"name": "brokertemplateinstances",
8+
"singularName": "",
9+
"namespaced": false,
10+
"kind": "BrokerTemplateInstance",
11+
"verbs": [
12+
"create",
13+
"delete",
14+
"deletecollection",
15+
"get",
16+
"list",
17+
"patch",
18+
"update",
19+
"watch"
20+
]
21+
},
22+
{
23+
"name": "processedtemplates",
24+
"singularName": "",
25+
"namespaced": true,
26+
"kind": "Template",
27+
"verbs": [
28+
"create"
29+
]
30+
},
31+
{
32+
"name": "templateinstances",
33+
"singularName": "",
34+
"namespaced": true,
35+
"kind": "TemplateInstance",
36+
"verbs": [
37+
"create",
38+
"delete",
39+
"deletecollection",
40+
"get",
41+
"list",
42+
"patch",
43+
"update",
44+
"watch"
45+
]
46+
},
47+
{
48+
"name": "templateinstances/status",
49+
"singularName": "",
50+
"namespaced": true,
51+
"kind": "TemplateInstance",
52+
"verbs": [
53+
"get",
54+
"patch",
55+
"update"
56+
]
57+
},
58+
{
59+
"name": "templates",
60+
"singularName": "",
61+
"namespaced": true,
62+
"kind": "Template",
63+
"verbs": [
64+
"create",
65+
"delete",
66+
"deletecollection",
67+
"get",
68+
"list",
69+
"patch",
70+
"update",
71+
"watch"
72+
]
73+
}
74+
]
75+
}

‎test/json/template_list.json

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"kind": "TemplateList",
3+
"apiVersion": "template.openshift.io/v1",
4+
"metadata": {
5+
"selfLink": "/apis/template.openshift.io/v1/namespaces/default/templates",
6+
"resourceVersion": "22758"
7+
},
8+
"items": [
9+
{
10+
"metadata": {
11+
"name": "my-template",
12+
"namespace": "default",
13+
"selfLink": "/apis/template.openshift.io/v1/namespaces/default/templates/my-template",
14+
"uid": "6e03e3e6-0216-11e9-b1e0-68f728fac3ab",
15+
"resourceVersion": "21954",
16+
"creationTimestamp": "2018-12-17T16:11:36Z"
17+
},
18+
"objects": [
19+
{
20+
"apiVersion": "v1",
21+
"kind": "Service",
22+
"metadata": {
23+
"name": "${NAME_PREFIX}my-service"
24+
}
25+
}
26+
],
27+
"parameters": [
28+
{
29+
"name": "NAME_PREFIX",
30+
"description": "Prefix for names"
31+
}
32+
]
33+
}
34+
]
35+
}

‎test/test_process_template.rb

+36
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,40 @@ def test_process_template
4141
data['metadata']['namespace'] == 'default'
4242
end
4343
end
44+
45+
# Ensure _template and _templates methods hit `/templates` rather than
46+
# `/processedtemplates` URL.
47+
def test_templates_methods
48+
stub_request(:get, %r{/apis/template\.openshift\.io/v1$}).to_return(
49+
body: open_test_file('template.openshift.io_api_resource_list.json'),
50+
status: 200
51+
)
52+
client = Kubeclient::Client.new('http://localhost:8080/apis/template.openshift.io', 'v1')
53+
54+
expected_url = 'http://localhost:8080/apis/template.openshift.io/v1/namespaces/default/templates'
55+
stub_request(:get, expected_url)
56+
.to_return(body: open_test_file('template_list.json'), status: 200)
57+
client.get_templates(namespace: 'default')
58+
assert_requested(:get, expected_url, times: 1)
59+
60+
expected_url = 'http://localhost:8080/apis/template.openshift.io/v1/namespaces/default/templates/my-template'
61+
stub_request(:get, expected_url)
62+
.to_return(body: open_test_file('template.json'), status: 200)
63+
client.get_template('my-template', 'default')
64+
assert_requested(:get, expected_url, times: 1)
65+
end
66+
67+
def test_no_processedtemplates_methods
68+
stub_request(:get, %r{/apis/template\.openshift\.io/v1$}).to_return(
69+
body: open_test_file('template.openshift.io_api_resource_list.json'),
70+
status: 200
71+
)
72+
client = Kubeclient::Client.new('http://localhost:8080/apis/template.openshift.io', 'v1')
73+
client.discover
74+
75+
refute_respond_to(client, :get_processedtemplates)
76+
refute_respond_to(client, :get_processedtemplate)
77+
refute_respond_to(client, :get_processed_templates)
78+
refute_respond_to(client, :get_processed_template)
79+
end
4480
end

0 commit comments

Comments
 (0)