Skip to content

Commit

Permalink
Revert "Provide ability to 'feature flag' an ISV App (#59)" (#64)
Browse files Browse the repository at this point in the history
This reverts commit 1d30135.
  • Loading branch information
jeff-phillips-18 authored Apr 22, 2021
1 parent 1d30135 commit 32efb2f
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 41 deletions.
6 changes: 1 addition & 5 deletions backend/routes/api/components/componentUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ const fs = require('fs');
const path = require('path');
const jsYaml = require('js-yaml');
const constants = require('../../../utils/constants');
const features = require('../../../utils/features');

const getServices = async (fastify) => {
const coreV1Api = fastify.kube.coreV1Api;
Expand Down Expand Up @@ -153,14 +152,11 @@ const getEnabledConfigMaps = (fastify, appDefs) => {
const getApplicationDefs = () => {
const normalizedPath = path.join(__dirname, '../../../../data/applications');
const applicationDefs = [];
const featureFlags = features.getComponentFeatureFlags();
fs.readdirSync(normalizedPath).forEach((file) => {
if (constants.yamlRegExp.test(file)) {
try {
const doc = jsYaml.load(fs.readFileSync(path.join(normalizedPath, file), 'utf8'));
if (!doc.spec.featureFlag || featureFlags[doc.spec.featureFlag]) {
applicationDefs.push(doc);
}
applicationDefs.push(doc);
} catch (e) {
console.error(`Error loading application definition ${file}: ${e}`);
}
Expand Down
15 changes: 1 addition & 14 deletions backend/routes/api/docs/docUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,15 @@ const fs = require('fs');
const path = require('path');
const jsYaml = require('js-yaml');
const constants = require('../../../utils/constants');
const features = require('../../../utils/features');
const componentUtils = require('../components/componentUtils');

const getDocs = () => {
const normalizedPath = path.join(__dirname, '../../../../data/docs');
const docs = [];
const featureFlags = features.getComponentFeatureFlags();
const appDefs = componentUtils.getApplicationDefs();

fs.readdirSync(normalizedPath).forEach((file) => {
if (constants.yamlRegExp.test(file)) {
try {
const doc = jsYaml.load(fs.readFileSync(path.join(normalizedPath, file), 'utf8'));
if (doc.spec.featureFlag) {
if (featureFlags[doc.spec.featureFlag]) {
docs.push(doc);
}
return;
}
if (!doc.spec.appName || appDefs.find((def) => def.metadata.name === doc.spec.appName)) {
docs.push(doc);
}
docs.push(doc);
} catch (e) {
console.error(`Error loading doc ${file}: ${e}`);
}
Expand Down
7 changes: 1 addition & 6 deletions backend/routes/api/quickstarts/quickStartUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ const fs = require('fs');
const path = require('path');
const jsYaml = require('js-yaml');
const constants = require('../../../utils/constants');
const features = require('../../../utils/features');

// TODO: Retrieve from the correct group for dashboard quick starts
const quickStartsGroup = 'odh.openshift.io';
Expand All @@ -25,17 +24,13 @@ const getInstalledQuickStarts = async (fastify) => {
// fastify.log.error(e, 'failed to get quickstarts');
// }

const featureFlags = features.getComponentFeatureFlags();

// TODO: Remove local quick starts when we get the correct quick starts from OpenShift
const normalizedPath = path.join(__dirname, '../../../../data/quickstarts');
fs.readdirSync(normalizedPath).forEach((file) => {
if (constants.yamlRegExp.test(file)) {
try {
const doc = jsYaml.load(fs.readFileSync(path.join(normalizedPath, file), 'utf8'));
if (!doc.spec.featureFlag || featureFlags[doc.spec.featureFlag]) {
installedQuickStarts.push(doc);
}
installedQuickStarts.push(doc);
} catch (e) {
console.error(`Error loading quick start ${file}: ${e}`);
}
Expand Down
13 changes: 0 additions & 13 deletions backend/utils/features.js

This file was deleted.

3 changes: 0 additions & 3 deletions data/features.json

This file was deleted.

0 comments on commit 32efb2f

Please sign in to comment.