fix(front): remove redundant checks from add people button visibility check

front/Makefile

@@ -52,7 +52,7 @@ CONTAINER_ENV_VARS = \
 
 
 CONTAINER_CE_ENV_VARS =\
-	 -e CE_ROLES=true \
+     -e EDITION=ce \
 	 -e SEED_CLOUD_MACHINES=false \
 	 -e SEED_SELF_HOSTED_AGENTS=true \
 	 -e SEED_CE_FEATURES=true \

front/config/runtime.exs

@@ -57,8 +57,6 @@ config :front,
   cookie_name: System.get_env("COOKIE_NAME"),
   use_rbac_api: if(System.get_env("USE_RBAC_API") == "true", do: true, else: false)
 
-on_prem? = if(System.get_env("ON_PREM") == "true", do: true, else: false)
-
 # Internal API endpoints - always read from environment variables for all environments
 # Test environment will need these env vars set, or use stubs in test setup
 config :front,
@@ -131,16 +129,10 @@ config :front,
   zendesk_snippet_id: System.get_env("ZENDESK_SNIPPET_ID"),
   google_gtag: System.get_env("GOOGLE_GTAG")
 
-config :front, :on_prem?, on_prem?
+edition = System.get_env("EDITION", "") |> String.trim() |> String.downcase()
+is_saas? = !(edition in ["ce", "ee"])
 
-if on_prem? do
-  config :front,
-    feature_provider:
-      {FeatureProvider.YamlProvider,
-       [yaml_path: System.get_env("FEATURE_YAML_PATH"), agent_name: :feature_provider_agent]}
-
-  config :front, JobPage.Api.Loghub, timeout: :timer.minutes(2)
-else
+if is_saas? do
   config :front,
     feature_provider:
       {Front.FeatureHubProvider,
@@ -149,6 +141,13 @@ else
            {FeatureProvider.CachexCache,
             name: :feature_provider_cache, ttl_ms: :timer.minutes(10)}
        ]}
+else
+  config :front,
+    feature_provider:
+      {FeatureProvider.YamlProvider,
+       [yaml_path: System.get_env("FEATURE_YAML_PATH"), agent_name: :feature_provider_agent]}
+
+  config :front, JobPage.Api.Loghub, timeout: :timer.minutes(2)
 end
 
 if System.get_env("AMQP_URL") != nil do
@@ -166,8 +165,6 @@ end
 
 config :front, :audit_logging, System.get_env("AUDIT_LOGGING") == "true"
 
-config :front, :ce_roles, System.get_env("CE_ROLES") == "true"
-
 config :front,
        :hide_promotions,
        System.get_env("HIDE_PROMOTIONS") == "true"
@@ -192,6 +189,4 @@ config :front,
        :single_tenant,
        System.get_env("SINGLE_TENANT") == "true"
 
-config :front,
-       :edition,
-       System.get_env("EDITION", "") |> String.trim() |> String.downcase()
+config :front, :edition, edition

front/helm/templates/job-page.yaml

@@ -113,8 +113,6 @@ spec:
 {{- end }}
             - name: METRICS_SERVICE
               value: "front"
-            - name: ON_PREM
-              value: "true"
             - name: FEATURE_YAML_PATH
               value: {{ .Values.featureFlags.mountPath | quote }}
             - name: GETTING_STARTED_YAML_PATH
@@ -124,8 +122,6 @@ spec:
 {{- if eq .Values.global.edition "ce" }}
             - name: "SKIP_VELOCITY"
               value: "true"
-            - name: "CE_ROLES"
-              value: "true"
             - name: "HIDE_PROMOTIONS"
               value: "true"
 {{- end }}

front/helm/templates/project-page.yaml

@@ -139,8 +139,6 @@ spec:
 {{- end }}
             - name: METRICS_SERVICE
               value: "front"
-            - name: ON_PREM
-              value: "true"
             - name: START_TELEMETRY
               value: {{ .Values.global.telemetry.enabled | quote }}
             - name: TELEMETRY_CRON
@@ -154,8 +152,6 @@ spec:
 {{- if eq .Values.global.edition "ce" }}
             - name: "SKIP_VELOCITY"
               value: "true"
