Skip to content

Commit 9d98dbf

Browse files
authored
Merge pull request #9036 from joshcooper/delete_pson
(PUP-11783) Delete vendored pson
2 parents 6d7b9f7 + 3642750 commit 9d98dbf

File tree

13 files changed

+23
-1263
lines changed

13 files changed

+23
-1263
lines changed

.rubocop_todo.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ Layout/EmptyLinesAroundAccessModifier:
155155
Layout/EmptyLinesAroundArguments:
156156
Exclude:
157157
- 'lib/puppet/defaults.rb'
158-
- 'lib/puppet/external/pson/common.rb'
159158
- 'lib/puppet/parser/functions/sprintf.rb'
160159
- 'lib/puppet/settings.rb'
161160
- 'lib/puppet/type.rb'
@@ -601,15 +600,9 @@ Lint/ElseLayout:
601600
Exclude:
602601
- 'lib/puppet/resource.rb'
603602

604-
# Configuration parameters: AllowComments.
605-
Lint/EmptyConditionalBody:
606-
Exclude:
607-
- 'lib/puppet/external/pson/pure/parser.rb'
608-
609603
# Configuration parameters: AllowComments.
610604
Lint/EmptyWhen:
611605
Exclude:
612-
- 'lib/puppet/external/pson/pure/parser.rb'
613606
- 'lib/puppet/indirector/hiera.rb'
614607
- 'lib/puppet/pops/evaluator/evaluator_impl.rb'
615608
- 'lib/puppet/pops/lookup/data_dig_function_provider.rb'
@@ -853,7 +846,6 @@ Naming/ClassAndModuleCamelCase:
853846

854847
Naming/ConstantName:
855848
Exclude:
856-
- 'lib/puppet/external/pson/common.rb'
857849
- 'lib/puppet/graph/relationship_graph.rb'
858850
- 'lib/puppet/indirector/hiera.rb'
859851
- 'lib/puppet/provider/package/sun.rb'
@@ -909,7 +901,6 @@ Naming/VariableName:
909901
- 'ext/windows/service/daemon.rb'
910902
- 'lib/puppet/agent.rb'
911903
- 'lib/puppet/application/describe.rb'
912-
- 'lib/puppet/external/pson/common.rb'
913904
- 'lib/puppet/pops/lookup/hiera_config.rb'
914905
- 'lib/puppet/pops/validation/checker4_0.rb'
915906
- 'lib/puppet/provider/package/pip.rb'
@@ -1019,11 +1010,6 @@ Style/CaseEquality:
10191010
Style/CaseLikeIf:
10201011
Enabled: false
10211012

