feat: fixing prod/stage env

Author: sachaudh

.github/workflows/build-prod.yml

@@ -1,5 +1,9 @@
-name: Build Prod
-on: [push]
+name: Build prod
+on:
+  push:
+    branches:
+      - prod-beta
+      - prod-stable
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -22,4 +26,4 @@ jobs:
         id: restore-build-prod
         with:
           path: ${{ github.workspace }}/dist/*
-          key: ${{ github.sha }}
+          key: ${{ github.sha }}/prod

.github/workflows/build-staging.yml

@@ -1,5 +1,9 @@
-name: Build Staging
-on: [push]
+name: Build staging
+on:
+  push:
+    branches:
+      - main
+      - stable
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -22,4 +26,4 @@ jobs:
         id: restore-build-staging
         with:
           path: ${{ github.workspace }}/dist/*
-          key: ${{ github.sha }}
+          key: ${{ github.sha }}/staging

.github/workflows/deploy-main.yml

@@ -1,4 +1,4 @@
-name: Deploy Main
+name: Deploy ci-beta stage-beta qa-beta
 on:
   workflow_run:
     workflows: ['Build Staging']
@@ -27,7 +27,7 @@ jobs:
         id: restore-build-staging
         with:
           path: ${{ github.workspace }}/dist/*
-          key: ${{ github.sha }}
+          key: ${{ github.sha }}/staging
       - name: Checkout RedHatInsights/acs-ui-build repo and push build files from acs-ui
         run: |
           bash ${{ github.workspace }}/.github/scripts/deploy.sh
@@ -45,7 +45,7 @@ jobs:
         id: restore-build-staging
         with:
           path: ${{ github.workspace }}/dist/*
-          key: ${{ github.sha }}
+          key: ${{ github.sha }}/staging
       - name: Checkout RedHatInsights/acs-ui-build repo and push build files from acs-ui
         run: |
           bash ${{ github.workspace }}/.github/scripts/deploy.sh
@@ -63,7 +63,7 @@ jobs:
         id: restore-build-staging
         with:
           path: ${{ github.workspace }}/dist/*
-          key: ${{ github.sha }}
+          key: ${{ github.sha }}/staging
       - name: Checkout RedHatInsights/acs-ui-build repo and push build files from acs-ui
         run: |
           bash ${{ github.workspace }}/.github/scripts/deploy.sh

.github/workflows/deploy-prod-beta.yml

@@ -1,4 +1,4 @@
-name: Deploy Prod Beta
+name: Deploy prod-beta
 on:
   workflow_run:
     workflows: ['Build Prod']
@@ -27,7 +27,7 @@ jobs:
         id: restore-build-prod
         with:
           path: ${{ github.workspace }}/dist/*
-          key: ${{ github.sha }}
+          key: ${{ github.sha }}/prod
       - name: Checkout RedHatInsights/acs-ui-build repo and push build files from acs-ui
         run: |
           bash ${{ github.workspace }}/.github/scripts/deploy.sh

.github/workflows/deploy-prod-stable.yml

@@ -1,4 +1,4 @@
-name: Deploy Prod Stable
+name: Deploy prod-stable
 on:
   workflow_run:
     workflows: ['Build Prod']
@@ -27,7 +27,7 @@ jobs:
         id: restore-build-prod
         with:
           path: ${{ github.workspace }}/dist/*
-          key: ${{ github.sha }}
+          key: ${{ github.sha }}/prod
       - name: Checkout RedHatInsights/acs-ui-build repo and push build files from acs-ui
         run: |
           bash ${{ github.workspace }}/.github/scripts/deploy.sh

.github/workflows/deploy-stable.yml

@@ -1,4 +1,4 @@
-name: Deploy Stable
+name: Deploy ci-stable stage-stable qa-stable
 on:
   workflow_run:
     workflows: ['Build Staging']
@@ -27,7 +27,7 @@ jobs:
         id: restore-build-staging
         with:
           path: ${{ github.workspace }}/dist/*
-          key: ${{ github.sha }}
+          key: ${{ github.sha }}/staging
       - name: Checkout RedHatInsights/acs-ui-build repo and push build files from acs-ui
         run: |
           bash ${{ github.workspace }}/.github/scripts/deploy.sh
@@ -45,7 +45,7 @@ jobs:
         id: restore-build-staging
         with:
           path: ${{ github.workspace }}/dist/*
-          key: ${{ github.sha }}
+          key: ${{ github.sha }}/staging
       - name: Checkout RedHatInsights/acs-ui-build repo and push build files from acs-ui
         run: |
           bash ${{ github.workspace }}/.github/scripts/deploy.sh
@@ -63,7 +63,7 @@ jobs:
         id: restore-build-staging
         with:
           path: ${{ github.workspace }}/dist/*
-          key: ${{ github.sha }}
+          key: ${{ github.sha }}/staging
       - name: Checkout RedHatInsights/acs-ui-build repo and push build files from acs-ui
         run: |
           bash ${{ github.workspace }}/.github/scripts/deploy.sh

config/dev.webpack.config.js

@@ -2,14 +2,6 @@ const { resolve } = require('path');
 const config = require('@redhat-cloud-services/frontend-components-config');
 const commonPlugins = require('./plugins');
 
-function getEnv() {
-  if (process.env.PROD) {
-    return process.env.BETA ? 'prod-beta' : 'prod-stable';
-  } else {
-    return process.env.BETA ? 'stage-beta' : 'stage-stable';
-  }
-}
-
 const { config: webpackConfig, plugins } = config({
   rootFolder: resolve(__dirname, '../'),
   debug: true,
@@ -18,7 +10,7 @@ const { config: webpackConfig, plugins } = config({
   appUrl: process.env.BETA
     ? '/beta/application-services/acs'
     : '/application-services/acs',
-  env: getEnv(),
+  env: process.env.BETA ? 'stage-beta' : 'stage-stable',
 });
 plugins.push(...commonPlugins);
 

config/plugins.js

@@ -17,7 +17,7 @@ if (process.env.NODE_ENV === 'production') {
 // We want to access a PROD env variable within the UI code
 plugins.push(
   new webpack.DefinePlugin({
-    'process.env.PROD': process.env.NODE_ENV === 'production',
+    'process.env.PROD': process?.env?.NODE_ENV === 'production',
   })
 );
 

src/services/apiRequest.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-const API_URL = process.env.PROD
+const API_URL = process?.env?.PROD
   ? 'https://api.openshift.com'
   : 'https://api.stage.openshift.com';