+2 -2

apps/sower/lib/sower/accounts/access_token.ex

reviewed

··· 12 12 @derive {Phoenix.Param, key: :sid} 13 13 14 14 schema "access_tokens" do 15 15 - field :sid, Sower.Schema.Sid, autogenerate: true 15 15 + field :sid, SowerClient.Schemas.Sid, autogenerate: true 16 16 field :expires_at, :date 17 17 field :description, :string 18 18 field :regenerate, :boolean, virtual: true ··· 95 95 sid = 96 96 case get_field(changeset, :sid) do 97 97 nil -> 98 98 - Sower.Schema.Sid.generate() 98 98 + SowerClient.Schemas.Sid.generate() 99 99 100 100 sid -> 101 101 sid

+1 -1

apps/sower/lib/sower/accounts/user.ex

reviewed

··· 11 11 @derive {Phoenix.Param, key: :sid} 12 12 13 13 schema "users" do 14 14 - field :sid, Sower.Schema.Sid, autogenerate: true 14 14 + field :sid, SowerClient.Schemas.Sid, autogenerate: true 15 15 field :email, :string 16 16 field :name, :string 17 17 field :oidc_id, Ecto.UUID

+1 -1

apps/sower/lib/sower/accounts/user_token.ex

reviewed

··· 16 16 @derive {Phoenix.Param, key: :sid} 17 17 18 18 schema "users_tokens" do 19 19 - field :sid, Sower.Schema.Sid, autogenerate: true 19 19 + field :sid, SowerClient.Schemas.Sid, autogenerate: true 20 20 field :token, :binary 21 21 field :context, :string 22 22 field :sent_to, :string

+1 -1

apps/sower/lib/sower/forge/connection.ex

reviewed

··· 5 5 @derive {Phoenix.Param, key: :sid} 6 6 7 7 schema "forges" do 8 8 - field :sid, Sower.Schema.Sid, autogenerate: true 8 8 + field :sid, SowerClient.Schemas.Sid, autogenerate: true 9 9 field :name, :string 10 10 field :type, Ecto.Enum, values: [:forgejo] 11 11 field :url, :string

+1 -1

apps/sower/lib/sower/forge/repository.ex

reviewed

··· 5 5 @derive {Phoenix.Param, key: :sid} 6 6 7 7 schema "repositories" do 8 8 - field :sid, Sower.Schema.Sid, autogenerate: true 8 8 + field :sid, SowerClient.Schemas.Sid, autogenerate: true 9 9 field :owner, :string 10 10 field :repo, :string 11 11 field :url, :string

+1 -1

apps/sower/lib/sower/nix/cache.ex

reviewed

··· 7 7 @derive {Phoenix.Param, key: :sid} 8 8 9 9 schema "nix_caches" do 10 10 - field :sid, Sower.Schema.Sid, autogenerate: true 10 10 + field :sid, SowerClient.Schemas.Sid, autogenerate: true 11 11 field :public_key, :string 12 12 field :url, :string 13 13 field :org_id, Ecto.UUID

+1 -1

apps/sower/lib/sower/orchestration/agent.ex

reviewed

··· 6 6 @derive {Phoenix.Param, key: :sid} 7 7 8 8 schema "agents" do 9 9 - field :sid, Sower.Schema.Sid, autogenerate: true 9 9 + field :sid, SowerClient.Schemas.Sid, autogenerate: true 10 10 field :name, :string 11 11 field :local_sid, :string 12 12 field :org_id, Ecto.UUID

+1 -1

apps/sower/lib/sower/orchestration/deployment.ex

reviewed

··· 8 8 @derive {Phoenix.Param, key: :sid} 9 9 10 10 schema "deployments" do 11 11 - field :sid, Sower.Schema.Sid, autogenerate: true 11 11 + field :sid, SowerClient.Schemas.Sid, autogenerate: true 12 12 field :org_id, Ecto.UUID 13 13 14 14 many_to_many :subscriptions, Sower.Orchestration.Subscription,

+1 -1

apps/sower/lib/sower/orchestration/subscription.ex

reviewed

