Merge pull request #2157 from spotify/freben/azure-fixup

chore(register-component): just a few little tweaks

plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.test.tsx

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+import { cleanup, fireEvent, render } from '@testing-library/react';
 import React from 'react';
-import { render, fireEvent, cleanup } from '@testing-library/react';
-import RegisterComponentForm, { Props } from './RegisterComponentForm';
 import { act } from 'react-dom/test-utils';
+import RegisterComponentForm, { Props } from './RegisterComponentForm';
 
 const setup = (props?: Partial<Props>) => {
   return {
@@ -37,7 +37,7 @@ describe('RegisterComponentForm', () => {
     const { rendered } = setup();
     expect(
       await rendered.findByText(
-        'Enter the full path to the component.yaml file in GitHub, GitLab, Bitbucket or Azure to start tracking your component. For private repo provide authentication information via config.',
+        'Enter the full path to the component.yaml file in GitHub, GitLab, Bitbucket or Azure to start tracking your component.',
       ),
     ).toBeInTheDocument();
 

plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.tsx

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-import React, { FC } from 'react';
+import { BackstageTheme } from '@backstage/theme';
 import {
   Button,
   FormControl,
   FormHelperText,
-  TextField,
   LinearProgress,
+  TextField,
 } from '@material-ui/core';
-import { useForm } from 'react-hook-form';
 import { makeStyles } from '@material-ui/core/styles';
-import { BackstageTheme } from '@backstage/theme';
+import React, { FC } from 'react';
+import { useForm } from 'react-hook-form';
 import { ComponentIdValidators } from '../../util/validate';
 
 const useStyles = makeStyles<BackstageTheme>(theme => ({
@@ -71,7 +71,7 @@ const RegisterComponentForm: FC<Props> = ({ onSubmit, submitting }) => {
           name="componentLocation"
           required
           margin="normal"
-          helperText="Enter the full path to the component.yaml file in GitHub, GitLab, Bitbucket or Azure to start tracking your component. For private repo provide authentication information via config."
+          helperText="Enter the full path to the component.yaml file in GitHub, GitLab, Bitbucket or Azure to start tracking your component."
           inputRef={register({
             required: true,
             validate: ComponentIdValidators,

plugins/register-component/src/util/validate.ts

@@ -19,6 +19,6 @@ export const ComponentIdValidators = {
     (typeof value === 'string' && value.match(/^https:\/\//) !== null) ||
     'Must start with https://.',
   yamlValidator: (value: any) =>
-    (typeof value === 'string' && value.match(/.yaml/) !== null) ||
+    (typeof value === 'string' && value.match(/\.yaml/) !== null) ||
     "Must contain '.yaml'.",
 };