-            - name: "CE_ROLES"
-              value: "true"
             - name: "HIDE_PROMOTIONS"
               value: "true"
 {{- end }}

front/helm/templates/ui-cache-reactor.yaml

@@ -95,8 +95,6 @@ spec:
             - name: METRICS_NAMESPACE
               value: {{ .Values.global.statsd.metricsNamespace }}
 {{- end }}
-            - name: ON_PREM
-              value: "true"
             - name: FEATURE_YAML_PATH
               value: {{ .Values.featureFlags.mountPath | quote }}
             - name: GETTING_STARTED_YAML_PATH
@@ -106,8 +104,6 @@ spec:
 {{- if eq .Values.global.edition "ce" }}
             - name: "SKIP_VELOCITY"
               value: "true"
-            - name: "CE_ROLES"
-              value: "true"
             - name: "HIDE_PROMOTIONS"
               value: "true"
 {{- end }}

front/lib/front.ex

@@ -1,17 +1,4 @@
 defmodule Front do
-  @doc """
-  Checks if application is running on-prem environment
-  """
-  @spec on_prem?() :: boolean()
-  def on_prem? do
-    Application.get_env(:front, :on_prem?)
-  end
-
-  @spec ce_roles?() :: boolean()
-  def ce_roles? do
-    Application.get_env(:front, :ce_roles)
-  end
-
   @doc """
   Check if it's CE edition
   """
@@ -35,4 +22,12 @@ defmodule Front do
   def os? do
     ee?() || ce?()
   end
+
+  @doc """
+  Check if we're running on saas or not
+  """
+  @spec saas?() :: boolean()
+  def saas? do
+    !os?()
+  end
 end

front/lib/front/clients/billing.ex

@@ -314,26 +314,26 @@ defmodule Front.Clients.Billing do
 
   defp call_grpc(error = {:error, err}, _, _, _, _, _) do
     Logger.error("""
-    Unexpected error when connecting to Velocity: #{inspect(err)}
+    Unexpected error when connecting to Billing: #{inspect(err)}
     """)
 
     error
   end
 
   defp call_grpc({:ok, channel}, module, function_name, request, metadata, timeout) do
-    if Front.on_prem?() do
-      {:error, "Billing service is not running on on-prem instance"}
-    else
+    if Front.saas?() do
       apply(module, function_name, [channel, request, [metadata: metadata, timeout: timeout]])
+    else
+      {:error, "Billing service is running only on saas instance"}
     end
   end
 
   defp channel do
-    if Front.on_prem?() do
-      {:error, "Billing service is not running on on-prem instance"}
-    else
+    if Front.saas?() do
       Application.fetch_env!(:front, :billing_api_grpc_endpoint)
       |> GRPC.Stub.connect()
+    else
+      {:error, "Billing service is running only on saas instance"}
     end
   end
 

front/lib/front/layout/cache_invalidator.ex

@@ -314,7 +314,7 @@ defmodule Front.Layout.CacheInvalidator do
   end
 
   def invalidate_billing(org_id) do
-    if not Front.on_prem?() do
+    if Front.saas?() do
       Front.Clients.Billing.invalidate_cache(:list_spendings, %{org_id: org_id})
       Front.Clients.Billing.invalidate_cache(:current_spending, %{org_id: org_id})
       Front.Clients.Billing.invalidate_cache(:credits_usage, %{org_id: org_id})

front/lib/front/models/organization_onboarding.ex

@@ -125,9 +125,7 @@ defmodule Front.Models.OrganizationOnboarding do
 
   @spec validate_billing(model :: t()) :: :ok | {:error, String.t()}
   defp validate_billing(model) do
-    if Front.on_prem?() do
-      :ok
-    else
+    if Front.saas?() do
       BillingClient.can_setup_organization(%{
         owner_id: model.user_id
       })
@@ -136,6 +134,8 @@ defmodule Front.Models.OrganizationOnboarding do
         {:ok, %{allowed: false, errors: messages}} -> {:error, Enum.join(messages, ", ")}
         {:error, _} -> {:error, "Account check failed"}
       end
+    else
+      :ok
     end
   end
 