··· 8 8 alias Sower.Orchestration.{Agent, Deployment, SubscriptionDeployment} 9 9 10 10 schema "subscriptions" do 11 11 - field :sid, Sower.Schema.Sid, autogenerate: true 11 11 + field :sid, SowerClient.Schemas.Sid, autogenerate: true 12 12 field :org_id, Ecto.UUID 13 13 14 14 belongs_to :agent, Agent

-16

apps/sower/lib/sower/schema.ex

reviewed

··· 9 9 end 10 10 end 11 11 12 12 - defmodule Sid do 13 13 - use Ecto.Type 14 14 - 15 15 - @type t :: :string 16 16 - def type, do: :string 17 17 - def cast(value), do: {:ok, value} 18 18 - def load(value), do: {:ok, value} 19 19 - def dump(value) when is_binary(value), do: {:ok, value} 20 20 - def dump(_), do: :error 21 21 - 22 22 - def autogenerate, do: generate() 23 23 - 24 24 - def generate, do: Cuid2Ex.create() 25 25 - def generate(prefix), do: "#{prefix}_#{generate()}" 26 26 - end 27 27 - 28 12 defmodule Nix.StorePathDigest do 29 13 use Ecto.Type 30 14

+1 -1

apps/sower/lib/sower/seed.ex

reviewed

··· 13 13 @seed_types SowerClient.Schemas.Seed.seed_types() 14 14 15 15 schema "seeds" do 16 16 - field :sid, Sower.Schema.Sid, autogenerate: true 16 16 + field :sid, SowerClient.Schemas.Sid, autogenerate: true 17 17 field :name, :string 18 18 field :seed_type, :string 19 19 field :org_id, Ecto.UUID

+1 -1

apps/sower/lib/sower_web/agent_channel.ex

reviewed

··· 169 169 end 170 170 171 171 def handle_info(:ping, socket) do 172 172 - ref = Sower.Schema.Sid.generate() 172 172 + ref = SowerClient.Schemas.Sid.generate() 173 173 Logger.debug(msg: "Sending ping", ref: ref) 174 174 push(socket, "ping", %{ref: ref}) 175 175 {:noreply, socket}

+1 -1

apps/sower/lib/sower_web/agent_socket.ex

reviewed

··· 13 13 socket = 14 14 socket 15 15 |> assign(:access_token, access_token) 16 16 - |> assign(:conn_sid, Sower.Schema.Sid.generate("conn")) 16 16 + |> assign(:conn_sid, SowerClient.Schemas.Sid.generate("conn")) 17 17 18 18 {:ok, socket} 19 19 else

+1 -1

apps/sower/test/sower/accounts/user_test.exs

reviewed

··· 13 13 describe "get_by_id!/1" do 14 14 test "raises if id is invalid" do 15 15 assert_raise Ecto.NoResultsError, fn -> 16 16 - User.get_by_sid!(Sower.Schema.Sid.generate()) 16 16 + User.get_by_sid!(SowerClient.Schemas.Sid.generate()) 17 17 end 18 18 end 19 19

+15

apps/sower_client/lib/schemas/sid.ex

reviewed

··· 1 1 + defmodule SowerClient.Schemas.Sid do 2 2 + use Ecto.Type 3 3 + 4 4 + @type t :: :string 5 5 + def type, do: :string 6 6 + def cast(value), do: {:ok, value} 7 7 + def load(value), do: {:ok, value} 8 8 + def dump(value) when is_binary(value), do: {:ok, value} 9 9 + def dump(_), do: :error 10 10 + 11 11 + def autogenerate, do: generate() 12 12 + 13 13 + def generate, do: Cuid2Ex.create() 14 14 + def generate(prefix), do: "#{prefix}_#{generate()}" 15 15 + end

+1

apps/sower_client/mix.exs

reviewed

··· 25 25 # Run "mix help deps" to learn about dependencies. 26 26 defp deps do 27 27 [ 28 28 + {:ecto, "~> 3.0"}, 28 29 {:cuid2_ex, "~> 0.2"}, 29 30 {:igniter, "~> 0.6", only: [:dev, :test]}, 30 31 {:jason, "~> 1.0"},