Merge pull request #1459 from signal18/opensvc-fix-v3

add separate menu for app route updates

Author: caffeinated92

cluster/cluster_acl_rules.go

@@ -113,6 +113,7 @@ var proxyACLRules = []ACLRule{
 var appACLRules = []ACLRule{
 	{"/actions/provision", nil, []string{config.GrantProvAppProvision}},
 	{"/service-opensvc", nil, []string{config.GrantProvAppProvision}},
+	{"/actions/update-routes", nil, []string{config.GrantProvAppProvision}},
 	{"/actions/unprovision", nil, []string{config.GrantProvAppUnprovision}},
 	{"/actions/drop", nil, []string{config.GrantProvAppUnprovision}},
 	{"/deployment/", nil, []string{config.GrantAppDeployment}},

server/api_app.go

@@ -69,6 +69,10 @@ func (repman *ReplicationManager) apiAppProtectedHandler(router *mux.Router) {
 		negroni.HandlerFunc(repman.validateTokenMiddleware),
 		negroni.Wrap(http.HandlerFunc(repman.handlerMuxAppProvision)),
 	))
+	router.Handle("/api/clusters/{clusterName}/apps/{appName}/actions/update-routes", negroni.New(
+		negroni.HandlerFunc(repman.validateTokenMiddleware),
+		negroni.Wrap(http.HandlerFunc(repman.handlerMuxAppUpdateRoutes)),
+	)).Methods("POST")
 	router.Handle("/api/clusters/{clusterName}/apps/{appName}/actions/stop", negroni.New(
 		negroni.HandlerFunc(repman.validateTokenMiddleware),
 		negroni.Wrap(http.HandlerFunc(repman.handlerMuxAppStop)),
@@ -829,6 +833,51 @@ func (repman *ReplicationManager) handlerMuxAppProvision(w http.ResponseWriter,
 	}
 }
 
+// @Summary Update App Routes
+// @Description Push route configuration to the OpenSVC gateway service for a given app
+// @Tags Apps
+// @Accept json
+// @Produce json
+// @Param Authorization header string true "Insert your access token" default(Bearer <Add access token here>)
+// @Param clusterName path string true "Cluster Name"
+// @Param appName path string true "App Name"
+// @Success 200 {string} string "App Routes Updated"
+// @Failure 403 {string} string "No valid ACL"
+// @Failure 404 {string} string "App Not Found"
+// @Failure 500 {string} string "Cluster Not Found"
+// @Router /api/clusters/{clusterName}/apps/{appName}/actions/update-routes [post]
+func (repman *ReplicationManager) handlerMuxAppUpdateRoutes(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	vars := mux.Vars(r)
+	mycluster := repman.getClusterByName(vars["clusterName"])
+	if mycluster != nil {
+		if valid, _ := repman.IsValidClusterACL(r, mycluster); !valid {
+			http.Error(w, "No valid ACL", http.StatusForbidden)
+			return
+		}
+
+		if mycluster.GetOrchestrator() != "opensvc" {
+			http.Error(w, "Orchestrator not supported", http.StatusInternalServerError)
+			return
+		}
+
+		node := mycluster.GetAppFromName(vars["appName"])
+		if node != nil {
+			if err := mycluster.OpenSVCProvisionRoute(node); err != nil {
+				http.Error(w, "Failed to update app routes: "+err.Error(), http.StatusInternalServerError)
+				return
+			}
+			fmt.Fprintf(w, "App Routes Updated")
+		} else {
+			http.Error(w, "App Not Found", http.StatusNotFound)
+			return
+		}
+	} else {
+		http.Error(w, "Cluster Not Found", http.StatusInternalServerError)
+		return
+	}
+}
+
 // @Summary Unprovision App Service
 // @Description Unprovision the app service for a given cluster and app
 // @Tags Apps

share/dashboard_react/src/Pages/Dashboard/components/Apps/AppMenu.jsx

@@ -9,7 +9,8 @@ import {
   provisionApp,
   startApp,
   stopApp,
-  unprovisionApp
+  unprovisionApp,
+  updateRoutesApp
 } from '../../../../redux/clusterSlice'
 import { useNavigate } from 'react-router-dom'
 
@@ -106,6 +107,18 @@ function AppMenu({ clusterName, row, isDesktop, colorScheme, from = 'tableView',
                   }
                 ]
                 : []),
+              ...(user?.grants['prov-app-provision'] && orchestrator === 'opensvc'
+                ? [
+                    {
+                      name: 'Update Routes',
+                      onClick: () => {
+                        openConfirmModal()
+                        setConfirmTitle(`Confirm update routes for ${appName}?`)
+                        setConfirmHandler(() => () => dispatch(updateRoutesApp({ clusterName, appId: row.id })))
+                      }
+                    }
+                  ]
+                : []),
               ...(user?.grants['prov-app-unprovision']
                 ? [
                   {

share/dashboard_react/src/redux/clusterSlice.js

@@ -2080,6 +2080,21 @@ export const unprovisionApp = createGuardedAsyncThunk(
   }
 )
 
+export const updateRoutesApp = createGuardedAsyncThunk(
+  'cluster/updateRoutesApp',
+  async ({ clusterName, appId }, thunkAPI) => {
+    try {
+      const baseURL = thunkAPI.getState()?.auth?.baseURL || ''
+      const { data, status } = await clusterService.updateRoutesApp(clusterName, appId, baseURL)
+      showSuccessBanner('Update routes successful!', status, thunkAPI)
+      return { data, status }
+    } catch (error) {
+      showErrorBanner('Update routes failed!', error, thunkAPI)
+      return handleError(error, thunkAPI)
+    }
+  }
+)
+
 export const startApp = createGuardedAsyncThunk('cluster/startApp', async ({ clusterName, appId }, thunkAPI) => {
   try {
     const baseURL = thunkAPI.getState()?.auth?.baseURL || ''
@@ -2700,6 +2715,7 @@ export const clusterSlice = createSlice({
         clearProxy.pending,
         provisionApp.pending,
         unprovisionApp.pending,
+        updateRoutesApp.pending,
         startApp.pending,
         stopApp.pending,
         abortApp.pending,
@@ -2785,6 +2801,7 @@ export const clusterSlice = createSlice({
         clearProxy.fulfilled,
         provisionApp.fulfilled,
         unprovisionApp.fulfilled,
+        updateRoutesApp.fulfilled,
         startApp.fulfilled,
         stopApp.fulfilled,
         abortApp.fulfilled,
@@ -2871,6 +2888,7 @@ export const clusterSlice = createSlice({
         clearProxy.rejected,
         provisionApp.rejected,
         unprovisionApp.rejected,
+        updateRoutesApp.rejected,
         startApp.rejected,
         stopApp.rejected,
         abortApp.rejected,

share/dashboard_react/src/services/clusterService.js

@@ -159,6 +159,7 @@ export const clusterService = {
   getClusterApps,
   provisionApp,
   unprovisionApp,
+  updateRoutesApp,
   startApp,
   stopApp,
   abortApp,
@@ -741,6 +742,10 @@ function unprovisionApp(clusterName, appId, baseURL) {
   return getApi(baseURL).get(`clusters/${clusterName}/apps/${appId}/actions/unprovision`)
 }
 
+function updateRoutesApp(clusterName, appId, baseURL) {
+  return getApi(baseURL).post(`clusters/${clusterName}/apps/${appId}/actions/update-routes`)
+}
+
 function startApp(clusterName, appId, baseURL) {
   return getApi(baseURL).get(`clusters/${clusterName}/apps/${appId}/actions/start`)
 }