From: Mathieu Suen <mathieu.suen@sonarsource.com>
Date: Mon, 14 Jun 2021 08:40:01 +0000 (+0200)
Subject: SONAR-14968 Enable Azure- pipeline for project bind to GitHub
X-Git-Tag: 9.0.0.45539~109
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=81281c2cf6b4a59ae74e8ad3d5e129f65770e9fe;p=sonarqube.git

SONAR-14968 Enable Azure- pipeline for project bind to GitHub
---

diff --git a/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx b/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx
index b724e53b3b6..f9f1f519411 100644
--- a/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx
@@ -55,6 +55,9 @@ export default function TutorialSelectionRenderer(props: TutorialSelectionRender
     return <i className="spinner" />;
   }
 
+  const isAzureAvailable =
+    projectBinding && [AlmKeys.Azure, AlmKeys.GitHub].includes(projectBinding.alm);
+
   const jenkinsAvailable =
     projectBinding &&
     [AlmKeys.BitbucketCloud, AlmKeys.BitbucketServer, AlmKeys.GitHub, AlmKeys.GitLab].includes(
@@ -105,7 +108,7 @@ export default function TutorialSelectionRenderer(props: TutorialSelectionRender
               </button>
             )}
 
-            {projectBinding?.alm === AlmKeys.Azure && (
+            {isAzureAvailable && (
               <button
                 className="button button-huge display-flex-column spacer-left spacer-right azure-pipelines"
                 onClick={() => props.onSelectTutorial(TutorialModes.AzurePipelines)}
diff --git a/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelectionRenderer-test.tsx b/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelectionRenderer-test.tsx
index 9004e285279..74460e6a4a4 100644
--- a/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelectionRenderer-test.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelectionRenderer-test.tsx
@@ -104,6 +104,9 @@ it('should allow mode selection for Github', () => {
 
   click(wrapper.find('button.tutorial-mode-github'));
   expect(onSelectTutorial).toHaveBeenLastCalledWith(TutorialModes.GitHubActions);
+
+  click(wrapper.find('button.azure-pipelines'));
+  expect(onSelectTutorial).toHaveBeenLastCalledWith(TutorialModes.AzurePipelines);
 });
 
 it('should allow mode selection for GitLab', () => {
diff --git a/server/sonar-web/src/main/js/components/tutorials/__tests__/__snapshots__/TutorialSelectionRenderer-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/__tests__/__snapshots__/TutorialSelectionRenderer-test.tsx.snap
index 417a8bc52a7..4a76b4a6316 100644
--- a/server/sonar-web/src/main/js/components/tutorials/__tests__/__snapshots__/TutorialSelectionRenderer-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/__tests__/__snapshots__/TutorialSelectionRenderer-test.tsx.snap
@@ -142,6 +142,22 @@ exports[`should render correctly for github 1`] = `
           onboarding.tutorial.choose_method.github_action
         </div>
       </button>
+      <button
+        className="button button-huge display-flex-column spacer-left spacer-right azure-pipelines"
+        onClick={[Function]}
+        type="button"
+      >
+        <img
+          alt=""
+          height={80}
+          src="/images/tutorials/azure-pipelines.svg"
+        />
+        <div
+          className="medium big-spacer-top"
+        >
+          onboarding.tutorial.choose_method.azure_pipelines
+        </div>
+      </button>
       <button
         className="button button-huge display-flex-column spacer-left spacer-right tutorial-mode-jenkins"
         onClick={[Function]}
diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/AzurePipelinesTutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/AzurePipelinesTutorial.tsx
index e7ab59b267d..b26c2ca52b6 100644
--- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/AzurePipelinesTutorial.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/AzurePipelinesTutorial.tsx
@@ -23,6 +23,7 @@ import { Alert } from 'sonar-ui-common/components/ui/Alert';
 import { translate } from 'sonar-ui-common/helpers/l10n';
 import {
   isProjectAzureBindingResponse,
+  isProjectGitHubBindingResponse,
   ProjectAlmBindingResponse
 } from '../../../types/alm-settings';
 import Step from '../components/Step';
@@ -58,7 +59,10 @@ export default function AzurePipelinesTutorial(props: AzurePipelinesTutorialProp
   const [isCurrentStepValid, setIsCurrentStepValid] = React.useState(false);
 
   // Failsafe; should never happen.
-  if (!isProjectAzureBindingResponse(projectBinding)) {
+  if (
+    !isProjectAzureBindingResponse(projectBinding) &&
+    !isProjectGitHubBindingResponse(projectBinding)
+  ) {
     return (
       <Alert variant="error">
         {translate('onboarding.tutorial.with.azure_pipelines.unsupported')}
diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/AzurePipelinesTutorial-test.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/AzurePipelinesTutorial-test.tsx
index 1ff63b59569..8446de30e38 100644
--- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/AzurePipelinesTutorial-test.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/AzurePipelinesTutorial-test.tsx
@@ -23,7 +23,8 @@ import { Button } from 'sonar-ui-common/components/controls/buttons';
 import { click } from 'sonar-ui-common/helpers/testUtils';
 import {
   mockProjectAzureBindingResponse,
-  mockProjectGithubBindingResponse
+  mockProjectGithubBindingResponse,
+  mockProjectGitLabBindingResponse
 } from '../../../../helpers/mocks/alm-settings';
 import { mockComponent, mockLoggedInUser } from '../../../../helpers/testMocks';
 import Step from '../../components/Step';
@@ -45,6 +46,9 @@ it('should render correctly', () => {
       .dive()
   ).toMatchSnapshot('last-step-wrapper');
   expect(shallowRender({ projectBinding: mockProjectGithubBindingResponse() })).toMatchSnapshot(
+    'for github'
+  );
+  expect(shallowRender({ projectBinding: mockProjectGitLabBindingResponse() })).toMatchSnapshot(
     'wrong alm'
   );
 });
diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/__snapshots__/AzurePipelinesTutorial-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/__snapshots__/AzurePipelinesTutorial-test.tsx.snap
index 84e32877db7..a239f3584c8 100644
--- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/__snapshots__/AzurePipelinesTutorial-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/__snapshots__/AzurePipelinesTutorial-test.tsx.snap
@@ -86,6 +86,56 @@ exports[`should render correctly: first-step-wrapper 1`] = `
 </div>
 `;
 
+exports[`should render correctly: for github 1`] = `
+<Fragment>
+  <div
+    className="page-header big-spacer-bottom"
+  >
+    <h1
+      className="page-title"
+    >
+      onboarding.tutorial.with.azure_pipelines.title
+    </h1>
+  </div>
+  <Step
+    finished={false}
+    key="0"
+    onOpen={[Function]}
+    open={true}
+    renderForm={[Function]}
+    stepNumber={1}
+    stepTitle="onboarding.tutorial.with.azure_pipelines.ExtensionInstallation.title"
+  />
+  <Step
+    finished={false}
+    key="1"
+    onOpen={[Function]}
+    open={false}
+    renderForm={[Function]}
+    stepNumber={2}
+    stepTitle="onboarding.tutorial.with.azure_pipelines.ServiceEndpoint.title"
+  />
+  <Step
+    finished={false}
+    key="2"
+    onOpen={[Function]}
+    open={false}
+    renderForm={[Function]}
+    stepNumber={3}
+    stepTitle="onboarding.tutorial.with.azure_pipelines.BranchAnalysis.title"
+  />
+  <Step
+    finished={false}
+    key="3"
+    onOpen={[Function]}
+    open={false}
+    renderForm={[Function]}
+    stepNumber={4}
+    stepTitle="onboarding.tutorial.with.azure_pipelines.SaveAndRun.title"
+  />
+</Fragment>
+`;
+
 exports[`should render correctly: last-step-wrapper 1`] = `
 <div
   className="boxed-group onboarding-step"
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 5b17e930f42..26ba84a1c1e 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -3742,7 +3742,7 @@ onboarding.tutorial.with.jenkins.jenkinsfile.other.step3.help2.sentence.name=Nam
 
 onboarding.tutorial.with.azure_pipelines.os=What is your agent host?
 onboarding.tutorial.with.azure_pipelines.title=Analyze your project with Azure DevOps Pipelines
-onboarding.tutorial.with.azure_pipelines.unsupported=This tutorial is only available for projects bound to Azure DevOps.
+onboarding.tutorial.with.azure_pipelines.unsupported=This tutorial is only available for projects bound to Azure DevOps or GitHub.
 onboarding.tutorial.with.azure_pipelines.ExtensionInstallation.title=Install SonarQube extension for Azure DevOps
 onboarding.tutorial.with.azure_pipelines.ExtensionInstallation.sentence=From your Azure DevOps instance, navigate to the Visual Studio Marketplace and install the {link} by clicking the {button} button.
 onboarding.tutorial.with.azure_pipelines.ExtensionInstallation.sentence.link=SonarQube extension