Release/2024.08.19

.gitignore

@@ -192,6 +192,9 @@ _TeamCity*
 
 # DotCover is a Code Coverage Tool
 *.dotCover
+dotCover.Output.html
+dotCover.Output/
+dotCover*/
 
 # Visual Studio code coverage results
 *.coverage
@@ -389,3 +392,7 @@ yarn.lock
 mongo/
 local.env
 manifests/local
+.angular/
+
+# Snyk Configs
+security-assistant.yml

MicrosoftTeamsJiraIntegration.sln

@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution items", "solution
 		README.md = README.md
 		stylecop.json = stylecop.json
 		StyleCop.ruleset = StyleCop.ruleset
+		security-assistant.yml = security-assistant.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicrosoftTeamsIntegration.Jira.Tests", "tests\MicrosoftTeamsIntegration.Jira.Tests\MicrosoftTeamsIntegration.Jira.Tests.csproj", "{ED25B1DA-5ACD-47BD-A4A7-CB38E1C006D2}"
@@ -76,9 +77,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "staging", "staging", "{AB3C
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "development", "development", "{0959885E-6EE5-4AF4-B996-B42F22B135E8}"
 	ProjectSection(SolutionItems) = preProject
-		manifests\server\development\color.png = manifests\server\development\color.png
 		manifests\server\development\manifest.json = manifests\server\development\manifest.json
 		manifests\server\development\outline.png = manifests\server\development\outline.png
+		manifests\server\development\color.png = manifests\server\development\color.png
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "production", "production", "{06AF2F23-D535-4D88-9C91-A34DEA181D40}"

README.md

@@ -1,15 +1,15 @@
-# Jira Server
+# Jira Data Center
 
 [![Atlassian license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat-square)](LICENSE) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](CONTRIBUTING.md)
 