1022-
# This cop supports safe auto-correction (--auto-correct).
1023-
Style/CharacterLiteral:
1024-
Exclude:
1025-
- 'lib/puppet/external/pson/pure/parser.rb'
1026-
10271013
# This cop supports safe auto-correction (--auto-correct).
10281014
# Configuration parameters: EnforcedStyle.
10291015
# SupportedStyles: nested, compact
@@ -1121,8 +1107,6 @@ Style/DoubleNegation:
11211107
Exclude:
11221108
- 'lib/puppet/application/lookup.rb'
11231109
- 'lib/puppet/confine/boolean.rb'
1124-
- 'lib/puppet/external/pson/pure/generator.rb'
1125-
- 'lib/puppet/external/pson/pure/parser.rb'
11261110
- 'lib/puppet/http/service/compiler.rb'
11271111
- 'lib/puppet/parser/functions/fqdn_rand.rb'
11281112
- 'lib/puppet/pops/evaluator/evaluator_impl.rb'
@@ -1146,8 +1130,6 @@ Style/EmptyBlockParameter:
11461130
# This cop supports safe auto-correction (--auto-correct).
11471131
Style/EmptyCaseCondition:
11481132
Exclude:
1149-
- 'lib/puppet/external/pson/common.rb'
1150-
- 'lib/puppet/external/pson/pure/parser.rb'
11511133
- 'lib/puppet/pops/lookup/hiera_config.rb'
11521134
- 'lib/puppet/pops/serialization/serializer.rb'
11531135
- 'lib/puppet/pops/types/type_calculator.rb'
@@ -1220,8 +1202,6 @@ Style/ExplicitBlockArgument:
12201202
# SupportedStyles: each, for
12211203
Style/For:
12221204
Exclude:
1223-
- 'lib/puppet/external/pson/common.rb'
1224-
- 'lib/puppet/external/pson/pure/generator.rb'
12251205
- 'lib/puppet/file_system/uniquefile.rb'
12261206
- 'lib/puppet/module_tool/contents_description.rb'
12271207
- 'lib/puppet/util/rdoc/generators/puppet_generator.rb'
@@ -1294,8 +1274,6 @@ Style/HashTransformValues:
12941274
# This cop supports safe auto-correction (--auto-correct).
12951275
Style/IdenticalConditionalBranches:
12961276
Exclude:
1297-
- 'lib/puppet/external/pson/common.rb'
1298-
- 'lib/puppet/external/pson/pure/generator.rb'
12991277
- 'lib/puppet/functions/filter.rb'
13001278
- 'lib/puppet/network/http_pool.rb'
13011279
- 'lib/puppet/node.rb'
@@ -1848,7 +1826,6 @@ Style/SignalException:
18481826
# Configuration parameters: AllowIfMethodIsEmpty.
18491827
Style/SingleLineMethods:
18501828
Exclude:
1851-
- 'lib/puppet/external/pson/pure/generator.rb'
18521829
- 'lib/puppet/ffi/windows/api_types.rb'
18531830
- 'lib/puppet/file_system/memory_file.rb'
18541831
- 'lib/puppet/graph/simple_graph.rb'
@@ -2007,7 +1984,6 @@ Style/TrivialAccessors:
20071984
Style/UnlessElse:
20081985
Exclude:
20091986
- 'lib/puppet/application/lookup.rb'
2010-
- 'lib/puppet/external/pson/pure/parser.rb'
20111987
- 'lib/puppet/pops/evaluator/evaluator_impl.rb'
20121988
- 'lib/puppet/pops/types/type_mismatch_describer.rb'
20131989
- 'lib/puppet/provider/package/aix.rb'
@@ -2026,7 +2002,6 @@ Style/UnpackFirst:
20262002
# This cop supports safe auto-correction (--auto-correct).
20272003
Style/VariableInterpolation:
20282004
Exclude:
2029-
- 'lib/puppet/external/pson/pure/parser.rb'
20302005
- 'lib/puppet/util/command_line/trollop.rb'
20312006
- 'lib/puppet/util/rdoc/generators/puppet_generator.rb'
20322007

api/docs/http_api_index.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ available and how to interact with it.
6666
These services are all directly used by the Puppet agent application, in order
6767
to manage the configuration of a node.
6868

69-
These endpoints accept payload formats formatted as JSON or PSON (MIME types of
70-
`application/json` and `text/pson`, respectively) except for `File Content` and
71-
`File Bucket File` which always use `application/octet-stream`.
69+
These endpoints accept payload formats formatted as JSON (MIME type
70+
`application/json`) except for `File Content` and `File Bucket File` which
71+
always use `application/octet-stream`.
7272

7373
* [Facts](./http_facts.md)
7474
* [Catalog](./http_catalog.md)
@@ -133,10 +133,10 @@ The certificate authority (CA) API contains all of the endpoints supporting Pupp
133133
Serialization Formats
134134
---------------------
135135

136-
Puppet sends messages using several different serialization formats. Not all
136+
Puppet sends messages using `JSON` or as binary data. Not all
137137
REST services support all of the formats.
138138

