-
Notifications
You must be signed in to change notification settings - Fork 24
/
master-0001-apiextensions-add-scope-tests.patch
193 lines (190 loc) · 7.21 KB
/
master-0001-apiextensions-add-scope-tests.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
From 5807dccb2166ae6338c1cc3a337b7e621d41b526 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Mon, 1 Jul 2019 21:24:16 +0200
Subject: [PATCH 1/2] apiextensions: add scope tests
---
.../test/integration/BUILD | 1 +
.../test/integration/scope_test.go | 161 ++++++++++++++++++
2 files changed, 162 insertions(+)
create mode 100644 staging/src/k8s.io/apiextensions-apiserver/test/integration/scope_test.go
diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/BUILD b/staging/src/k8s.io/apiextensions-apiserver/test/integration/BUILD
index 164c5bb42a..568632241d 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/BUILD
+++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/BUILD
@@ -17,6 +17,7 @@ go_test(
"objectmeta_test.go",
"pruning_test.go",
"registration_test.go",
+ "scope_test.go",
"subresources_test.go",
"table_test.go",
"validation_test.go",
diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/scope_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/scope_test.go
new file mode 100644
index 0000000000..386fee3faa
--- /dev/null
+++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/scope_test.go
@@ -0,0 +1,161 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package integration
+
+import (
+ "strings"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+
+ apierrors "k8s.io/apimachinery/pkg/api/errors"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+ "k8s.io/apimachinery/pkg/runtime/schema"
+ "k8s.io/apimachinery/pkg/types"
+ "k8s.io/client-go/dynamic"
+
+ apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+ "k8s.io/apiextensions-apiserver/test/integration/fixtures"
+)
+
+func TestHandlerScope(t *testing.T) {
+ tearDown, apiExtensionClient, dynamicClient, err := fixtures.StartDefaultServerWithClients(t)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer tearDown()
+
+ for _, scope := range []apiextensionsv1beta1.ResourceScope{apiextensionsv1beta1.ClusterScoped, apiextensionsv1beta1.NamespaceScoped} {
+ t.Run(string(scope), func(t *testing.T) {
+
+ crd := &apiextensionsv1beta1.CustomResourceDefinition{
+ ObjectMeta: metav1.ObjectMeta{Name: strings.ToLower(string(scope)) + "s.test.apiextensions-apiserver.k8s.io"},
+ Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{
+ Group: "test.apiextensions-apiserver.k8s.io",
+ Version: "v1beta1",
+ Names: apiextensionsv1beta1.CustomResourceDefinitionNames{
+ Plural: strings.ToLower(string(scope)) + "s",
+ Singular: strings.ToLower(string(scope)),
+ Kind: string(scope),
+ ListKind: string(scope) + "List",
+ },
+ Scope: scope,
+ },
+ }
+ crd.Spec.Subresources = &apiextensionsv1beta1.CustomResourceSubresources{
+ Status: &apiextensionsv1beta1.CustomResourceSubresourceStatus{},
+ Scale: &apiextensionsv1beta1.CustomResourceSubresourceScale{
+ SpecReplicasPath: ".spec.replicas",
+ StatusReplicasPath: ".status.replicas",
+ },
+ }
+ crd, err = fixtures.CreateNewCustomResourceDefinition(crd, apiExtensionClient, dynamicClient)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ gvr := schema.GroupVersionResource{Group: crd.Spec.Group, Version: crd.Spec.Versions[0].Name, Resource: crd.Spec.Names.Plural}
+
+ ns := "test"
+ var client dynamic.ResourceInterface = dynamicClient.Resource(gvr)
+ var otherScopeClient dynamic.ResourceInterface = dynamicClient.Resource(gvr).Namespace(ns)
+ if crd.Spec.Scope == apiextensionsv1beta1.NamespaceScoped {
+ client, otherScopeClient = otherScopeClient, client
+ }
+
+ name := "bar"
+ cr := &unstructured.Unstructured{
+ Object: map[string]interface{}{
+ "kind": crd.Spec.Names.Kind,
+ "apiVersion": gvr.GroupVersion().String(),
+ "metadata": map[string]interface{}{
+ "name": name,
+ },
+ },
+ }
+
+ _, err := otherScopeClient.Create(cr, metav1.CreateOptions{})
+ assert.True(t, apierrors.IsNotFound(err))
+
+ _, err = otherScopeClient.Create(cr, metav1.CreateOptions{}, "status")
+ assert.True(t, apierrors.IsNotFound(err))
+
+ _, err = otherScopeClient.Create(cr, metav1.CreateOptions{}, "scale")
+ assert.True(t, apierrors.IsNotFound(err))
+
+ _, err = client.Create(cr, metav1.CreateOptions{})
+ assert.NoError(t, err)
+
+ _, err = otherScopeClient.Get(name, metav1.GetOptions{})
+ assert.True(t, apierrors.IsNotFound(err))
+
+ _, err = otherScopeClient.Get(name, metav1.GetOptions{}, "status")
+ assert.True(t, apierrors.IsNotFound(err))
+
+ _, err = otherScopeClient.Get(name, metav1.GetOptions{}, "scale")
+ assert.True(t, apierrors.IsNotFound(err))
+
+ _, err = otherScopeClient.Update(cr, metav1.UpdateOptions{})
+ assert.True(t, apierrors.IsNotFound(err))
+
+ _, err = otherScopeClient.Update(cr, metav1.UpdateOptions{}, "status")
+ assert.True(t, apierrors.IsNotFound(err))
+
+ _, err = otherScopeClient.Update(cr, metav1.UpdateOptions{}, "scale")
+ assert.True(t, apierrors.IsNotFound(err))
+
+ _, err = otherScopeClient.Patch(name, types.MergePatchType, []byte(`{"metadata":{"annotations":{"test":"1"}}}`), metav1.PatchOptions{})
+ assert.True(t, apierrors.IsNotFound(err))
+
+ _, err = otherScopeClient.Patch(name, types.MergePatchType, []byte(`{"metadata":{"annotations":{"test":"1"}}}`), metav1.PatchOptions{}, "status")
+ assert.True(t, apierrors.IsNotFound(err))
+
+ _, err = otherScopeClient.Patch(name, types.MergePatchType, []byte(`{"metadata":{"annotations":{"test":"1"}}}`), metav1.PatchOptions{}, "scale")
+ assert.True(t, apierrors.IsNotFound(err))
+
+ err = otherScopeClient.Delete(name, &metav1.DeleteOptions{})
+ assert.True(t, apierrors.IsNotFound(err))
+
+ err = otherScopeClient.Delete(name, &metav1.DeleteOptions{}, "status")
+ assert.True(t, apierrors.IsNotFound(err))
+
+ err = otherScopeClient.Delete(name, &metav1.DeleteOptions{}, "scale")
+ assert.True(t, apierrors.IsNotFound(err))
+
+ err = otherScopeClient.DeleteCollection(&metav1.DeleteOptions{}, metav1.ListOptions{})
+ assert.True(t, apierrors.IsNotFound(err))
+
+ if scope == apiextensionsv1beta1.ClusterScoped {
+ _, err = otherScopeClient.List(metav1.ListOptions{})
+ assert.True(t, apierrors.IsNotFound(err))
+
+ _, err = otherScopeClient.Watch(metav1.ListOptions{})
+ assert.True(t, apierrors.IsNotFound(err))
+ } else {
+ _, err = otherScopeClient.List(metav1.ListOptions{})
+ assert.NoError(t, err)
+
+ w, err := otherScopeClient.Watch(metav1.ListOptions{})
+ assert.NoError(t, err)
+ if w != nil {
+ w.Stop()
+ }
+ }
+ })
+ }
+}
--
2.17.2