Add buckets/domains to stack install apis and pluralContext gql query (#171)

Author: michaeljguarino

lib/console/deployer.ex

@@ -184,10 +184,10 @@ defmodule Console.Deployer do
     ], storage)
   end
 
-  defp perform(storage, %Build{type: :install, context: %{"configuration" => conf, "bundles" => bs}, message: message} = build) do
+  defp perform(storage, %Build{type: :install, context: %{"configuration" => conf, "bundles" => bs} = ctx, message: message} = build) do
     with_build(build, [
       {storage, :init, []},
-      {Context, :merge, [conf, Enum.map(bs, fn b -> %Context.Bundle{repository: b["repository"], name: b["name"]} end)]},
+      {Context, :merge, [conf, Enum.map(bs, fn b -> %Context.Bundle{repository: b["repository"], name: b["name"]} end), ctx["buckets"], ctx["domains"]]},
       {Plural, :build, []},
       {Plural, :install, [Enum.map(bs, & &1["repository"])]},
       {storage, :revise, [message]},

lib/console/graphql/plural.ex

@@ -11,6 +11,12 @@ defmodule Console.GraphQl.Plural do
     field :user,     :string
   end
 
+  input_object :context_attributes do
+    field :buckets,       list_of(:string)
+    field :domain,        list_of(:string)
+    field :configuration, non_null(:map)
+  end
+
   object :smtp do
     field :server,   :string
     field :port,     :integer
@@ -98,6 +104,12 @@ defmodule Console.GraphQl.Plural do
     field :context,    :map
   end
 
+  object :plural_context do
+    field :buckets,       list_of(:string)
+    field :domains,       list_of(:string)
+    field :configuration, non_null(:map)
+  end
+
   connection node_type: :installation
   connection node_type: :repository
   connection node_type: :recipe
@@ -138,10 +150,18 @@ defmodule Console.GraphQl.Plural do
 
     field :context, list_of(:repository_context) do
       middleware Authenticated
+      middleware Rbac, perm: :deploy, arg: :id
 
       resolve &Plural.resolve_context/2
     end
 
+    field :plural_context, :plural_context do
+      middleware Authenticated
+      middleware Rbac, perm: :deploy, arg: :id
+
+      resolve &Plural.resolve_plural_context/2
+    end
+
     field :recipe, :recipe do
       middleware Authenticated
       arg :id, non_null(:id)
@@ -186,7 +206,7 @@ defmodule Console.GraphQl.Plural do
       middleware Rbac, perm: :deploy, arg: :id
 
       arg :name,    non_null(:string)
-      arg :context, non_null(:map)
+      arg :context, non_null(:context_attributes)
       arg :oidc,    :boolean
 
       safe_resolve &Plural.install_stack/2

lib/console/graphql/resolvers/plural.ex

@@ -58,13 +58,13 @@ defmodule Console.GraphQl.Resolvers.Plural do
     end
   end
 
-  def install_recipe(%{id: id, context: context} = args, %{context: %{current_user: user}}) do
-    Plural.install_recipe(id, context, !!args[:oidc], user)
-  end
+  def resolve_plural_context(_, _), do: Console.Plural.Context.get()
 
-  def install_stack(%{name: name, context: context} = args, %{context: %{current_user: user}}) do
-    Plural.install_stack(name, context, !!args[:oidc], user)
-  end
+  def install_recipe(%{id: id, context: context} = args, %{context: %{current_user: user}}),
+    do: Plural.install_recipe(id, context, !!args[:oidc], user)
+
+  def install_stack(%{name: name, context: ctx} = args, %{context: %{current_user: user}}),
+    do: Plural.install_stack(name, ctx, !!args[:oidc], user)
 
   def update_smtp(%{smtp: smtp}, _), do: Plural.update_smtp(smtp)
 

lib/console/plural/context.ex

@@ -2,7 +2,7 @@ defmodule Console.Plural.Context do
   import Console
   alias Console.Deployer
 
-  defstruct [:configuration, :bundles, :smtp]
+  defstruct [:configuration, :bundles, :smtp, :buckets, :domains]
 
   defmodule Smtp do
     defstruct [:user, :password, :server, :port, :sender]
@@ -43,15 +43,21 @@ defmodule Console.Plural.Context do
     end
   end
 
-  def merge(ctx, new_bundles) do
+  def merge(ctx, new_bundles, buckets \\ [], domains \\ []) do
     with {:ok, %{configuration: config, bundles: bundles} = context} <- get() do
       updated = DeepMerge.deep_merge(config, ctx)
-      write(%{context | configuration: updated, bundles: merge_bundles(new_bundles, bundles)})
+      %{context | configuration: updated, bundles: merge_list(new_bundles, bundles)}
+      |> add_meta(buckets, domains)
+      |> write()
     end
   end
 
-  defp merge_bundles([_ | _] = new, bundles), do: Enum.uniq(new ++ bundles)
-  defp merge_bundles(b, bundles), do: merge_bundles([b], bundles)
+  defp add_meta(%__MODULE__{buckets: buckets, domains: domains} = ctx, new_buckets, new_domains) do
+    %{ctx | buckets: merge_list(buckets || [], new_buckets || []), domains: merge_list(domains || [], new_domains || [])}
+  end
+
+  defp merge_list(new, bundles) when is_list(new), do: Enum.uniq(new ++ bundles)
+  defp merge_list(b, bundles), do: merge_list([b], bundles)
 
   def write(%__MODULE__{bundles: bundles, configuration: conf, smtp: smtp} = context) do
     sanitized = %{

lib/console/services/plural.ex

@@ -65,16 +65,18 @@ defmodule Console.Services.Plural do
     end
   end
 
-  def install_stack(name, context, oidc, %User{} = user) do
+  def install_stack(name, %{configuration: ctx} = context, oidc, %User{} = user) do
     with {:ok, [recipe | _] = recipes} <- Repositories.install_stack(name),
-         {:ok, _} <- oidc_for_stack(recipes, context, oidc) do
+         {:ok, _} <- oidc_for_stack(recipes, ctx, oidc) do
       repos = Enum.map(recipes, & &1.repository.name)
       Builds.create(%{
         type: :install,
         repository: recipe.repository.name,
         message: "Installed stack #{name} with repositories #{Enum.join(repos, ", ")}",
         context: %{
-          configuration: context,
+          configuration: ctx,
+          domains: Map.get(context, :domains, []),
+          buckets: Map.get(context, :buckets, []),
           bundles: Enum.map(recipes, & %{name: &1.name, repository: &1.repository.name}),
         },
       }, user)

test/console/graphql/mutations/plural_mutations_test.exs

@@ -67,14 +67,14 @@ defmodule Console.GraphQl.PluralMutationsTest do
       user = insert(:user, roles: %{admin: true})
 
       {:ok, %{data: %{"installStack" => build}}} = run_query("""
-        mutation Install($name: Name!, $context: Map!) {
+        mutation Install($name: Name!, $context: ContextAttributes!) {
           installStack(name: $name, context: $context) {
             id
             type
             creator { id }
           }
         }
-      """, %{"name" => "id", "context" => Jason.encode!(%{"repo" => %{"some" => "val"}})}, %{current_user: user})
+      """, %{"name" => "id", "context" => %{"configuration" => Jason.encode!(%{"repo" => %{"some" => "val"}})}}, %{current_user: user})
 
       assert build["type"] == "INSTALL"
       assert build["creator"]["id"] == user.id

test/console/services/plural_test.exs

@@ -261,15 +261,17 @@ defmodule Console.Services.PluralTest do
       user = insert(:user)
       {:ok, build} = Plural.install_stack(
         "id",
-        %{"repo" => %{"domain" => "domain.com"}},
+        %{configuration: %{"repo" => %{"domain" => "domain.com"}}},
         true,
         user
       )
 
       assert build.type == :install
       assert build.context == %{
         configuration: %{"repo" => %{"domain" => "domain.com"}},
-        bundles: [%{repository: "repo", name: "name"}]
+        bundles: [%{repository: "repo", name: "name"}],
+        buckets: [],
+        domains: []
       }
       assert build.creator_id == user.id
     end