Skip to content

Hotfix to main branch #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 71 commits into from
Apr 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
33147d6
Vertically align landing page
Apr 3, 2025
f360316
added github files
Apr 3, 2025
512e0ee
Merge pull request #51 from Shreyas-Microsoft/main
Roopan-Microsoft Apr 3, 2025
04da7af
edit 3
Apr 3, 2025
4974cc8
Build Docker image and push to container registry
Priyanka-Microsoft Apr 3, 2025
1f517cd
Merge pull request #54 from microsoft/feature/build-docker-image-push…
Roopan-Microsoft Apr 3, 2025
f6cd758
Merge pull request #53 from microsoft/psl-GithubAction
Roopan-Microsoft Apr 3, 2025
c6a5b8d
skip docker login on push
Priyanka-Microsoft Apr 3, 2025
02ae053
removed debug step
Priyanka-Microsoft Apr 3, 2025
6adecb5
Merge pull request #55 from microsoft/fix/skip-docker-login-on-push
Roopan-Microsoft Apr 3, 2025
b14199a
feat: added one click deployment github action pipeline
Prashant-Microsoft Apr 4, 2025
e182cff
pylint issues fixed
Apr 7, 2025
550beb0
edit 2
Apr 7, 2025
cdc9d30
Merge pull request #59 from microsoft/hotfix-pylintfix
Roopan-Microsoft Apr 7, 2025
7c46967
Merge remote-tracking branch 'origin/hotfix' into PSL-US-15918
Prashant-Microsoft Apr 7, 2025
c418739
Merge pull request #57 from microsoft/PSL-US-15918
Roopan-Microsoft Apr 7, 2025
ff3d973
resolved bug:15313
VishalS-Microsoft Apr 7, 2025
d880886
Merge pull request #61 from microsoft/psl-bug-15313
Roopan-Microsoft Apr 7, 2025
8672990
added api_test.py
Apr 9, 2025
4ffa2af
added conftest.py
Apr 9, 2025
7e0937c
solved pylint issue of api_test.py
Apr 9, 2025
98e122f
feat: added unit test cases for cosmosdb_test.py file
Prashant-Microsoft Apr 11, 2025
3e090de
feat: added unit test cases for config.py, database_base.py, database…
VishalS-Microsoft Apr 11, 2025
d25c583
Merge branch 'psl-backend-unit-test' of https://github.com/microsoft/…
VishalS-Microsoft Apr 11, 2025
da3abdf
Merge branch 'main' into hotfix
Roopan-Microsoft Apr 14, 2025
667d880
fix: removed duplicate import
Prashant-Microsoft Apr 15, 2025
e09573d
Consistent agent naming
Apr 15, 2025
1525f73
fix: pylint fixes
Prashant-Microsoft Apr 15, 2025
5f7c252
fix: pylint fix
Prashant-Microsoft Apr 15, 2025
6f1032a
fix: pylint fixes
Prashant-Microsoft Apr 15, 2025
9b0194b
Merge pull request #73 from microsoft/PSL-TASK-17089
Roopan-Microsoft Apr 15, 2025
365738c
Merge down from hotfix
Apr 15, 2025
c5a3c23
Merge pull request #74 from microsoft/psl-bug-15446-agent-names
Roopan-Microsoft Apr 15, 2025
13c7916
resolved bug:15142
VishalS-Microsoft Apr 15, 2025
397ac23
pylint issue fix
VishalS-Microsoft Apr 15, 2025
fdc6481
updated batch_service_test.py
Apr 15, 2025
0400a99
Merge pull request #75 from microsoft/psl-bug-15142
Roopan-Microsoft Apr 16, 2025
ab2e4f0
feat: scheduled one click deployment for twice a day
Prashant-Microsoft Apr 17, 2025
46790a0
Merge pull request #76 from microsoft/PSL-US-17018
Roopan-Microsoft Apr 17, 2025
0533dc8
fix: disable purge protection of key vault
Prashant-Microsoft Apr 17, 2025
52e55ad
feat: updated main.json file
Prashant-Microsoft Apr 21, 2025
28f55d5
Merge pull request #81 from microsoft/PSL-US-17010
Roopan-Microsoft Apr 22, 2025
1bfbef0
added app_test file
Apr 22, 2025
dfe155e
editing test workflow
Apr 22, 2025
e6ff115
Merge remote-tracking branch 'origin/hotfix' into psl-backend-unit-test
Prashant-Microsoft Apr 22, 2025
4a51e3b
Merge branch 'psl-backend-unit-test' of https://github.com/microsoft/…
Prashant-Microsoft Apr 22, 2025
ad088a2
updated batch-service-test
Apr 22, 2025
3869570
Merge branch 'psl-backend-unit-test' of https://github.com/microsoft/…
Apr 22, 2025
6589e79
Merge branch 'main' into hotfix
Roopan-Microsoft Apr 22, 2025
e8a1de7
main json updated
Roopan-Microsoft Apr 22, 2025
70a1ec2
added AzureAIAgent path
Kanchan-Microsoft Apr 23, 2025
132d029
Merge branch 'psl-backend-unit-test' of https://github.com/microsoft/…
Kanchan-Microsoft Apr 23, 2025
9ed8584
edit
Kanchan-Microsoft Apr 23, 2025
61517c0
added agent_config file
Apr 23, 2025
9dd8526
updated import path
Apr 23, 2025
85cfeea
edit2
Apr 23, 2025
ba5a529
edit workflow
Apr 23, 2025
10d636c
bring consistency for cancel behaviour
Apr 23, 2025
7085a79
edited file path
Apr 24, 2025
fa9dfe8
app_logger
Kanchan-Microsoft Apr 24, 2025
d94f66e
edit
Kanchan-Microsoft Apr 24, 2025
be46496
Pylint issue fix
VishalS-Microsoft Apr 24, 2025
89fed7a
fixed app_logger.py test cases and pylint issue.
VishalS-Microsoft Apr 24, 2025
06eca57
feat: updated unit test cases for cosmosdb_test file
Prashant-Microsoft Apr 24, 2025
204deae
fix: pylint issues of cosmosdb_test file
Prashant-Microsoft Apr 24, 2025
cd098d4
feat: added pytest-mock package
Prashant-Microsoft Apr 24, 2025
1003610
fixed blob_base.py and blob_factory.py file test cases
VishalS-Microsoft Apr 24, 2025
4cedd0f
removed psl-backend-unit-test line
VishalS-Microsoft Apr 24, 2025
fdb0ca1
Merge pull request #84 from microsoft/psl-backend-unit-test
Roopan-Microsoft Apr 24, 2025
911518d
Merge pull request #83 from microsoft/psl-bug-modalConsistency
Roopan-Microsoft Apr 24, 2025
add28a4
Merge branch 'main' into hotfix
Roopan-Microsoft Apr 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[flake8]
max-line-length = 88
extend-ignore = E501
exclude = .venv, frontend
ignore = E203, W503, G004, G200,B008,ANN,D100,D101,D102,D103,D104,D105,D106,D107,D205,D400,D401,D200
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Lines starting with '#' are comments.
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in the repo.
* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @aniaroramsft @marktayl1 @Vinay-Microsoft
45 changes: 45 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

