feedback improvements

Author: filipcirtog

pkg/client/client.go

@@ -151,8 +151,7 @@ func newClient(config *rest.Config, options Options) (*client, error) {
 		mapper:     options.Mapper,
 		codecs:     serializer.NewCodecFactory(options.Scheme),
 
-		structuredResourceByType:   make(map[cacheKey]*resourceMeta),
-		unstructuredResourceByType: make(map[cacheKey]*resourceMeta),
+		resourceByType: make(map[cacheKey]*resourceMeta),
 	}
 
 	rawMetaClient, err := metadata.NewForConfigAndClient(metadata.ConfigFor(config), options.HTTPClient)

pkg/client/client_rest_resources.go

@@ -48,11 +48,8 @@ type clientRestResources struct {
 	// codecs are used to create a REST client for a gvk
 	codecs serializer.CodecFactory
 
-	// structuredResourceByType stores structured type metadata
-	structuredResourceByType map[cacheKey]*resourceMeta
-
-	// unstructuredResourceByType stores unstructured type metadata
-	unstructuredResourceByType map[cacheKey]*resourceMeta
+	// resourceByType stores type metadata
+	resourceByType map[cacheKey]*resourceMeta
 
 	mu sync.RWMutex
 }
@@ -127,12 +124,7 @@ func (c *clientRestResources) getResource(obj any) (*resourceMeta, error) {
 
 	cacheKey := cacheKey{gvk: gvk, forceDisableProtoBuf: forceDisableProtoBuf}
 
-	resourceByType := c.structuredResourceByType
-	if isUnstructured {
-		resourceByType = c.unstructuredResourceByType
-	}
-
-	r, known := resourceByType[cacheKey]
+	r, known := c.resourceByType[cacheKey]
 
 	c.mu.RUnlock()
 
@@ -152,7 +144,7 @@ func (c *clientRestResources) getResource(obj any) (*resourceMeta, error) {
 	if err != nil {
 		return nil, err
 	}
-	resourceByType[cacheKey] = r
+	c.resourceByType[cacheKey] = r
 	return r, err
 }
 

pkg/client/client_test.go

@@ -960,10 +960,6 @@ U5wwSivyi7vmegHKmblOzNVKA5qPO8zWzqBC
 					"some-key": []byte("some-value"),
 				}
 				secretObject := &corev1.Secret{
-					TypeMeta: metav1.TypeMeta{
-						Kind:       "Secret",
-						APIVersion: "v1",
-					},
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "secret-one",
 						Namespace: "default",
@@ -973,8 +969,6 @@ U5wwSivyi7vmegHKmblOzNVKA5qPO8zWzqBC
 
 				secretApplyConfiguration := corev1applyconfigurations.
 					Secret("secret-two", "default").
-					WithAPIVersion("v1").
-					WithKind("Secret").
 					WithData(data)
 
 				err = cl.Create(ctx, secretObject)
@@ -983,11 +977,11 @@ U5wwSivyi7vmegHKmblOzNVKA5qPO8zWzqBC
 				err = cl.Apply(ctx, secretApplyConfiguration, &client.ApplyOptions{FieldManager: "test-manager"})
 				Expect(err).NotTo(HaveOccurred())
 
-				cm, err := clientset.CoreV1().Secrets(ptr.Deref(secretApplyConfiguration.GetNamespace(), "")).Get(ctx, ptr.Deref(secretApplyConfiguration.GetName(), ""), metav1.GetOptions{})
+				secret, err := clientset.CoreV1().Secrets(ptr.Deref(secretApplyConfiguration.GetNamespace(), "")).Get(ctx, ptr.Deref(secretApplyConfiguration.GetName(), ""), metav1.GetOptions{})
 				Expect(err).NotTo(HaveOccurred())
 
-				Expect(cm.Data).To(BeComparableTo(data))
-				Expect(cm.Data).To(BeComparableTo(secretApplyConfiguration.Data))
+				Expect(secret.Data).To(BeComparableTo(data))
+				Expect(secret.Data).To(BeComparableTo(secretApplyConfiguration.Data))
 
 				data = map[string][]byte{
 					"some-key": []byte("some-new-value"),
@@ -997,11 +991,11 @@ U5wwSivyi7vmegHKmblOzNVKA5qPO8zWzqBC
 				err = cl.Apply(ctx, secretApplyConfiguration, &client.ApplyOptions{FieldManager: "test-manager"})
 				Expect(err).NotTo(HaveOccurred())
 
-				cm, err = clientset.CoreV1().Secrets(ptr.Deref(secretApplyConfiguration.GetNamespace(), "")).Get(ctx, ptr.Deref(secretApplyConfiguration.GetName(), ""), metav1.GetOptions{})
+				secret, err = clientset.CoreV1().Secrets(ptr.Deref(secretApplyConfiguration.GetNamespace(), "")).Get(ctx, ptr.Deref(secretApplyConfiguration.GetName(), ""), metav1.GetOptions{})
 				Expect(err).NotTo(HaveOccurred())
 
-				Expect(cm.Data).To(BeComparableTo(data))
-				Expect(cm.Data).To(BeComparableTo(secretApplyConfiguration.Data))
+				Expect(secret.Data).To(BeComparableTo(data))
+				Expect(secret.Data).To(BeComparableTo(secretApplyConfiguration.Data))
 			})
 		})
 	})