From 33728a64962fe2c8df413f0eb3007496eba586b4 Mon Sep 17 00:00:00 2001
From: Dharini Jeeva <dharini@hashicorp.com>
Date: Fri, 12 Aug 2022 09:27:02 -0700
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20remove=20managed=5Fgrou?=
 =?UTF-8?q?ps=20feature=20flag=20(#1253)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth-methods/auth-method/actions/index.hbs | 18 ++++++++----------
 .../auth-methods/auth-method/nav/index.hbs     | 12 +++++-------
 ui/admin/config/environment.js                 |  1 -
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs b/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs
index 0f1d67be5..43b9f750d 100644
--- a/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs
+++ b/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs
@@ -65,16 +65,14 @@
     </dropdown.link>
   {{/if}}
 
-  {{#if (feature-flag 'managed-groups')}}
-    {{#if (can 'create model' @model collection='managed-groups')}}
-      {{#if @model.isOIDC}}
-        <dropdown.link
-          @route='scopes.scope.auth-methods.auth-method.managed-groups.new'
-          @model={{@model}}
-        >
-          {{t 'resources.managed-group.actions.create'}}
-        </dropdown.link>
-      {{/if}}
+  {{#if (can 'create model' @model collection='managed-groups')}}
+    {{#if @model.isOIDC}}
+      <dropdown.link
+        @route='scopes.scope.auth-methods.auth-method.managed-groups.new'
+        @model={{@model}}
+      >
+        {{t 'resources.managed-group.actions.create'}}
+      </dropdown.link>
     {{/if}}
   {{/if}}
 
diff --git a/ui/admin/app/components/auth-methods/auth-method/nav/index.hbs b/ui/admin/app/components/auth-methods/auth-method/nav/index.hbs
index 2b6dce5aa..16b1d7aee 100644
--- a/ui/admin/app/components/auth-methods/auth-method/nav/index.hbs
+++ b/ui/admin/app/components/auth-methods/auth-method/nav/index.hbs
@@ -9,13 +9,11 @@
     </nav.link>
   {{/if}}
 
-  {{#if (feature-flag 'managed-groups')}}
-    {{#if (can 'navigate model' @model collection='managed-groups')}}
-      {{#if @model.isOIDC}}
-        <nav.link @route='scopes.scope.auth-methods.auth-method.managed-groups'>
-          {{t 'resources.managed-group.title_plural'}}
-        </nav.link>
-      {{/if}}
+  {{#if (can 'navigate model' @model collection='managed-groups')}}
+    {{#if @model.isOIDC}}
+      <nav.link @route='scopes.scope.auth-methods.auth-method.managed-groups'>
+        {{t 'resources.managed-group.title_plural'}}
+      </nav.link>
     {{/if}}
   {{/if}}
 </Rose::Nav::Tabs>
\ No newline at end of file
diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index 997536004..fe353435f 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -10,7 +10,6 @@ const featureEditions = {
     'oidc-account-crud': true,
     search: false,
     filter: true,
-    'managed-groups': true,
     'static-credentials': false,
     byow: false,
   },