Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Kinds/K8sResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@ public function toJsonPatchPayload(JsonPatch|array $patch): string
}
}

return json_encode($operations, JSON_THROW_ON_ERROR);
// The API server compares a test operation's strings by their encoded bytes,
// so `\/` never matches a stored `/` and the patch is refused.
return json_encode($operations, JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
}

/**
Expand All @@ -195,7 +197,7 @@ public function toJsonMergePatchPayload(JsonMergePatch|array $patch): string

return json_encode(
$document === [] ? (object) [] : $this->coerceEmptyArraysToObjects($document),
JSON_THROW_ON_ERROR
JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE
);
}

Expand Down
29 changes: 26 additions & 3 deletions tests/PatchPayloadTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,36 @@ public function test_json_patch_scalar_and_valueless_operations_are_untouched()
]);

$this->assertSame(
'[{"op":"replace","path":"\/spec\/replicas","value":3},'
.'{"op":"remove","path":"\/metadata\/labels\/deprecated"},'
.'{"op":"add","path":"\/metadata\/labels\/app","value":null}]',
'[{"op":"replace","path":"/spec/replicas","value":3},'
.'{"op":"remove","path":"/metadata/labels/deprecated"},'
.'{"op":"add","path":"/metadata/labels/app","value":null}]',
$payload
);
}

public function test_json_patch_test_values_keep_slashes_and_unicode_verbatim()
{
$payload = $this->cluster->statefulSet()->toJsonPatchPayload([
['op' => 'test', 'path' => '/spec/template/spec/initContainers', 'value' => [
['name' => 'init', 'command' => ['sh', '-c', "chmod 1777 '/var/run/mysqld'"], 'env' => [['name' => 'NOTE', 'value' => 'café']]],
]],
]);

$this->assertStringContainsString("'/var/run/mysqld'", $payload);
$this->assertStringContainsString('"path":"/spec/template/spec/initContainers"', $payload);
$this->assertStringContainsString('café', $payload);
$this->assertStringNotContainsString('\\/', $payload);
}

public function test_json_merge_patch_keeps_slashes_verbatim()
{
$payload = $this->cluster->statefulSet()->toJsonMergePatchPayload([
'metadata' => ['annotations' => ['appwrite.io/owner' => 'a/b']],
]);

$this->assertStringContainsString('"appwrite.io/owner":"a/b"', $payload);
}

public function test_empty_json_patch_encodes_as_list()
{
$this->assertSame('[]', $this->cluster->configmap()->toJsonPatchPayload([]));
Expand Down
Loading