Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pakman to support sizes config #14

Merged
merged 1 commit into from
Jul 15, 2024
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
18 changes: 17 additions & 1 deletion lib/pakman/instellar.ex
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ defmodule Pakman.Instellar do
end
end

def create_configuration(token, deployment_id, %{"kits" => kits})
def create_configuration(
token,
deployment_id,
%{"kits" => kits} = configuration
)
when is_list(kits) do
package_token = System.get_env("INSTELLAR_PACKAGE_TOKEN")

Expand All @@ -100,12 +104,24 @@ defmodule Pakman.Instellar do
{"x-instellar-package-token", package_token}
]

sizes = Map.get(configuration, "sizes")

configuration_params = %{
payload: %{
kits: kits
}
}

configuration_params =
if sizes do
payload = configuration_params.payload
payload = Map.put(payload, :sizes, sizes)

Map.put(configuration_params, :payload, payload)
else
configuration_params
end

client()
|> post(
"/publish/deployments/#{deployment_id}/configurations",
Expand Down
6 changes: 6 additions & 0 deletions test/fixtures/rails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ hook:
rc-service locomo stop
rc-update locomo rdio

sizes:
- name: medium
allocation:
cpu: 1
memory: 1

kits:
- name: web
description: "web service"
Expand Down
44 changes: 42 additions & 2 deletions test/pakman/instellar_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,44 @@ defmodule Pakman.InstellarTest do
System.put_env("INSTELLAR_PACKAGE_TOKEN", "somepackage")
System.put_env("INSTELLAR_ENDPOINT", "http://localhost:#{bypass.port}")

with_kits = YamlElixir.read_from_file!("test/fixtures/rails.yml")
with_kits_and_sizes = YamlElixir.read_from_file!("test/fixtures/rails.yml")
with_kits = YamlElixir.read_from_file!("test/fixtures/laravel.yml")

{:ok, bypass: bypass, config_with_kits: with_kits}
{:ok,
bypass: bypass,
config_with_kits: with_kits,
config_with_kits_and_sizes: with_kits_and_sizes}
end

describe "create_configuration" do
test "calls instellar to create configuration", %{
bypass: bypass,
config_with_kits_and_sizes: config
} do
Bypass.expect_once(
bypass,
"POST",
"/publish/deployments/1/configurations",
fn conn ->
{:ok, body, _} = Plug.Conn.read_body(conn)

assert %{"configuration" => %{"payload" => payload}} =
Jason.decode!(body)

assert %{"kits" => kits, "sizes" => sizes} = payload

assert Enum.count(sizes) == 1

conn
|> Plug.Conn.put_resp_header("content-type", "application/json")
|> Plug.Conn.resp(201, Jason.encode!(%{data: %{id: 1}}))
end
)

{:ok, :created, _} = Instellar.create_configuration("token", 1, config)
end

test "configuration without size", %{
bypass: bypass,
config_with_kits: config
} do
Expand All @@ -24,6 +55,15 @@ defmodule Pakman.InstellarTest do
"POST",
"/publish/deployments/1/configurations",
fn conn ->
{:ok, body, _} = Plug.Conn.read_body(conn)

assert %{"configuration" => %{"payload" => payload}} =
Jason.decode!(body)

assert %{"kits" => kits} = payload

assert is_nil(payload["sizes"])

conn
|> Plug.Conn.put_resp_header("content-type", "application/json")
|> Plug.Conn.resp(201, Jason.encode!(%{data: %{id: 1}}))
Expand Down