Merge branch 'master' of https://github.com/spotify/backstage into samiram/pagerduty-plugin

packages/app/CHANGELOG.md

@@ -1,5 +1,66 @@
 # example-app
 
+## 0.2.3
+
+### Patch Changes
+
+- 475fc0aaa: Using the search field in the sidebar now navigates to the search result page.
+- Updated dependencies [475fc0aaa]
+- Updated dependencies [1166fcc36]
+- Updated dependencies [29a0ccab2]
+- Updated dependencies [8e6728e25]
+- Updated dependencies [c93a14b49]
+- Updated dependencies [ef2831dde]
+- Updated dependencies [2a71f4bab]
+- Updated dependencies [1185919f3]
+- Updated dependencies [a8de7f554]
+- Updated dependencies [faf311c26]
+- Updated dependencies [31d8b6979]
+- Updated dependencies [991345969]
+- Updated dependencies [475fc0aaa]
+  - @backstage/core@0.3.2
+  - @backstage/catalog-model@0.3.0
+  - @backstage/plugin-kubernetes@0.3.0
+  - @backstage/cli@0.3.1
+  - @backstage/plugin-cost-insights@0.4.1
+  - @backstage/plugin-scaffolder@0.3.1
+  - @backstage/plugin-register-component@0.2.2
+  - @backstage/plugin-circleci@0.2.2
+  - @backstage/plugin-search@0.2.1
+  - @backstage/plugin-api-docs@0.2.2
+  - @backstage/plugin-catalog@0.2.3
+  - @backstage/plugin-cloudbuild@0.2.2
+  - @backstage/plugin-github-actions@0.2.2
+  - @backstage/plugin-jenkins@0.3.1
+  - @backstage/plugin-lighthouse@0.2.3
+  - @backstage/plugin-rollbar@0.2.3
+  - @backstage/plugin-sentry@0.2.3
+  - @backstage/plugin-techdocs@0.2.3
+
+## 0.2.2
+
+### Patch Changes
+
+- 3efd03c0e: Removed obsolete CircleCI proxy config from example-app
+- Updated dependencies [1722cb53c]
+- Updated dependencies [1722cb53c]
+- Updated dependencies [17a9f48f6]
+- Updated dependencies [4040d4fcb]
+- Updated dependencies [f360395d0]
+- Updated dependencies [259d848ee]
+- Updated dependencies [8b7737d0b]
+- Updated dependencies [902340451]
+  - @backstage/cli@0.3.0
+  - @backstage/core@0.3.1
+  - @backstage/plugin-cost-insights@0.4.0
+  - @backstage/plugin-lighthouse@0.2.2
+  - @backstage/plugin-rollbar@0.2.2
+  - @backstage/plugin-sentry@0.2.2
+  - @backstage/plugin-techdocs@0.2.2
+  - @backstage/plugin-user-settings@0.2.2
+  - @backstage/plugin-catalog@0.2.2
+  - @backstage/test-utils@0.1.3
+
 ## 0.2.1
 
 ### Patch Changes

packages/app/package.json