front/lib/front_web/controllers/organization_okta_controller.ex

@@ -84,7 +84,7 @@ defmodule FrontWeb.OrganizationOktaController do
           with {:ok, model} <- create_integration(org_id, user_id, integration),
                {:ok, token} <- gen_token(model) do
             Watchman.increment(watchman_name(:create, :success))
-            if Front.on_prem?(), do: log_create(conn, user_id, model)
+            if Front.os?(), do: log_create(conn, user_id, model)
 
             conn
             |> put_flash(:notice, "Success: Your organization is connected with Okta")

front/lib/front_web/controllers/page_controller.ex

@@ -18,7 +18,7 @@ defmodule FrontWeb.PageController do
   def status404(conn, _params) do
     # On onprem, if user isn't logged in, we want to redirect user to okta login
     # right away, without showing the 404 page
-    if anonymous?(conn) == true and Front.on_prem?() do
+    if anonymous?(conn) == true and Front.os?() do
       conn
       |> put_resp_header("location", login_url(conn))
       |> send_resp(302, "")

front/lib/front_web/controllers/people_controller.ex

@@ -284,7 +284,7 @@ defmodule FrontWeb.PeopleController do
     user_type = params["type"] || ""
 
     member_role_id =
-      if Front.ce_roles?() do
+      if Front.ce?() do
         {:ok, roles} = RoleManagement.list_possible_roles(org_id, "org_scope")
 
         member_role = Enum.find(roles, fn role -> role.name == "Member" end)