-Official plugin for Jira Server that integrates with [Microsoft Teams](https://www.microsoft.com/en-ww/microsoft-teams/group-chat-software).
+Official plugin for Jira Data Center that integrates with [Microsoft Teams](https://www.microsoft.com/en-ww/microsoft-teams/group-chat-software).
 
 ## Usage
 
-Jira Server for Microsoft Teams brings your Jira Server experience into your collaboration environment, letting you and your team stay focused, communicate on issues and backlog. Interact with Jira Server bot for Microsoft Teams to: create, assign, watch, edit issues, log working time. You may also interact with the bot from your team channel. With the messaging extension, you can quickly search for a specific issue and submit it to a channel or conversation. With the actionable message, you can quickly create a new issue, pre-populated with message text as the issue description, or save the message as a comment on one of your Jira Server issues. Also, you can add your project backlog to your channel as a tab, so that your team could easily track and work on the issues within the tab. 
+Jira Data Center for Microsoft Teams brings your Jira Data Center experience into your collaboration environment, letting you and your team stay focused, communicate on issues and backlog. Interact with Jira Data Center bot for Microsoft Teams to: create, assign, watch, edit issues, log working time. You may also interact with the bot from your team channel. With the messaging extension, you can quickly search for a specific issue and submit it to a channel or conversation. With the actionable message, you can quickly create a new issue, pre-populated with message text as the issue description, or save the message as a comment on one of your Jira Data Center issues. Also, you can add your project backlog to your channel as a tab, so that your team could easily track and work on the issues within the tab. 
 Issue urls sent in a message to the group chat or team channel unfurl cards with context about the issue. The unfurl displays key information such as summary, status, priority, updated date, reporter, assignee and those values can be changed from the card directly. There are available 'Assigned to me’, ‘Reported by me’, ‘Watched by me’ and ‘My filters’ tabs by default but you also have a possibility to add a tab with a custom filter and save it.
 
-**Important:** To use messaging extension, bot, or tabs you’ll need to install Microsoft Teams for Jira Server add-on to your Jira Server. Make sure you have admin permissions within your Jira Server to be able to install and configure the add-on. Once the add-on is installed, the add-on will generate and assign a unique Jira ID to your Jira Server instance. Share the generated Jira ID with the team so that your teammates could connect Microsoft Teams to Jira. Jira Server connector for Microsoft Teams can be set up independently and doesn’t require add-on installation. Connector is using webhooks and can be configured directly from the Teams channel. Please note, that the webhook set-up in Jira requires Jira admin permissions. 
+**Important:** To use messaging extension, bot, or tabs you’ll need to install Microsoft Teams for Data Center add-on to your Data Center. Make sure you have admin permissions within your Data Center to be able to install and configure the add-on. Once the add-on is installed, the add-on will generate and assign a unique Jira ID to your Data Center instance. Share the generated Jira ID with the team so that your teammates could connect Microsoft Teams to Jira. Data Center connector for Microsoft Teams can be set up independently and doesn’t require add-on installation. Connector is using webhooks and can be configured directly from the Teams channel. Please note, that the webhook set-up in Jira requires Jira admin permissions. 
 
 ## Installation
 
@@ -126,11 +126,11 @@ In case you want to deploy the application later you need to do some additional
     - Go to Configuration section and add all configs from **Configuring** section above. As an option you can create [App Configuration](https://learn.microsoft.com/en-us/azure/azure-app-configuration/overview) resource and set all the configs there and the app service configuration will just keep App Configuration resource connection string. 
 1. Deploy your application to Web App resource
 
-### Install Jira Server app (add-on)
- 1. Install standalone Jira server is installed on your machine or you have installed Atlassian SDK (https://developer.atlassian.com/server/framework/atlassian-sdk/install-the-atlassian-sdk-on-a-windows-system/).
- 1. Create Jira Server add-on. See more details [here](https://github.com/atlassian-labs/msteams-jira-server-addon#readme).
- 1. Got to your local instance of Jira Server -> Settings -> Manage apps.
- 1. Click **Upload app** and select *.jar file of your Jira Server addon created previously.
+### Install Data Center app (add-on)
+ 1. Install standalone Data Center is installed on your machine or you have installed Atlassian SDK (https://developer.atlassian.com/server/framework/atlassian-sdk/install-the-atlassian-sdk-on-a-windows-system/).
+ 1. Create Data Center add-on. See more details [here](https://github.com/atlassian-labs/msteams-jira-server-addon#readme).
+ 1. Got to your local instance of Data Center -> Settings -> Manage apps.
+ 1. Click **Upload app** and select *.jar file of your Data Center addon created previously.
  1. Finish installation. Expand new app. All modules should be enabled.
  1. Press **Configure** and follow steps on the page.
 
@@ -151,12 +151,12 @@ Please visit a [link](https://www.msteams-atlassian.com/JiraServer/) to get more
 
 ## Tests
 
-All unit tests for Jira Server project are placed under MicrosoftTeamsIntegration.Jira.Tests. You can use Test Explorer in the Visual Studio IDE to run them and View test results. It displays the results in groups of Failed Tests, Passed Tests, Skipped Tests and Not Run Tests. The details pane at the bottom or side of the Test Explorer displays a summary of the test run.
+All unit tests for Data Center project are placed under MicrosoftTeamsIntegration.Jira.Tests. You can use Test Explorer in the Visual Studio IDE to run them and View test results. It displays the results in groups of Failed Tests, Passed Tests, Skipped Tests and Not Run Tests. The details pane at the bottom or side of the Test Explorer displays a summary of the test run.
 Another way to execute all tests is to run `dotnet test` command in the terminal from the project root folder.   
 
 ## Contributions
 
-Contributions to Jira Server are welcome! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for details. 
+Contributions to Data Center are welcome! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for details. 
 
 ## License
 

bitbucket-pipelines.yml

@@ -0,0 +1,190 @@
+#  Pipeline for building and publishing msteams-jira project
+image: atlassian/default-image:4
+
+options:
+  docker: true
+  size: 2x
+definitions:
+  services:
+    docker:
+      memory: 5000
+  steps:
+    - step: &dockerImage
+        name: Prepare custom Docker image
+        services:
+          - docker
+        caches:
+          - docker
+        script:
+          - pipe: atlassian/artifactory-sidekick:v1
+          - source .artifactory/activate.sh
+          - export IMG_TAG=docker.atl-paas.net/atlassian/netrunners/dotnet-node
+          - docker build --tag="$IMG_TAG" --file docker/Dockerfile .
+          - docker push "$IMG_TAG"
+    - step: &build
+        name: Build and Test
+        image:
+          name: docker-proxy.services.atlassian.com/atlassian/netrunners/dotnet-node
+          username: netrunners
+          password: $PIPELINES_JWT_TOKEN
+        caches:
+          - dotnetcore
+          - node
+        script:
+          # change project version
+          - PACKAGE_VERSION=$(date +%Y.%m.%d).$BITBUCKET_BUILD_NUMBER
+          - xmlstarlet edit -L -u /Project/PropertyGroup/Version -v ""$PACKAGE_VERSION"" $BITBUCKET_CLONE_DIR/src/MicrosoftTeamsIntegration.Jira/MicrosoftTeamsIntegration.Jira.csproj
+          - echo "`xmlstarlet sel -t -v /Project/PropertyGroup/Version $BITBUCKET_CLONE_DIR/src/MicrosoftTeamsIntegration.Jira/MicrosoftTeamsIntegration.Jira.csproj`"
+          # build source code
+          - REPORTS_PATH=./test-reports/build_$BITBUCKET_BUILD_NUMBER
+          - dotnet build -c Release
+          - dotnet test --no-build -c Release --logger:"junit;LogFilePath=$REPORTS_PATH/test-result.xml"
+    - step: &publish
+        name: Publish application
+        image:
+          name: docker-proxy.services.atlassian.com/atlassian/netrunners/dotnet-node
+          username: netrunners
+          password: $PIPELINES_JWT_TOKEN
+        script:
+          - dotnet publish -c Release -o 'publish'
+          - pushd ./publish; zip -r ../jira-$BITBUCKET_BUILD_NUMBER.zip .; popd
+        artifacts:
+          - jira-*.zip
+    - step: &deploy
+        name: Deploy application
+        deployment: Integration
+        script:
+          - pipe: atlassian/azure-web-apps-deploy:1.1.0
+            variables:
+              AZURE_APP_ID: $AZURE_APP_ID
+              AZURE_PASSWORD: $AZURE_PASSWORD
+              AZURE_TENANT_ID: $AZURE_TENANT_ID
+              AZURE_RESOURCE_GROUP: $AZURE_RESOURCE_GROUP
+              AZURE_APP_NAME: $AZURE_APP_NAME
+              ZIP_FILE: 'jira-$BITBUCKET_BUILD_NUMBER.zip'
+              SLOT: $AZURE_SLOT
+    - step: &manifests
+        name: Build manifests
+        image:
+          name: docker-proxy.services.atlassian.com/atlassian/netrunners/dotnet-node
+          username: netrunners
+          password: $PIPELINES_JWT_TOKEN
+        script:
+          - MANIFEST_VERSION=$(date +%Y.%m.%d)
+          - MANIFEST_ZIP_VERSION=$MANIFEST_VERSION.$BITBUCKET_BUILD_NUMBER
+          # Change version and zip integration sideload
+          - echo "`jq '.version="'"$MANIFEST_VERSION"'"' manifests/server/integration/manifest.json`" > manifests/server/integration/manifest.json
+          - pushd ./manifests/server/integration/; zip -r ./../../../Jira.Server.Sideload.$MANIFEST_ZIP_VERSION-Integration.zip .; popd
+          # Change version and zip staging sideload
+          - echo "`jq '.version="'"$MANIFEST_VERSION"'"' manifests/server/staging/manifest.json`" > manifests/server/staging/manifest.json
+          - pushd ./manifests/server/staging/; zip -r ./../../../Jira.Server.Sideload.$MANIFEST_ZIP_VERSION-Staging.zip .; popd
+          # Change version and zip production sideload
+          - echo "`jq '.version="'"$MANIFEST_VERSION"'"' manifests/server/production/manifest.json`" > manifests/server/production/manifest.json
+          - pushd ./manifests/server/production/; zip -r ./../../../Jira.Server.Sideload.$MANIFEST_ZIP_VERSION-Production.zip .; popd
+        artifacts:
+          - Jira.Server.Sideload*.zip
+    - step: &createTag
+        name: Create tag
+        script:
+          - TAG_NAME=$(echo "$BITBUCKET_BRANCH" | sed 's/release\///')
+          - echo "Creating new tag ${TAG_NAME}"
+          - git tag -am "Tag ${TAG_NAME}" $TAG_NAME
+          - git push origin $TAG_NAME
+    - step: &snyk-scan
+        name: Run Snyk scan
+        image:
+          name: docker-proxy.services.atlassian.com/atlassian/netrunners/dotnet-node
+          username: netrunners
+          password: $PIPELINES_JWT_TOKEN
+        script:
+          - pipe: atlassian/artifactory-sidekick:v1
+          - source .artifactory/activate.sh
+          # restore all dependencies before scan
+          - dotnet publish -c Release -o 'publish'
+          # install Snyk
+          - npm install -g snyk
+          # run Snyk monitor
+          - snyk monitor --all-projects
+    - step: &pushToGithub
+        name: Push changes to Github repo
+        script:
+          - git remote add github git@github.com:atlassian-labs/msteams-jira-server.git
+          - git push -u github ${BITBUCKET_BRANCH}
+          - git push github --follow-tags
+    - step: &staticAnalysis
+        name: Static analysis
+        image:
+          name: docker-proxy.services.atlassian.com/atlassian/netrunners/dotnet-node
+          username: netrunners
+          password: $PIPELINES_JWT_TOKEN
+        script:
+          - dotnet tool install --global dotnet-sonarscanner
+          - dotnet tool install --global JetBrains.dotCover.GlobalTool
+          - export PATH="$PATH:/root/.dotnet/tools"
+          - dotnet sonarscanner begin /k:"$SONAR_REPOSITORY" /d:sonar.host.url="$SONAR_URL"  /d:sonar.login="$SONAR_TOKEN" /d:sonar.cs.dotcover.reportsPaths=dotCover.Output.html /d:sonar.coverage.exclusions=src/**/ClientApp/**/*
+          - dotnet build --no-incremental
+          - dotnet dotcover test --dcReportType=HTML
+          - dotnet sonarscanner end /d:sonar.login="$SONAR_TOKEN"
+          - |
+            ENCODED_BRANCH=$(echo "$BITBUCKET_BRANCH" | jq -sRr @uri)
+            STATUS=$(curl -s -u $SONAR_TOKEN: "https://sonar-enterprise.internal.atlassian.com/api/qualitygates/project_status?projectKey=msteams-jira-onprem&branch=$ENCODED_BRANCH" | jq -r .projectStatus.status)
+            if [ "$STATUS" != "OK" ]; then
+               echo "Quality gate failed: https://sonar-enterprise.internal.atlassian.com/dashboard?branch=$ENCODED_BRANCH&id=msteams-jira-onprem"
+               exit 1
+            fi
+pipelines:
+  default:
+    - step:
+        <<: *dockerImage
+        condition:
+          changesets:
+            includePaths:
+              - 'docker/**'
+    - step: *build
+    - step: *staticAnalysis
+  custom:
+    buildDockerImage:
+      - step: *dockerImage
+    buildManifests:
+      - step: *manifests
+    createNewTag:
+      - step: *createTag
+    runSnyk:
+      - step: *snyk-scan
+    runSonar:
+      - step: *staticAnalysis
+  branches:
+      master:
+        - step: *build
+        - step: *staticAnalysis
+        - step: *publish
+        - step:
+            <<: *deploy
+            name: Deploy to integration
+            deployment: Integration
+        - step:
+            <<: *deploy
+            name: Deploy to staging
+            deployment: Staging
+            trigger: manual
+      release/*:
+        - step: *build
+        - step: *publish
+        - step:
+            <<: *deploy
+            name: Deploy to integration
+            deployment: Integration
+        - step:
+            <<: *deploy
+            name: Deploy to staging
+            deployment: Staging
+        - step:
+            <<: *deploy
+            name: Deploy to production
+            deployment: Production
+            trigger: manual
+        - step:
+            <<: *createTag
+            trigger: manual
+        - step:
+            <<: *pushToGithub

build/Lifetime.cs

@@ -31,8 +31,7 @@ public override void Setup(Context context)
             {
                 context.BuildNumber = "255.255.255.255";
             }
-
-            var type = context.Environment.GetEnvironmentVariable("IntegrationType");
+
             context.PackageNameFormat = $"JiraServer.{context.BuildNumber}.zip";
 
             var artifactDirectoryPath = context.EnvironmentVariable("BUILD_ARTIFACTSTAGINGDIRECTORY");

docker/Dockerfile

@@ -0,0 +1,12 @@
+FROM mcr.microsoft.com/dotnet/sdk:6.0
+
+RUN curl -sL https://deb.nodesource.com/setup_18.x  | bash -
+RUN apt-get -y install nodejs
+# install zip command to compress the output of build
+RUN apt-get -y install zip
+# install xmlstarlet command to edit XML files
+RUN apt-get -y install xmlstarlet
+# install jq command for processing JSON files
+RUN apt-get -y install jq
+# install jdk (needed by sonarqube dotnet tool)
+RUN apt-get install -y openjdk-17-jre