@@ -1,44 +1,45 @@
 {
   "name": "example-app",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "private": true,
   "bundled": true,
   "dependencies": {
-    "@backstage/catalog-model": "^0.2.0",
-    "@backstage/cli": "^0.2.0",
-    "@backstage/core": "^0.3.0",
-    "@backstage/plugin-api-docs": "^0.2.1",
-    "@backstage/plugin-catalog": "^0.2.1",
-    "@backstage/plugin-circleci": "^0.2.1",
-    "@backstage/plugin-cloudbuild": "^0.2.1",
-    "@backstage/plugin-cost-insights": "^0.3.0",
+    "@backstage/catalog-model": "^0.3.0",
+    "@backstage/cli": "^0.3.1",
+    "@backstage/core": "^0.3.2",
+    "@backstage/plugin-api-docs": "^0.2.2",
+    "@backstage/plugin-catalog": "^0.2.3",
+    "@backstage/plugin-circleci": "^0.2.2",
+    "@backstage/plugin-cloudbuild": "^0.2.2",
+    "@backstage/plugin-cost-insights": "^0.4.1",
     "@backstage/plugin-explore": "^0.2.1",
     "@backstage/plugin-gcp-projects": "^0.2.1",
-    "@backstage/plugin-github-actions": "^0.2.1",
+    "@backstage/plugin-github-actions": "^0.2.2",
     "@backstage/plugin-gitops-profiles": "^0.2.1",
     "@backstage/plugin-graphiql": "^0.2.1",
-    "@backstage/plugin-jenkins": "^0.3.0",
-    "@backstage/plugin-kubernetes": "^0.2.1",
-    "@backstage/plugin-lighthouse": "^0.2.1",
+    "@backstage/plugin-jenkins": "^0.3.1",
+    "@backstage/plugin-kubernetes": "^0.3.0",
+    "@backstage/plugin-lighthouse": "^0.2.3",
     "@backstage/plugin-newrelic": "^0.2.1",
-    "@backstage/plugin-register-component": "^0.2.1",
-    "@backstage/plugin-rollbar": "^0.2.1",
-    "@backstage/plugin-scaffolder": "^0.3.0",
-    "@backstage/plugin-sentry": "^0.2.1",
+    "@backstage/plugin-register-component": "^0.2.2",
+    "@backstage/plugin-rollbar": "^0.2.3",
+    "@backstage/plugin-scaffolder": "^0.3.1",
+    "@backstage/plugin-sentry": "^0.2.3",
+    "@backstage/plugin-search": "^0.2.1",
     "@backstage/plugin-tech-radar": "^0.3.0",
-    "@backstage/plugin-techdocs": "^0.2.1",
-    "@backstage/plugin-user-settings": "^0.2.1",
+    "@backstage/plugin-techdocs": "^0.2.3",
+    "@backstage/plugin-user-settings": "^0.2.2",
     "@backstage/plugin-welcome": "^0.2.1",
-    "@backstage/test-utils": "^0.1.2",
+    "@backstage/test-utils": "^0.1.3",
     "@backstage/plugin-pagerduty": "^0.2.1",
     "@backstage/theme": "^0.2.1",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@octokit/rest": "^18.0.0",
-    "@roadiehq/backstage-plugin-github-insights": "^0.2.12",
-    "@roadiehq/backstage-plugin-github-pull-requests": "^0.6.2",
-    "@roadiehq/backstage-plugin-travis-ci": "^0.2.7",
-    "@roadiehq/backstage-plugin-buildkite": "^0.1.2",
+    "@roadiehq/backstage-plugin-github-insights": "^0.2.15",
+    "@roadiehq/backstage-plugin-github-pull-requests": "^0.6.3",
+    "@roadiehq/backstage-plugin-travis-ci": "^0.2.8",
+    "@roadiehq/backstage-plugin-buildkite": "^0.1.3",
     "history": "^5.0.0",
     "prop-types": "^15.7.2",
     "react": "^16.12.0",
@@ -50,7 +51,7 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@testing-library/cypress": "^6.0.0",
+    "@testing-library/cypress": "^7.0.1",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
@@ -87,14 +88,5 @@
       "last 1 safari version"
     ]
   },
-  "license": "Apache-2.0",
-  "proxy": {
-    "/circleci/api": {
-      "target": "https://circleci.com/api/v1.1",
-      "changeOrigin": true,
-      "pathRewrite": {
-        "^/circleci/api/": "/"
-      }
-    }
-  }
+  "license": "Apache-2.0"
 }

packages/app/src/components/Root/Root.tsx

@@ -33,12 +33,12 @@ import {
   SidebarContext,
   SidebarItem,
   SidebarDivider,
-  SidebarSearchField,
   SidebarSpace,
 } from '@backstage/core';
 import { NavLink } from 'react-router-dom';
 import { graphiQLRouteRef } from '@backstage/plugin-graphiql';
 import { Settings as SidebarSettings } from '@backstage/plugin-user-settings';
