Fixups

Author: alvaroaleman

pkg/client/client.go

@@ -545,7 +545,7 @@ func (po *SubResourcePatchOptions) ApplyToSubResourcePatch(o *SubResourcePatchOp
 }
 
 // SubResourceApplyOptions are the options for a subresource
-// apply rquest.
+// apply request.
 type SubResourceApplyOptions struct {
 	ApplyOptions
 	SubResourceBody runtime.ApplyConfiguration

pkg/client/fake/client.go

@@ -1357,8 +1357,12 @@ func (sw *fakeSubResourceClient) Apply(ctx context.Context, obj runtime.ApplyCon
 	patchOpts.Raw = applyOpts.AsPatchOptions()
 
 	if applyOpts.SubResourceBody != nil {
+		subResourceBodySerialized, err := json.Marshal(applyOpts.SubResourceBody)
+		if err != nil {
+			return fmt.Errorf("failed to serialize subresource body: %w", err)
+		}
 		subResourceBody := &unstructured.Unstructured{}
-		if err := json.Unmarshal(data, subResourceBody); err != nil {
+		if err := json.Unmarshal(subResourceBodySerialized, subResourceBody); err != nil {
 			return fmt.Errorf("failed to unmarshal subresource body: %w", err)
 		}
 		patchOpts.SubResourceBody = subResourceBody

pkg/client/fieldvalidation_test.go

@@ -119,11 +119,13 @@ func TestWithStrictFieldValidation(t *testing.T) {
 	_ = wrappedClient.Status().Create(ctx, dummyObj, dummyObj)
 	_ = wrappedClient.Status().Update(ctx, dummyObj)
 	_ = wrappedClient.Status().Patch(ctx, dummyObj, nil)
+	_ = wrappedClient.Status().Apply(ctx, corev1applyconfigurations.Namespace(""), nil)
 	_ = wrappedClient.SubResource("some-subresource").Create(ctx, dummyObj, dummyObj)
 	_ = wrappedClient.SubResource("some-subresource").Update(ctx, dummyObj)
 	_ = wrappedClient.SubResource("some-subresource").Patch(ctx, dummyObj, nil)
+	_ = wrappedClient.SubResource("some-subresource").Apply(ctx, corev1applyconfigurations.Namespace(""), nil)
 
-	if expectedCalls := 10; calls != expectedCalls {
+	if expectedCalls := 12; calls != expectedCalls {
 		t.Fatalf("wrong number of calls to assertions: expected=%d; got=%d", expectedCalls, calls)
 	}
 }

pkg/client/options.go

@@ -97,7 +97,7 @@ type SubResourcePatchOption interface {
 	ApplyToSubResourcePatch(*SubResourcePatchOptions)
 }
 
-// SubResourceApplyOption configures a subresoruce apply request.
+// SubResourceApplyOption configures a subresource apply request.
 type SubResourceApplyOption interface {
 	// ApplyToSubResourceApply applies the configuration on the given patch options.
 	ApplyToSubResourceApply(*SubResourceApplyOptions)

pkg/client/patch.go

@@ -28,7 +28,7 @@ import (
 var (
 	// Apply uses server-side apply to patch the given object.
 	//
-	// Deprecated: Use client.Client.Apply() instead.
+	// Deprecated: Use client.Client.Apply() and client.Client.SubResource("subrsource").Apply() instead.
 	Apply Patch = applyPatch{}
 
 	// Merge uses the raw object as a merge patch, without modifications.