@@ -501,7 +501,7 @@ defmodule FrontWeb.PeopleController do
 
   defp create_email_member(conn, params) do
     Watchman.benchmark("people.create_member", fn ->
-      if email_members_supported?(conn.assigns.organization_id) || Front.ce_roles?() do
+      if email_members_supported?(conn.assigns.organization_id) || Front.ce?() do
         user_id = conn.assigns.user_id
         org_id = conn.assigns.organization_id
 
@@ -800,7 +800,7 @@ defmodule FrontWeb.PeopleController do
 
   defp change_user_email(conn, user_id, email) do
     Watchman.benchmark("people.change_email", fn ->
-      if email_members_supported?(conn.assigns.organization_id) || Front.ce_roles?() do
+      if email_members_supported?(conn.assigns.organization_id) || Front.ce?() do
         conn
         |> Audit.new(:User, :Modified)
         |> Audit.add(description: "Change Email")
@@ -867,7 +867,7 @@ defmodule FrontWeb.PeopleController do
 
   defp reset_user_password(conn, user_id) do
     Watchman.benchmark("people.reset_password", fn ->
-      if email_members_supported?(conn.assigns.organization_id) || Front.ce_roles?() do
+      if email_members_supported?(conn.assigns.organization_id) || Front.ce?() do
         conn
         |> Audit.new(:User, :Modified)
         |> Audit.add(description: "Reset Password")

front/lib/front_web/controllers/project_onboarding_controller.ex

@@ -630,14 +630,14 @@ defmodule FrontWeb.ProjectOnboardingController do
          ) do
         project_onboarding_path(conn, :onboarding_index, project.name, [""])
       else
-        if Front.on_prem?() do
+        if Front.saas?() do
+          project_onboarding_path(conn, :invite_collaborators, project.name)
+        else
           if Models.Project.file_exists?(project.id, project.initial_pipeline_file) do
             project_onboarding_path(conn, :existing_configuration, project.name)
           else
             project_onboarding_path(conn, :template, project.name)
           end
-        else
-          project_onboarding_path(conn, :invite_collaborators, project.name)
         end
       end
 

front/lib/front_web/controllers/project_settings_controller.ex

@@ -344,7 +344,7 @@ defmodule FrontWeb.ProjectSettingsController do
 
       changeset = DeletionValidator.run(project, params)
 
-      if Front.on_prem?() or changeset.valid? do
+      if Front.os?() or changeset.valid? do
         case Project.destroy(project.id, user_id, org_id) do
           {:ok, _} ->
             conn

front/lib/front_web/controllers/roles_controller.ex

@@ -56,7 +56,7 @@ defmodule FrontWeb.RolesController do
       case Async.await(async_role) do
         {:ok, role} ->
           async_roles = fetch_roles_async(conn.assigns.organization_id)
-          scope = if Front.ce_roles?(), do: "", else: role.scope
+          scope = if Front.ce?(), do: "", else: role.scope
           async_permissions = fetch_permissions_async(scope)
 
           {:ok, roles} = Async.await(async_roles)

front/lib/front_web/plugs/onprem_blocker.ex

@@ -9,7 +9,7 @@ defmodule FrontWeb.Plugs.OnPremBlocker do
   def init(default), do: default
 
   def call(conn, _opts) do
-    if Front.on_prem?() do
+    if Front.os?() do
       Logger.info("Blocking access to #{conn.request_path} because of on-premises")
 
       conn

front/lib/front_web/templates/account/show.html.eex

@@ -27,48 +27,48 @@
             <%= case {@user.github_scope, @user.github_login} do %>
               <% {:NONE, nil} -> %>
                 <span class="red">Not Connected</span>
-                <%= unless Front.on_prem?() do %>
-                <div>
-                <%= link "Grant public access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :public]), method: :post %>
-                <%= link "Grant private access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :private]), method: :post %>
-                </div>
+                <%= if Front.saas?() do %>
+                  <div>
+                    <%= link "Grant public access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :public]), method: :post %>
+                    <%= link "Grant private access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :private]), method: :post %>
+                  </div>
                 <% else %>
-                <div>
-                  <%= link "Connect…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :email]), method: :post %>
-                </div>
+                  <div>
+                    <%= link "Connect…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :email]), method: :post %>
+                  </div>
                 <% end %>
               <% {:NONE, _} -> %>
                 <span class="red">Not Connected</span>
                   ·
                 <span><a href="https://github.com/<%= @user.github_login %>" target="_blank">@<%= @user.github_login %></a></span>
-                <%= unless Front.on_prem?() do %>
-                <div>
-                <%= link "Grant public access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :public]), method: :post %>
-                <%= link "Grant private access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :private]), method: :post %>
-                </div>
+                <%= if Front.saas?() do %>
+                  <div>
+                    <%= link "Grant public access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :public]), method: :post %>
+                    <%= link "Grant private access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :private]), method: :post %>
+                  </div>
                 <% end %>
               <% {:EMAIL, _} -> %>
                 <span class="green">Connected</span>
                   ·
                 <span class="gray">email only</span>
                   ·
                 <span><a href="https://github.com/<%= @user.github_login %>" target="_blank">@<%= @user.github_login %></a></span>
-                <%= unless Front.on_prem?() do %>
-                <div>
-                <%= link "Grant public access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :public]), method: :post %>
-                <%= link "Grant private access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :private]), method: :post %>
-                </div>
+                <%= if Front.saas?() do %>
+                  <div>
+                    <%= link "Grant public access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :public]), method: :post %>
+                    <%= link "Grant private access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :private]), method: :post %>
+                  </div>
                   <% end %>
               <% {:PUBLIC, _} -> %>
                 <span class="green">Connected</span>
                   ·
                 <span class="gray">public repositories</span>
                   ·
                 <span><a href="https://github.com/<%= @user.github_login %>" target="_blank">@<%= @user.github_login %></a></span>
-                <%= unless Front.on_prem?() do %>
-                <div>
-                <%= link "Grant private access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :private]), method: :post %>
-                </div>
+                <%= if Front.saas?() do %>
+                  <div>
+                    <%= link "Grant private access…", to: account_path(@conn, :update_repo_scope, "github", [access_level: :private]), method: :post %>
+                  </div>
                 <% end %>
               <% {:PRIVATE, _} -> %>
                 <span class="green">Connected</span>

front/lib/front_web/templates/audit/streaming/_form.html.eex

@@ -50,7 +50,7 @@
 
                 <label class="db b mb0">Access Credentials</label>
                 <p class="mb3">Semaphore needs credentials with write acess to upload the logs</p>
-                <%= if Front.on_prem?() do %>
+                <%= if Front.os?() do %>
                  <div class="ml1 mv2">
                     <div class="flex items-center mt2">
                         <%= checkbox(f, :instance_role) %>