# Describe the bug
A clear and concise description of what the bug is.

# Expected behavior
A clear and concise description of what you expected to happen.

# How does this bug make you feel?
_Share a gif from [giphy](https://giphy.com/) to tells us how you'd feel_

---

# Debugging information

## Steps to reproduce
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

## Screenshots
If applicable, add screenshots to help explain your problem.

## Logs

If applicable, add logs to help the engineer debug the problem.

---

# Tasks

_To be filled in by the engineer picking up the issue_

- [ ] Task 1
- [ ] Task 2
- [ ] ...
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: ''

---

# Motivation

A clear and concise description of why this feature would be useful and the value it would bring.
Explain any alternatives considered and why they are not sufficient.

# How would you feel if this feature request was implemented?

_Share a gif from [giphy](https://giphy.com/) to tells us how you'd feel. Format: ![alt_text](https://media.giphy.com/media/xxx/giphy.gif)_

# Requirements

A list of requirements to consider this feature delivered
- Requirement 1
- Requirement 2
- ...

# Tasks

_To be filled in by the engineer picking up the issue_

- [ ] Task 1
- [ ] Task 2
- [ ] ...
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/subtask.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Sub task
about: A sub task
title: ''
labels: subtask
assignees: ''

---

Required by <link to parent issue>

# Description

A clear and concise description of what this subtask is.

# Tasks

_To be filled in by the engineer picking up the subtask

- [ ] Task 1
- [ ] Task 2
- [ ] ...
39 changes: 39 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
## Purpose
<!-- Describe the intention of the changes being proposed. What problem does it solve or functionality does it add? -->
* ...

## Does this introduce a breaking change?
<!-- Mark one with an "x". -->

- [ ] Yes
- [ ] No

<!-- Please prefix your PR title with one of the following:
* `feat`: A new feature
* `fix`: A bug fix
* `docs`: Documentation only changes
* `style`: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
* `refactor`: A code change that neither fixes a bug nor adds a feature
* `perf`: A code change that improves performance
* `test`: Adding missing tests or correcting existing tests
* `build`: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
* `ci`: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
* `chore`: Other changes that don't modify src or test files
* `revert`: Reverts a previous commit
* !: A breaking change is indicated with a `!` after the listed prefixes above, e.g. `feat!`, `fix!`, `refactor!`, etc.
-->

## Golden Path Validation
- [ ] I have tested the primary workflows (the "golden path") to ensure they function correctly without errors.

## Deployment Validation
- [ ] I have validated the deployment process successfully and all services are running as expected with this change.

## What to Check
Verify that the following are valid
* ...

## Other Information

<!-- Add any other helpful information that may be needed here. -->

38 changes: 38 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
version: 2
updates:
# GitHub Actions dependencies
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
commit-message:
prefix: "build"
target-branch: "dependabotchanges"
open-pull-requests-limit: 100

- package-ecosystem: "pip"
directory: "/src/backend"
schedule:
interval: "monthly"
commit-message:
prefix: "build"
target-branch: "dependabotchanges"
open-pull-requests-limit: 100

- package-ecosystem: "pip"
directory: "/src/frontend"
schedule:
interval: "monthly"
commit-message:
prefix: "build"
target-branch: "dependabotchanges"
open-pull-requests-limit: 100

- package-ecosystem: "npm"
directory: "/src/frontend"
schedule:
interval: "monthly"
commit-message:
prefix: "build"
target-branch: "dependabotchanges"
open-pull-requests-limit: 100
65 changes: 65 additions & 0 deletions .github/workflows/Create-Release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
on:
push:
branches:
- main

permissions:
contents: write
pull-requests: write

name: Create-Release

jobs:
create-release:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.workflow_run.head_sha }}