139139
* [JSON](https://tools.ietf.org/html/rfc7159)
140-
* [PSON](./pson.md)
140+
* [PSON](./pson.md) was supported in earlier versions of Puppet, but is no longer for performance reasons.
141141

142142
`YAML` was supported in earlier versions of Puppet, but is no longer for security reasons.

api/docs/http_catalog.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ POST, GET
1717

1818
### Supported Response Formats
1919

20-
`application/json`, `text/pson`
20+
`application/json`
2121

2222
### Notes
2323

@@ -34,8 +34,8 @@ The examples below use the POST method.
3434
Four parameters should be provided to the POST or GET:
3535

3636
- `environment`: the environment name.
37-
- `facts_format`: must be `application/json` or `pson`.
38-
- `facts`: serialized JSON or PSON of the facts hash. Since facts can contain `&`, which
37+
- `facts_format`: must be `application/json`.
38+
- `facts`: serialized JSON of the facts hash. Since facts can contain `&`, which
3939
is also the HTTP query parameter delimiter, facts are doubly-escaped.
4040
- `transaction_uuid`: a transaction uuid identifying the entire transaction (shows up in the report as well).
4141

api/docs/http_facts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ PUT
1616

1717
### Supported Format(s)
1818

19-
`application/json`, `text/pson`
19+
`application/json`
2020

2121
### Parameters
2222

api/docs/http_file_metadata.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The endpoint path includes a `:mount` which can be one of the following types:
1919
* `pluginfacts` --- a highly magical mount point which merges the `facts.d` directory of every module together. Used for syncing external facts; not intended for general consumption. Per-module sub-paths can not be specified.
2020
* `tasks/<MODULE>` --- a semi-magical mount point which allows access to files in the `tasks` subdirectory of `<MODULE>` --- see the [the docs on file serving](https://puppet.com/docs/puppet/latest/file_serving.html).
2121

22-
Note: PSON responses in the examples below are pretty-printed for readability.
22+
Note: JSON responses in the examples below are pretty-printed for readability.
2323

2424
Find
2525
----
@@ -34,7 +34,7 @@ GET
3434

3535
### Supported Response Formats
3636

37-
`application/json`, `text/pson`
37+
`application/json`
3838

3939
### Parameters
4040

@@ -54,7 +54,7 @@ Optional parameters to GET:
5454
GET /puppet/v3/file_metadata/modules/example/just_a_file.txt?environment=env
5555

5656
HTTP/1.1 200 OK
57-
Content-Type: text/pson
57+
Content-Type: application/json
5858

5959
{
6060
"checksum": {
@@ -76,7 +76,7 @@ Optional parameters to GET:
7676
GET /puppet/v3/file_metadata/modules/example/subdirectory?environment=env
7777

7878
HTTP/1.1 200 OK
79-
Content-Type: text/pson
79+
Content-Type: application/json
8080

8181
{
8282
"checksum": {
@@ -98,7 +98,7 @@ Optional parameters to GET:
9898
GET /puppet/v3/file_metadata/modules/example/link_to_file.txt?environment=env&source_permissions=ignore
9999

100100
HTTP/1.1 200 OK
101-
Content-Type: text/pson
101+
Content-Type: application/json
102102

103103
{
104104
"checksum": {
@@ -136,7 +136,7 @@ GET
136136

137137
### Supported Response Formats
138138

139-
`application/json`, `text/pson`
139+
`application/json`
140140

141141
### Parameters
142142

@@ -156,7 +156,7 @@ GET
156156
GET /puppet/v3/file_metadatas/modules/example?environment=env&recurse=yes
157157

158158
HTTP 200 OK
159-
Content-Type: text/pson
159+
Content-Type: application/json
160160

161161
[
162162
{
@@ -236,7 +236,7 @@ GET
236236
GET /puppet/v3/file_metadatas/modules/example?environment=env&recurse=true&ignore=sub*&links=manage
237237

238238
HTTP 200 OK
239-
Content-Type: text/pson
239+
Content-Type: application/json
240240

241241
[
242242
{
@@ -285,7 +285,7 @@ GET
285285

286286
#### Search ignoring "sub*" and links = follow
287287

288-
This example is identical to the above example, except for the links parameter. The resulting PSON, then,
288+
This example is identical to the above example, except for the links parameter. The resulting JSON, then,
289289
is identical to the above example, except for:
290290

291291
* the "links" field is set to "follow" rather than "manage" in all metadata objects
@@ -298,7 +298,7 @@ is identical to the above example, except for:
298298
GET /puppet/v3/file_metadatas/modules/example?environment=env&recurse=true&ignore=sub*&links=follow
299299
300300
HTTP 200 OK
301-
Content-Type: text/pson
301+
Content-Type: application/json
302302
303303
[
304304
{

api/docs/http_node.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ GET
2222

2323
### Supported Response Formats
2424

25-
`application/json`, `text/pson`
25+
`application/json`
2626

2727
### Parameters
2828

@@ -38,7 +38,7 @@ environment, which might differ from what the client believes is its current env
3838
### Examples
3939

4040
> GET /puppet/v3/node/mycertname?environment=production&transaction_uuid=aff261a2-1a34-4647-8c20-ff662ec11c4c&configured_environment=production HTTP/1.1
41-
> Accept: application/json, text/pson
41+
> Accept: application/json
4242

4343
< HTTP/1.1 200 OK
4444
< Content-Type: application/json

api/docs/http_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PUT
2121

2222
### Supported Format(s)
2323

24-
`application/json`, `text/pson`
24+
`application/json`
2525

2626
### Parameters
2727

0 commit comments

Comments
 (0)