change (#734)

Signed-off-by: Pavel Okhlopkov <[email protected]>
Co-authored-by: Pavel Okhlopkov <[email protected]>

Author: ldmonster

pkg/kube/object_patch/operation.go

@@ -186,22 +186,22 @@ func NewFromOperationSpec(spec OperationSpec) sdkpkg.PatchCollectorOperation {
 			spec.JQFilter,
 			spec.ApiVersion, spec.Kind, spec.Namespace, spec.Name,
 			WithSubresource(spec.Subresource),
-			WithIgnoreMissingObject(spec.IgnoreMissingObject),
-			WithIgnoreHookError(spec.IgnoreHookError),
+			withIgnoreMissingObject(spec.IgnoreMissingObject),
+			withIgnoreHookError(spec.IgnoreHookError),
 		)
 	case MergePatch:
 		return NewMergePatchOperation(spec.MergePatch,
 			spec.ApiVersion, spec.Kind, spec.Namespace, spec.Name,
 			WithSubresource(spec.Subresource),
-			WithIgnoreMissingObject(spec.IgnoreMissingObject),
-			WithIgnoreHookError(spec.IgnoreHookError),
+			withIgnoreMissingObject(spec.IgnoreMissingObject),
+			withIgnoreHookError(spec.IgnoreHookError),
 		)
 	case JSONPatch:
 		return NewJSONPatchOperation(spec.JSONPatch,
 			spec.ApiVersion, spec.Kind, spec.Namespace, spec.Name,
 			WithSubresource(spec.Subresource),
-			WithIgnoreMissingObject(spec.IgnoreMissingObject),
-			WithIgnoreHookError(spec.IgnoreHookError),
+			withIgnoreMissingObject(spec.IgnoreMissingObject),
+			withIgnoreHookError(spec.IgnoreHookError),
 		)
 	}
 

pkg/kube/object_patch/options.go

@@ -16,14 +16,22 @@ func WithSubresource(subresource string) Option {
 	}
 }
 
-func WithIgnoreMissingObject(ignore bool) Option {
+func withIgnoreMissingObject(ignore bool) Option {
 	return func(o sdkpkg.PatchCollectorOptionApplier) {
 		o.WithIgnoreMissingObject(ignore)
 	}
 }
 
-func WithIgnoreHookError(ignore bool) Option {
+func WithIgnoreMissingObject() Option {
+	return withIgnoreMissingObject(true)
+}
+
+func withIgnoreHookError(ignore bool) Option {
 	return func(o sdkpkg.PatchCollectorOptionApplier) {
 		o.WithIgnoreHookError(ignore)
 	}
 }
+
+func WithIgnoreHookError() Option {
+	return withIgnoreHookError(true)
+}

pkg/kube/object_patch/patch_test.go

@@ -145,7 +145,7 @@ data:
 				return patcher.ExecuteOperation(NewMergePatchOperation(
 					fmt.Sprintf(`{"data":{"%s":"%s"}}`, newField, newValue),
 					"v1", "ConfigMap", namespace, missingName,
-					WithIgnoreMissingObject(true),
+					WithIgnoreMissingObject(),
 				))
 			},
 			shouldNotAdd,
@@ -295,7 +295,7 @@ mergePatch: |
 				return patcher.ExecuteOperation(NewJSONPatchOperation(
 					fmt.Sprintf(`[{ "op": "add", "path": "/data/%s", "value": "%s"}]`, newField, newValue),
 					"v1", "ConfigMap", namespace, missingName,
-					WithIgnoreMissingObject(true),
+					WithIgnoreMissingObject(),
 				))
 			},
 			shouldNotAdd,
@@ -412,7 +412,7 @@ jsonPatch: |
 				return patcher.ExecuteOperation(NewPatchWithMutatingFuncOperation(
 					filter,
 					"v1", "ConfigMap", namespace, missingName,
-					WithIgnoreMissingObject(true),
+					WithIgnoreMissingObject(),
 				))
 			},
 			shouldNotAdd,