OU-1389: restructure folders

cmd/plugin-backend.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	server "github.com/openshift/monitoring-plugin/pkg"
+	server "github.com/openshift/monitoring-plugin/pkg/server"
 )
 
 var (

pkg/proxy/proxy.go → pkg/monitoring/proxy.go

@@ -1,4 +1,4 @@
-package proxy
+package monitoring
 
 import (
 	"context"

pkg/proxy/sanitize.go → pkg/monitoring/sanitize.go

@@ -1,5 +1,5 @@
 // source: https://github.com/grafana/tempo-operator/blob/4ec7e8b4cb102f52de1e101174f4490b1505eaa1/internal/manifests/naming/sanitize.go
-package proxy
+package monitoring
 
 import (
 	"regexp"

pkg/server.go → pkg/server/server.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
+	"github.com/openshift/monitoring-plugin/pkg/monitoring"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 	v1 "k8s.io/api/core/v1"
@@ -20,8 +21,6 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/record"
-
-	"github.com/openshift/monitoring-plugin/pkg/proxy"
 )
 
 var log = logrus.WithField("module", "server")
@@ -114,7 +113,7 @@ func createHTTPServer(ctx context.Context, cfg *Config) (*http.Server, error) {
 		return nil, fmt.Errorf("alertmanager and thanos-querier must be set to use the 'acm-alerting' feature flag")
 	}
 
-	if cfg.Port == int(proxy.AlertmanagerPort) || cfg.Port == int(proxy.ThanosQuerierPort) {
+	if cfg.Port == int(monitoring.AlertmanagerPort) || cfg.Port == int(monitoring.ThanosQuerierPort) {
 		return nil, fmt.Errorf("cannot set default port to reserved port %d", cfg.Port)
 	}
 
@@ -223,8 +222,8 @@ func createHTTPServer(ctx context.Context, cfg *Config) (*http.Server, error) {
 
 	// Start proxy servers if in ACM mode
 	if tlsEnabled && acmMode {
-		startProxy(cfg, k8sclient, tlsConfig, timeout, proxy.AlertManagerKind, proxy.AlertmanagerPort)
-		startProxy(cfg, k8sclient, tlsConfig, timeout, proxy.ThanosQuerierKind, proxy.ThanosQuerierPort)
+		startProxy(cfg, k8sclient, tlsConfig, timeout, monitoring.AlertManagerKind, monitoring.AlertmanagerPort)
+		startProxy(cfg, k8sclient, tlsConfig, timeout, monitoring.ThanosQuerierKind, monitoring.ThanosQuerierPort)
 	}
 
 	return httpServer, nil
@@ -246,17 +245,17 @@ func setupRoutes(cfg *Config) (*mux.Router, *PluginConfig) {
 	return router, pluginConfig
 }
 
-func setupProxyRoutes(cfg *Config, k8sclient *dynamic.DynamicClient, kind proxy.KindType) *mux.Router {
+func setupProxyRoutes(cfg *Config, k8sclient *dynamic.DynamicClient, kind monitoring.KindType) *mux.Router {
 	router := mux.NewRouter()
 	var proxyUrl string
 	switch kind {
-	case proxy.AlertManagerKind:
+	case monitoring.AlertManagerKind:
 		proxyUrl = cfg.AlertmanagerUrl
-	case proxy.ThanosQuerierKind:
+	case monitoring.ThanosQuerierKind:
 		proxyUrl = cfg.ThanosQuerierUrl
 	}
 
-	router.PathPrefix("/").Handler(proxy.NewProxyHandler(
+	router.PathPrefix("/").Handler(monitoring.NewProxyHandler(
 		k8sclient,
 		cfg.CertFile,
 		kind,
@@ -364,7 +363,7 @@ func configHandler(cfg *Config) (http.HandlerFunc, *PluginConfig) {
 	}), &pluginConfig
 }
 
-func startProxy(cfg *Config, k8sclient *dynamic.DynamicClient, tlsConfig *tls.Config, timeout time.Duration, kind proxy.KindType, port proxy.ProxyPort) {
+func startProxy(cfg *Config, k8sclient *dynamic.DynamicClient, tlsConfig *tls.Config, timeout time.Duration, kind monitoring.KindType, port monitoring.ProxyPort) {
 	proxyRouter := setupProxyRoutes(cfg, k8sclient, kind)
 	proxyRouter.Use(corsHeaderMiddleware())
 	proxyServer := &http.Server{

web/cypress/component/labels.cy.tsx

@@ -1,4 +1,4 @@
-import { Labels } from '../../src/components/labels';
+import { Labels } from '../../src/shared/components/labels';
 
 describe('Labels', () => {
   it('renders "No labels" when labels is empty', () => {

web/cypress/component/mocks/AddToDashboardButton.tsx

@@ -1,4 +1,4 @@
-import { AddToDashboardButtonProps } from '../../../src/components/ols-tool-ui/helpers/AddToDashboardButton';
+import { AddToDashboardButtonProps } from '../../../src/features/perses-dashboards/ols-tool-ui/helpers/AddToDashboardButton';
 
 export const AddToDashboardButton = ({ query, name, description }: AddToDashboardButtonProps) => (
   <button

web/cypress/component/mocks/OlsToolUIPersesWrapper.tsx

@@ -1,4 +1,4 @@
-import { OlsToolUIPersesWrapperProps } from '../../../src/components/ols-tool-ui/helpers/OlsToolUIPersesWrapper';
+import { OlsToolUIPersesWrapperProps } from '../../../src/features/perses-dashboards/ols-tool-ui/helpers/OlsToolUIPersesWrapper';
 
 export const OlsToolUIPersesWrapper = ({
   children,

web/cypress/component/ols-tool-ui/ShowTimeseries.cy.tsx

@@ -1,4 +1,4 @@
-import { ShowTimeseries } from '../../../src/components/ols-tool-ui/ShowTimeseries';
+import { ShowTimeseries } from '../../../src/features/perses-dashboards/ols-tool-ui/ShowTimeseries';
 
 describe('ShowTimeseries', () => {
   const tool = {

web/cypress/e2e/coo/03.coo_lightspeed_show_timeseries.cy.ts

@@ -4,7 +4,7 @@ import { commonPages } from '../../views/common';
 import { listPersesDashboardsPage } from '../../views/perses-dashboards-list-dashboards';
 import { persesCreateDashboardsPage } from '../../views/perses-dashboards-create-dashboard';
 import { persesDashboardsPage } from '../../views/perses-dashboards';
-import { persesMUIDataTestIDs } from '../../../src/components/data-test';
+import { persesMUIDataTestIDs } from '../../../src/shared/constants/data-test';
 
 const PROMPT = 'visualize CPU consumption in the openshift-monitoring namespace in last 2 hours';
 

web/cypress/support/commands/dashboards-commands.ts

@@ -1,5 +1,5 @@
 import 'cypress-wait-until';
-import { DataTestIDs, LegacyTestIDs } from '../../../src/components/data-test';
+import { DataTestIDs, LegacyTestIDs } from '../../../src/shared/constants/data-test';
 import { waitForPodsReady, waitForResourceCondition } from './wait-utils';
 
 export {};

web/cypress/support/commands/perses-commands.ts

@@ -2,7 +2,7 @@ export {};
 
 import { nav } from '../../views/nav';
 import { listPersesDashboardsPage } from '../../views/perses-dashboards-list-dashboards';
-import { listPersesDashboardsOUIAIDs } from '../../../src/components/data-test';
+import { listPersesDashboardsOUIAIDs } from '../../../src/shared/constants/data-test';
 
 // Display name prefixes/exact matches for test-created PersesDashboards to delete before
 // Perses tests.

web/cypress/support/commands/utility-commands.ts

@@ -1,4 +1,4 @@
-import { Classes, DataTestIDs, LegacyTestIDs } from '../../../src/components/data-test';
+import { Classes, DataTestIDs, LegacyTestIDs } from '../../../src/shared/constants/data-test';
 export {};
 
 declare global {

web/cypress/support/monitoring/01.reg_alerts.cy.ts

@@ -16,7 +16,7 @@ import {
   SilenceComment,
   WatchdogAlert,
 } from '../../fixtures/monitoring/constants';
-import { FilterOUIAIDs } from '../../../src/components/data-test';
+import { FilterOUIAIDs } from '../../../src/shared/constants/data-test';
 
 export interface PerspectiveConfig {
   name: string;

web/cypress/support/monitoring/02.reg_metrics_1.cy.ts

@@ -1,5 +1,5 @@
 import { metricsPage } from '../../views/metrics';
-import { Classes, DataTestIDs } from '../../../src/components/data-test';
+import { Classes, DataTestIDs } from '../../../src/shared/constants/data-test';
 import {
   GraphTimespan,
   MetricsPagePredefinedQueries,

web/cypress/support/monitoring/02.reg_metrics_2.cy.ts

@@ -1,5 +1,5 @@
 import { metricsPage } from '../../views/metrics';
-import { Classes, DataTestIDs } from '../../../src/components/data-test';
+import { Classes, DataTestIDs } from '../../../src/shared/constants/data-test';
 import {
   MetricGraphEmptyState,
   MetricsPagePredefinedQueries,

web/cypress/support/monitoring/03.reg_legacy_dashboards.cy.ts

@@ -9,7 +9,7 @@ import {
   Classes,
   LegacyDashboardPageTestIDs,
   DataTestIDs,
-} from '../../../src/components/data-test';
+} from '../../../src/shared/constants/data-test';
 import { metricsPage } from '../../views/metrics';
 import { alertingRuleDetailsPage } from '../../views/alerting-rule-details-page';
 import { alerts } from '../../fixtures/monitoring/alert';

web/cypress/support/monitoring/04.reg_alerts_namespace.cy.ts

@@ -16,7 +16,7 @@ import {
   SilenceComment,
   WatchdogAlert,
 } from '../../fixtures/monitoring/constants';
-import { FilterOUIAIDs } from '../../../src/components/data-test';
+import { FilterOUIAIDs } from '../../../src/shared/constants/data-test';
 
 export interface PerspectiveConfig {
   name: string;

web/cypress/support/monitoring/05.reg_metrics_namespace_1.cy.ts

@@ -1,5 +1,5 @@
 import { metricsPage } from '../../views/metrics';
-import { Classes, DataTestIDs } from '../../../src/components/data-test';
+import { Classes, DataTestIDs } from '../../../src/shared/constants/data-test';
 import {
   MetricsPageUnits,
   GraphTimespan,

web/cypress/support/monitoring/05.reg_metrics_namespace_2.cy.ts

@@ -1,5 +1,5 @@
 import { metricsPage } from '../../views/metrics';
-import { Classes, DataTestIDs } from '../../../src/components/data-test';
+import { Classes, DataTestIDs } from '../../../src/shared/constants/data-test';
 import {
   MetricsPagePredefinedQueries,
   MetricsPageQueryInput,

web/cypress/support/monitoring/06.reg_legacy_dashboards_namespace.cy.ts

@@ -9,7 +9,7 @@ import {
   Classes,
   LegacyDashboardPageTestIDs,
   DataTestIDs,
-} from '../../../src/components/data-test';
+} from '../../../src/shared/constants/data-test';
 import { metricsPage } from '../../views/metrics';
 import { alertingRuleDetailsPage } from '../../views/alerting-rule-details-page';
 import { alerts } from '../../fixtures/monitoring/alert';

web/cypress/support/perses/00.coo_bvt_perses_admin.cy.ts

@@ -5,7 +5,7 @@ import {
   persesDashboardsEmptyDashboard,
 } from '../../fixtures/perses/constants';
 import { persesDashboardsPage } from '../../views/perses-dashboards';
-import { persesMUIDataTestIDs } from '../../../src/components/data-test';
+import { persesMUIDataTestIDs } from '../../../src/shared/constants/data-test';
 import { listPersesDashboardsPage } from '../../views/perses-dashboards-list-dashboards';
 import { persesDashboardsPanelGroup } from '../../views/perses-dashboards-panelgroup';
 import { persesDashboardsPanel } from '../../views/perses-dashboards-panel';

web/cypress/support/perses/02.coo_edit_perses_admin.cy.ts

@@ -2,7 +2,7 @@ import {
   editPersesDashboardsAddVariable,
   persesMUIDataTestIDs,
   IDs,
-} from '../../../src/components/data-test';
+} from '../../../src/shared/constants/data-test';
 import {
   persesDashboardsDashboardDropdownCOO,
   persesDashboardsDashboardDropdownPersesDev,
@@ -319,7 +319,7 @@ export function testCOOEditPerses(perspective: PerspectiveConfig) {
     },
   );
 
-  /**TODO: https://issues.redhat.com/browse/OU-1054 is targeted for COO1.5.0, 
+  /**TODO: https://issues.redhat.com/browse/OU-1054 is targeted for COO1.5.0,
    * so, commenting all Datasources related scenarios
   it(`6.${perspective.name} perspective - Edit Toolbar - Edit Datasources
    - Add and Delete Prometheus Datasource`, () => {
@@ -372,7 +372,7 @@ export function testCOOEditPerses(perspective: PerspectiveConfig) {
     // persesDashboardsPage.clickEditActionButton('Save');
   });
 
-  it(`7.${perspective.name} perspective - Edit Toolbar - Edit Datasources - 
+  it(`7.${perspective.name} perspective - Edit Toolbar - Edit Datasources -
   - Edit Prometheus Datasource`, () => {
     cy.log(`7.1. use sidebar nav to go to Observe > Dashboards (Perses)`);
     commonPages.titleShouldHaveText('Dashboards');
@@ -410,11 +410,11 @@ export function testCOOEditPerses(perspective: PerspectiveConfig) {
 
   });
 
-  // it(`8.${perspective.name} perspective - Edit Toolbar - 
+  // it(`8.${perspective.name} perspective - Edit Toolbar -
   // Edit Datasources - Add Tempo Datasource`, () => {
   // });
 
-  it(`8.${perspective.name} perspective - Edit Toolbar - 
+  it(`8.${perspective.name} perspective - Edit Toolbar -
   - Edit Datasources - Required field validation`, () => {
     cy.log(`8.1. use sidebar nav to go to Observe > Dashboards (Perses)`);
     commonPages.titleShouldHaveText('Dashboards');

web/cypress/support/perses/99.coo_rbac_perses_user1.cy.ts

@@ -10,7 +10,7 @@ import {
 } from '../../fixtures/perses/constants';
 import { persesDashboardsEditVariables } from '../../views/perses-dashboards-edit-variables';
 import { persesDashboardsPanelGroup } from '../../views/perses-dashboards-panelgroup';
-import { persesAriaLabels } from '../../../src/components/data-test';
+import { persesAriaLabels } from '../../../src/shared/constants/data-test';
 import { persesDashboardsPanel } from '../../views/perses-dashboards-panel';
 import { persesDashboardsAddListPanelType } from '../../fixtures/perses/constants';
 import { persesImportDashboardsPage } from '../../views/perses-dashboards-import-dashboard';

web/cypress/support/perses/99.coo_rbac_perses_user3.cy.ts

@@ -13,7 +13,7 @@ import { persesDashboardsPanel } from '../../views/perses-dashboards-panel';
 import { persesDashboardsAddListPanelType } from '../../fixtures/perses/constants';
 import { persesImportDashboardsPage } from '../../views/perses-dashboards-import-dashboard';
 import { nav } from '../../views/nav';
-import { persesAriaLabels } from '../../../src/components/data-test';
+import { persesAriaLabels } from '../../../src/shared/constants/data-test';
 
 export interface PerspectiveConfig {
   name: string;

web/cypress/views/alerting-rule-details-page.ts

@@ -1,6 +1,6 @@
 import { commonPages } from './common';
 import { detailsPage } from './details-page';
-import { DataTestIDs } from '../../src/components/data-test';
+import { DataTestIDs } from '../../src/shared/constants/data-test';
 
 export const alertingRuleDetailsPage = {
   assertAlertingRuleDetailsPage: (title: string) => {

web/cypress/views/alerting-rule-list-page.ts

@@ -1,4 +1,4 @@
-import { DataTestIDs, Classes, FilterOUIAIDs } from '../../src/components/data-test';
+import { DataTestIDs, Classes, FilterOUIAIDs } from '../../src/shared/constants/data-test';
 import { Source } from '../fixtures/monitoring/constants';
 import { listPage } from './list-page';
 

web/cypress/views/common.ts

@@ -1,5 +1,5 @@
 import { detailsPage } from './details-page';
-import { DataTestIDs } from '../../src/components/data-test';
+import { DataTestIDs } from '../../src/shared/constants/data-test';
 
 export const commonPages = {
   projectDropdownShouldNotExist: () =>

web/cypress/views/details-page.ts

@@ -1,5 +1,5 @@
 import { commonPages } from './common';
-import { DataTestIDs, Classes } from '../../src/components/data-test';
+import { DataTestIDs, Classes } from '../../src/shared/constants/data-test';
 
 export const detailsPage = {
   sectionHeaderShouldExist: (sectionHeading: string) => {

web/cypress/views/incidents-page.ts

@@ -1,5 +1,5 @@
 import { nav } from './nav';
-import { DataTestIDs } from '../../src/components/data-test';
+import { DataTestIDs } from '../../src/shared/constants/data-test';
 
 // Hard timeout safety net for findIncidentWithAlert retry loops.
 // Prevents infinite loops if cy.waitUntil's timeout mechanism fails.

web/cypress/views/legacy-dashboards.ts

@@ -1,5 +1,9 @@
 import { commonPages } from './common';
-import { LegacyDashboardPageTestIDs, DataTestIDs, Classes } from '../../src/components/data-test';
+import {
+  LegacyDashboardPageTestIDs,
+  DataTestIDs,
+  Classes,
+} from '../../src/shared/constants/data-test';
 import {
   MonitoringPageTitles,
   LegacyDashboardsTimeRange,

web/cypress/views/list-page.ts

@@ -1,4 +1,9 @@
-import { DataTestIDs, Classes, LegacyTestIDs, FilterOUIAIDs } from '../../src/components/data-test';
+import {
+  DataTestIDs,
+  Classes,
+  LegacyTestIDs,
+  FilterOUIAIDs,
+} from '../../src/shared/constants/data-test';
 
 const escapeRegExp = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 

web/cypress/views/metrics.ts

@@ -1,5 +1,5 @@
 import { commonPages } from './common';
-import { DataTestIDs, Classes, IDs } from '../../src/components/data-test';
+import { DataTestIDs, Classes, IDs } from '../../src/shared/constants/data-test';
 import {
   MetricsPageUnits,
   MonitoringRefreshInterval,

web/cypress/views/nav.ts

@@ -1,4 +1,4 @@
-import { Classes } from '../../src/components/data-test';
+import { Classes } from '../../src/shared/constants/data-test';
 export const nav = {
   sidenav: {
     clickNavLink: (path: string[]) => {

web/cypress/views/perses-dashboards-create-dashboard.ts

@@ -1,4 +1,4 @@
-import { Classes, IDs, persesAriaLabels } from '../../src/components/data-test';
+import { Classes, IDs, persesAriaLabels } from '../../src/shared/constants/data-test';
 import { persesCreateDashboard, persesDashboardsModalTitles } from '../fixtures/perses/constants';
 
 export const persesCreateDashboardsPage = {

web/cypress/views/perses-dashboards-edit-datasources.ts

@@ -4,7 +4,7 @@ import {
   persesMUIDataTestIDs,
   editPersesDashboardsAddDatasource,
   IDs,
-} from '../../src/components/data-test';
+} from '../../src/shared/constants/data-test';
 import {
   persesDashboardsModalTitles,
   persesDashboardsRequiredFields,

web/cypress/views/perses-dashboards-edit-variables.ts

@@ -4,7 +4,7 @@ import {
   persesMUIDataTestIDs,
   IDs,
   editPersesDashboardsAddVariable,
-} from '../../src/components/data-test';
+} from '../../src/shared/constants/data-test';
 import {
   persesDashboardsModalTitles,
   persesDashboardsAddListVariableSource,

web/cypress/views/perses-dashboards-import-dashboard.ts

@@ -1,4 +1,4 @@
-import { Classes, IDs, persesAriaLabels } from '../../src/components/data-test';
+import { Classes, IDs, persesAriaLabels } from '../../src/shared/constants/data-test';
 import {
   persesDashboardsImportDashboard,
   persesDashboardsModalTitles,

web/cypress/views/perses-dashboards-list-dashboards.ts

@@ -7,7 +7,7 @@ import {
   IDs,
   persesAriaLabels,
   LegacyTestIDs,
-} from '../../src/components/data-test';
+} from '../../src/shared/constants/data-test';
 import {
   listPersesDashboardsEmptyState,
   listPersesDashboardsNoDashboardsFoundState,

web/cypress/views/perses-dashboards-panel.ts

@@ -3,7 +3,7 @@ import {
   persesAriaLabels,
   IDs,
   editPersesDashboardsAddPanel,
-} from '../../src/components/data-test';
+} from '../../src/shared/constants/data-test';
 import {
   persesDashboardsModalTitles,
   persesDashboardsAddPanelAddQueryType,