- uses: codfish/semantic-release-action@v3
id: semantic
with:
tag-format: 'v${version}'
additional-packages: |
['conventional-changelog-conventionalcommits@7']
plugins: |
[
[
"@semantic-release/commit-analyzer",
{
"preset": "conventionalcommits"
}
],
[
"@semantic-release/release-notes-generator",
{
"preset": "conventionalcommits",
"presetConfig": {
"types": [
{ type: 'feat', section: 'Features', hidden: false },
{ type: 'fix', section: 'Bug Fixes', hidden: false },
{ type: 'perf', section: 'Performance Improvements', hidden: false },
{ type: 'revert', section: 'Reverts', hidden: false },
{ type: 'docs', section: 'Other Updates', hidden: false },
{ type: 'style', section: 'Other Updates', hidden: false },
{ type: 'chore', section: 'Other Updates', hidden: false },
{ type: 'refactor', section: 'Other Updates', hidden: false },
{ type: 'test', section: 'Other Updates', hidden: false },
{ type: 'build', section: 'Other Updates', hidden: false },
{ type: 'ci', section: 'Other Updates', hidden: false }
]
}
}
],
'@semantic-release/github'
]
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}
- run: echo ${{ steps.semantic.outputs.release-version }}

- run: echo "$OUTPUTS"
env:
OUTPUTS: ${{ toJson(steps.semantic.outputs) }}

43 changes: 43 additions & 0 deletions .github/workflows/build-docker-images.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Build Docker and Optional Push

on:
push:
branches:
- main
- dev
- demo
- hotfix
pull_request:
branches:
- main
- dev
- demo
- hotfix
types:
- opened
- ready_for_review
- reopened
- synchronize
merge_group:
workflow_dispatch:

jobs:
docker-build:
strategy:
matrix:
include:
- app_name: cmsabackend
dockerfile: docker/Backend.Dockerfile
password_secret: DOCKER_PASSWORD
- app_name: cmsafrontend
dockerfile: docker/Frontend.Dockerfile
password_secret: DOCKER_PASSWORD
uses: ./.github/workflows/build-docker.yml
with:
registry: cmsacontainerreg.azurecr.io
username: cmsacontainerreg
password_secret: ${{ matrix.password_secret }}
app_name: ${{ matrix.app_name }}
dockerfile: ${{ matrix.dockerfile }}
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }}
secrets: inherit
76 changes: 76 additions & 0 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Reusable Docker build and push workflow

on:
workflow_call:
inputs:
registry:
required: true
type: string
username:
required: true
type: string
password_secret:
required: true
type: string
app_name:
required: true
type: string
dockerfile:
required: true
type: string
push:
required: true
type: boolean
secrets:
DOCKER_PASSWORD:
required: true

jobs:
docker-build:
runs-on: ubuntu-latest
steps:

- name: Checkout
uses: actions/checkout@v4

- name: Docker Login
if: ${{ inputs.push }}
uses: docker/login-action@v3
with:
registry: ${{ inputs.registry }}
username: ${{ inputs.username }}
password: ${{ secrets[inputs.password_secret] }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Get current date
id: date
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT

- name: Determine Tag Name Based on Branch
id: determine_tag
run: |
if [[ "${{ github.ref_name }}" == "main" ]]; then
echo "tagname=latest" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
echo "tagname=dev" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref_name }}" == "demo" ]]; then
echo "tagname=demo" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref_name }}" == "hotfix" ]]; then
echo "tagname=hotfix" >> $GITHUB_OUTPUT
else
echo "tagname=default" >> $GITHUB_OUTPUT
fi


- name: Build Docker Image and optionally push
uses: docker/build-push-action@v6
with:
context: .
file: ${{ inputs.dockerfile }}
push: ${{ inputs.push }}
cache-from: type=registry,ref=${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.determine_tag.outputs.tagname }}
tags: |
${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.determine_tag.outputs.tagname }}
${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}
Loading