Skip to content

Commit db1909e

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/app/frontend/vite-4.5.2
2 parents 26fd000 + 05ad6a1 commit db1909e

File tree

163 files changed

+9267
-2408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+9267
-2408
lines changed

.devcontainer/devcontainer.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"image": "mcr.microsoft.com/devcontainers/java:1-17-bullseye",
44
"features": {
55
"azure-cli": "latest",
6-
"ghcr.io/azure/azure-dev/azd:latest": {},
6+
"ghcr.io/azure/azure-dev/azd:latest": {
7+
"version": "1.7.0"
8+
},
79
"ghcr.io/devcontainers/features/java:1": {
810
"version": "none",
911
"installMaven": true,
@@ -16,7 +18,15 @@
1618
"ghcr.io/devcontainers/features/git:1": {
1719
"version": "2.39.1"
1820
},
19-
"ghcr.io/devcontainers-contrib/features/typescript:2": {}
21+
"ghcr.io/devcontainers-contrib/features/typescript:2": {},
22+
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
23+
"version": "1.1.8"
24+
},
25+
"docker-in-docker": {
26+
"version": "latest",
27+
"moby": true,
28+
"dockerDashComposeVersion": "v1"
29+
}
2030
},
2131
"customizations": {
2232
"vscode": {

.github/workflows/app-ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
- name: Set environment for branch
2929
id: set-deploy-env
3030
run: |
31+
echo "checking branch name [$GITHUB_REF_NAME]"
3132
if [[ $GITHUB_REF_NAME == 'refs/heads/main' ]]; then
3233
echo "DEPLOY_ENVIRONMENT=Development" >> "$GITHUB_OUTPUT"
3334
elif [[ $GITHUB_REF_NAME == *'refs/heads/release'* ]]; then

.github/workflows/infra-ci.yaml

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- main
77
paths:
8-
- "infra/**"
8+
- "deploy/**"
99

1010
workflow_dispatch:
1111

@@ -16,6 +16,7 @@ on:
1616
permissions:
1717
id-token: write
1818
contents: read
19+
security-events: write
1920

2021
jobs:
2122
validate-bicep:
@@ -24,12 +25,35 @@ jobs:
2425
steps:
2526
- name: Checkout
2627
uses: actions/checkout@v4
27-
28-
- name: Build Bicep for linting
28+
- name: Filter Changes
29+
uses: dorny/paths-filter@v2
30+
id: changes
31+
with:
32+
filters: |
33+
app-service:
34+
- 'deploy/app-service/**'
35+
aks:
36+
- 'deploy/aks/**'
37+
aca:
38+
- 'deploy/aca/**'
39+
- name: Build App Service Bicep for linting
40+
if: steps.changes.outputs.app-service == 'true'
41+
uses: azure/CLI@v1
42+
with:
43+
inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f deploy/app-service/infra/main.bicep --stdout
44+
45+
- name: Build AKS Bicep for linting
46+
if: steps.changes.outputs.aks == 'true'
47+
uses: azure/CLI@v1
48+
with:
49+
inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f deploy/aks/infra/main.bicep --stdout
50+
51+
- name: Build ACA Bicep for linting
52+
if: steps.changes.outputs.aca == 'true'
2953
uses: azure/CLI@v1
3054
with:
31-
inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f infra/main.bicep --stdout
32-
55+
inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f deploy/aca/infra/main.bicep --stdout
56+
3357
- name: Run Microsoft Security DevOps Analysis
3458
uses: microsoft/security-devops-action@v1
3559
id: msdo

.github/workflows/nightly-jobs.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Nightly Jobs
1+
name: Nightly and CICD Jobs
22

33
on:
44
pull_request:
@@ -61,6 +61,12 @@ jobs:
6161
java-version: '17'
6262
cache: 'maven'
6363

64+
- name: Verify Indexer project
65+
run: |
66+
echo "Testing indexer project."
67+
cd ./app/indexer
68+
./mvnw test
69+
6470
- name: Build Spring Boot App
6571
run: |
6672
echo "Building Spring Boot app."

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,9 @@ cython_debug/
148148
# NPM
149149
npm-debug.log*
150150
node_modules
151-
static/
151+
static/
152+
153+
# Generated manifests
154+
app/backend/manifests/azd-env-configmap.yml
155+
deploy/aks/easyauth/config-output.md
156+
deploy/aks/easyauth/easyauth-ingress.yaml

.vscode/extensions.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"recommendations": [
3+
"ms-azuretools.vscode-azurefunctions",
4+
"vscjava.vscode-java-debug"
5+
]
6+
}

.vscode/launch.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "Attach to Java Functions",
6+
"type": "java",
7+
"request": "attach",
8+
"hostName": "127.0.0.1",
9+
"port": 5005,
10+
"preLaunchTask": "func: host start"
11+
}
12+
]
13+
}

.vscode/settings.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"azureFunctions.javaBuildTool": "maven",
3+
"azureFunctions.deploySubpath": "app/indexer/functions/target/azure-functions/indexer-blob-processor",
4+
"azureFunctions.projectLanguage": "Java",
5+
"azureFunctions.projectRuntime": "~4",
6+
"debug.internalConsoleOptions": "neverOpen",
7+
"azureFunctions.projectSubpath": "app/indexer/functions",
8+
"azureFunctions.preDeployTask": "package (functions)",
9+
"java.configuration.updateBuildConfiguration": "interactive"
10+
}

.vscode/tasks.json

Lines changed: 41 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,43 @@
11
{
2-
"version": "2.0.0",
3-
"tasks": [
4-
{
5-
"label": "Start App ",
6-
"type": "shell",
7-
"command": "${workspaceFolder}/app/start.sh",
8-
"windows": {
9-
"command": "pwsh ${workspaceFolder}/app/start.ps1"
10-
},
11-
"presentation": {
12-
"reveal": "always"
13-
},
14-
"options": {
15-
"cwd": "${workspaceFolder}/app"
16-
},
17-
"problemMatcher": []
18-
}
19-
]
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "Start App ",
6+
"type": "shell",
7+
"command": "${workspaceFolder}/app/start.sh",
8+
"windows": {
9+
"command": "pwsh ${workspaceFolder}/app/start.ps1"
10+
},
11+
"presentation": {
12+
"reveal": "always"
13+
},
14+
"options": {
15+
"cwd": "${workspaceFolder}/app"
16+
},
17+
"problemMatcher": []
18+
},
19+
{
20+
"type": "func",
21+
"label": "func: host start",
22+
"command": "host start",
23+
"problemMatcher": "$func-java-watch",
24+
"isBackground": true,
25+
"options": {
26+
"cwd": "${workspaceFolder}/app/indexer/functions/target/azure-functions/indexer-blob-processor"
27+
},
28+
"dependsOn": "package (functions)"
29+
},
30+
{
31+
"label": "package (functions)",
32+
"command": "mvn clean package",
33+
"type": "shell",
34+
"group": {
35+
"kind": "build",
36+
"isDefault": true
37+
},
38+
"options": {
39+
"cwd": "${workspaceFolder}/app/indexer/functions"
40+
}
41+
}
42+
]
2043
}

0 commit comments

Comments
 (0)