Skip to content

Commit a270e6c

Browse files
committed
feat: use built in JSON module for JSON parsing
1 parent 4b862c4 commit a270e6c

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

config/config.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ config :logger, :console,
4343
:proxy
4444
]
4545

46-
# Use Jason for JSON parsing in Phoenix
47-
config :phoenix, :json_library, Jason
46+
# Use built-in JSON module for JSON parsing
47+
config :phoenix, :json_library, JSON
4848

4949
config :open_api_spex, :cache_adapter, OpenApiSpex.Plug.PersistentTermCache
5050

config/runtime.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ if config_env() != :test do
148148
availability_zone: System.get_env("AVAILABILITY_ZONE"),
149149
region: System.get_env("REGION") || System.get_env("FLY_REGION"),
150150
fly_alloc_id: System.get_env("FLY_ALLOC_ID"),
151-
jwt_claim_validators: System.get_env("JWT_CLAIM_VALIDATORS", "{}") |> Jason.decode!(),
151+
jwt_claim_validators: System.get_env("JWT_CLAIM_VALIDATORS", "{}") |> JSON.decode!(),
152152
api_jwt_secret: System.get_env("API_JWT_SECRET"),
153153
metrics_jwt_secret: System.get_env("METRICS_JWT_SECRET"),
154154
proxy_port_transaction:

lib/supavisor/tenants/tenant.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ defmodule Supavisor.Tenants.Tenant do
1010
@primary_key {:id, :binary_id, autogenerate: true}
1111
@schema_prefix "_supavisor"
1212

13-
@derive {Jason.Encoder, except: [:upstream_tls_ca, :__meta__]}
13+
@derive {JSON.Encoder, except: [:upstream_tls_ca, :__meta__]}
1414

1515
schema "tenants" do
1616
field(:db_host, :string)

mix.exs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ defmodule Supavisor.MixProject do
5454
{:phoenix_live_dashboard, "~> 0.7"},
5555
{:telemetry_poller, "~> 1.0"},
5656
{:peep, "~> 3.4"},
57-
{:jason, "~> 1.2"},
5857
{:plug_cowboy, "~> 2.5"},
5958
{:joken, "~> 2.6.0"},
6059
{:cloak_ecto, "~> 1.3.0"},

test/supavisor/monitoring/prom_ex_test.exs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ defmodule Supavisor.Monitoring.PromExTest do
4545
File.write!(file, metrics)
4646

4747
assert {out, 0} = System.cmd(exe, [file])
48-
assert {:ok, measurements} = Jason.decode(out)
48+
assert {:ok, measurements} = JSON.decode(out)
4949

5050
assert %{"metrics" => metrics} =
5151
Enum.find(measurements, &(&1["name"] == "supavisor_client_joins_ok"))
@@ -73,7 +73,7 @@ defmodule Supavisor.Monitoring.PromExTest do
7373
File.write!(file, metrics)
7474

7575
assert {out, 0} = System.cmd(exe, [file])
76-
assert {:ok, measurements} = Jason.decode(out)
76+
assert {:ok, measurements} = JSON.decode(out)
7777

7878
assert %{"metrics" => metrics} =
7979
Enum.find(measurements, &(&1["name"] == "supavisor_client_joins_ok"))
@@ -101,7 +101,7 @@ defmodule Supavisor.Monitoring.PromExTest do
101101
File.write!(file, metrics)
102102

103103
assert {out, 0} = System.cmd(exe, [file])
104-
assert {:ok, measurements} = Jason.decode(out)
104+
assert {:ok, measurements} = JSON.decode(out)
105105

106106
assert %{"metrics" => metrics} =
107107
Enum.find(measurements, &(&1["name"] == "supavisor_client_joins_ok"))

0 commit comments

Comments
 (0)