From f71d01902ab2f5109377d2e8e568159d3cd834b0 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Thu, 28 Apr 2022 12:14:27 -0700
Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20=F0=9F=8E=B8=20Add=20feature?=
 =?UTF-8?q?=20editions=20(#1072)"=20(#1079)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 56d84d652bbab85ac713d6c18782e7272352c067.
---
 package.json                   |  5 ++---
 ui/admin/config/environment.js | 31 +++++++++++--------------------
 ui/admin/package.json          |  4 +---
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index 5331c2810..eb3a4beca 100755
--- a/package.json
+++ b/package.json
@@ -13,9 +13,8 @@
     ]
   },
   "scripts": {
-    "build": "yarn build:ui:admin:oss",
-    "build:ui:admin:oss": "cd ui/admin && yarn build:oss",
-    "build:ui:admin:enterprise": "cd ui/admin && yarn build:enterprise",
+    "build": "yarn build:ui:admin",
+    "build:ui:admin": "cd ui/admin && yarn build",
     "build:ui:desktop": "cd ui/desktop && yarn build",
     "build:ui:desktop:win": "docker-compose -f docker-compose-embedding.yml run build-desktop-production && yarn build:ui:desktop:app",
     "build:ui:desktop:production": "cd ui/desktop && yarn build:production",
diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index c109a5ad2..058a0d2c3 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -2,25 +2,6 @@
 
 const APP_NAME = process.env.APP_NAME || 'Boundary';
 const API_HOST = process.env.API_HOST || '';
-const EDITION = process.env.EDITION || 'oss'; // Default edition is OSS
-
-// Object that defines edition features.
-const featureEditions = {
-  oss: {
-    'primary-auth-method': true,
-    oidc: true,
-    'oidc-crud': true,
-    'oidc-account-crud': true,
-    search: false,
-    filter: true,
-    'credential-store': true,
-    'managed-groups': true,
-  },
-};
-featureEditions.enterprise = {
-  ...featureEditions.oss,
-  'ssh-target': true,
-};
 
 module.exports = function (environment) {
   let ENV = {
@@ -110,7 +91,17 @@ module.exports = function (environment) {
       directory: '../../addons/api/mirage',
     },
 
-    featureFlags: featureEditions[EDITION],
+    featureFlags: {
+      'primary-auth-method': true,
+      oidc: true,
+      'oidc-crud': true,
+      'oidc-account-crud': true,
+      search: false,
+      filter: true,
+      'credential-store': true,
+      'managed-groups': true,
+      'ssh-target': false,
+    },
   };
 
   // Unsafe policy is necessary in development and test environments, but should
diff --git a/ui/admin/package.json b/ui/admin/package.json
index 960126fc6..8b7987e91 100644
--- a/ui/admin/package.json
+++ b/ui/admin/package.json
@@ -12,9 +12,7 @@
   "scripts": {
     "doc:toc": "doctoc README.md",
     "build:development": "ember build",
-    "build": "yarn build:oss",
-    "build:oss": "EDITION=oss ember build --environment=production",
-    "build:enterprise": "EDITION=enterprise ember build --environment=production",
+    "build": "ember build --environment=production",
     "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:hbs": "ember-template-lint .",