+import { SidebarSearch } from '@backstage/plugin-search';
 
 const useSidebarLogoStyles = makeStyles({
   root: {
@@ -73,17 +73,11 @@ const SidebarLogo: FC<{}> = () => {
   );
 };
 
-const handleSearch = (query: string): void => {
-  // XXX (@koroeskohr): for testing purposes
-  // eslint-disable-next-line no-console
-  console.log(query);
-};
-
 const Root: FC<{}> = ({ children }) => (
   <SidebarPage>
     <Sidebar>
       <SidebarLogo />
-      <SidebarSearchField onSearch={handleSearch} />
+      <SidebarSearch />
       <SidebarDivider />
       {/* Global nav, not org-specific */}
       <SidebarItem icon={HomeIcon} to="/catalog" text="Home" />

packages/app/src/components/catalog/EntityPage.test.tsx

@@ -18,7 +18,7 @@ import { CICDSwitcher } from './EntityPage';
 import { UrlPatternDiscovery, ApiProvider, ApiRegistry } from '@backstage/core';
 import {
   buildKiteApiRef,
-  BuildKiteApi,
+  BuildkiteApi,
 } from '@roadiehq/backstage-plugin-buildkite';
 import { renderWithEffects, wrapInTestApp } from '@backstage/test-utils';
 
@@ -42,11 +42,11 @@ describe('EntityPage Test', () => {
   const discoveryApi = UrlPatternDiscovery.compile('http://exampleapi.com');
 
   const apis = ApiRegistry.from([
-    [buildKiteApiRef, new BuildKiteApi({ discoveryApi })],
+    [buildKiteApiRef, new BuildkiteApi({ discoveryApi })],
   ]);
 
   describe('CICDSwitcher Test', () => {
-    it('Should render BuildKite View', async () => {
+    it('Should render Buildkite View', async () => {
       const renderedComponent = await renderWithEffects(
         wrapInTestApp(
           <ApiProvider apis={apis}>

packages/app/src/components/catalog/EntityPage.tsx

@@ -71,8 +71,8 @@ import {
   PagerDutyCard,
 } from '@backstage/plugin-pagerduty';
 import {
-  Router as BuildKiteRouter,
-  isPluginApplicableToEntity as isBuildKiteAvailable,
+  Router as BuildkiteRouter,
+  isPluginApplicableToEntity as isBuildkiteAvailable,
 } from '@roadiehq/backstage-plugin-buildkite';
 
 export const CICDSwitcher = ({ entity }: { entity: Entity }) => {
@@ -81,12 +81,12 @@ export const CICDSwitcher = ({ entity }: { entity: Entity }) => {
   switch (true) {
     case isJenkinsAvailable(entity):
       return <JenkinsRouter entity={entity} />;
-    case isBuildKiteAvailable(entity):
-      return <BuildKiteRouter entity={entity} />;
-    case isGitHubActionsAvailable(entity):
-      return <GitHubActionsRouter entity={entity} />;
+    case isBuildkiteAvailable(entity):
+      return <BuildkiteRouter entity={entity} />;
     case isCircleCIAvailable(entity):
       return <CircleCIRouter entity={entity} />;
+    case isGitHubActionsAvailable(entity):
+      return <GitHubActionsRouter entity={entity} />;
     case isCloudbuildAvailable(entity):
       return <CloudbuildRouter entity={entity} />;
     case isTravisCIAvailable(entity):

packages/app/src/identityProviders.ts

@@ -22,9 +22,16 @@ import {
   samlAuthApiRef,
   microsoftAuthApiRef,
   oneloginAuthApiRef,
+  oidcAuthApiRef,
 } from '@backstage/core';
 
 export const providers = [
+  {
+    id: 'oidc-auth-provider',
+    title: 'Oidc',
+    message: 'Sign In using OpenId Connect',
+    apiRef: oidcAuthApiRef,
+  },
   {
     id: 'google-auth-provider',
     title: 'Google',

packages/app/src/plugins.ts

@@ -39,4 +39,5 @@ export { plugin as CostInsights } from '@backstage/plugin-cost-insights';
 export { plugin as GitHubInsights } from '@roadiehq/backstage-plugin-github-insights';
 export { plugin as UserSettings } from '@backstage/plugin-user-settings';
 export { plugin as Pagerduty } from '@backstage/plugin-pagerduty';
-export { plugin as BuildKite } from '@roadiehq/backstage-plugin-buildkite';
+export { plugin as Buildkite } from '@roadiehq/backstage-plugin-buildkite';
+export { plugin as Search } from '@backstage/plugin-search';