From 4986d524e7b35a4e38895820239548fcc0c889e0 Mon Sep 17 00:00:00 2001 From: dantelmomsft Date: Thu, 21 Mar 2024 11:43:45 +0100 Subject: [PATCH] Release 1.2.0 fix --- .github/workflows/nightly-jobs.yaml | 38 +++++++++++++++++++--- app/backend/pom.xml | 2 +- app/frontend/package-lock.json | 7 ++-- app/frontend/package.json | 2 +- app/indexer/cli/dependency-reduced-pom.xml | 2 +- app/indexer/cli/pom.xml | 4 +-- app/indexer/core/pom.xml | 2 +- app/indexer/functions/pom.xml | 17 ++++++---- app/indexer/microservice/pom.xml | 4 +-- app/indexer/pom.xml | 3 +- deploy/aca/azure.yaml | 2 +- deploy/aks/azure.yaml | 2 +- docs/app-service/README-App-Service.md | 1 + 13 files changed, 58 insertions(+), 28 deletions(-) diff --git a/.github/workflows/nightly-jobs.yaml b/.github/workflows/nightly-jobs.yaml index 3b19e00..7170975 100644 --- a/.github/workflows/nightly-jobs.yaml +++ b/.github/workflows/nightly-jobs.yaml @@ -7,19 +7,47 @@ on: - cron: '0 0 * * *' # Run at midnight every day workflow_dispatch: +permissions: + id-token: write + contents: read + security-events: write + jobs: - infra: + validate-bicep: name: "Infra Biceps Validation" runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 - - - name: Build Bicep for linting + - name: Filter Changes + uses: dorny/paths-filter@v2 + id: changes + with: + filters: | + app-service: + - 'deploy/app-service/**' + aks: + - 'deploy/aks/**' + aca: + - 'deploy/aca/**' + - name: Build App Service Bicep for linting + if: steps.changes.outputs.app-service == 'true' + uses: azure/CLI@v1 + with: + inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f deploy/app-service/infra/main.bicep --stdout + + - name: Build AKS Bicep for linting + if: steps.changes.outputs.aks == 'true' + uses: azure/CLI@v1 + with: + inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f deploy/aks/infra/main.bicep --stdout + + - name: Build ACA Bicep for linting + if: steps.changes.outputs.aca == 'true' uses: azure/CLI@v1 with: - inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f infra/main.bicep --stdout - + inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f deploy/aca/infra/main.bicep --stdout + - name: Run Microsoft Security DevOps Analysis uses: microsoft/security-devops-action@v1 id: msdo diff --git a/app/backend/pom.xml b/app/backend/pom.xml index 7095793..f7ba716 100644 --- a/app/backend/pom.xml +++ b/app/backend/pom.xml @@ -10,7 +10,7 @@ com.microsoft.openai.samples.rag search-demo-java - 1.2.0-SNAPSHOT + 1.2.0 openai-search-demo-java This sample demonstrates a few approaches for creating ChatGPT-like experiences over your own data using the Retrieval Augmented Generation pattern diff --git a/app/frontend/package-lock.json b/app/frontend/package-lock.json index 2d9831f..98e1c3e 100644 --- a/app/frontend/package-lock.json +++ b/app/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "frontend", - "version": "0.0.0", + "version": "1.2.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "frontend", - "version": "0.0.0", + "version": "1.2.0", "dependencies": { "@azure/msal-browser": "^3.1.0", "@azure/msal-react": "^2.0.4", @@ -29,7 +29,6 @@ "prettier": "^3.0.3", "typescript": "^5.2.2", "vite": "^4.5.2" - }, "engines": { "node": ">=14.0.0" @@ -3256,7 +3255,6 @@ "version": "4.5.2", "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", - "dev": true, "dependencies": { "esbuild": "^0.18.10", @@ -5576,7 +5574,6 @@ "version": "4.5.2", "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", - "dev": true, "requires": { "esbuild": "^0.18.10", diff --git a/app/frontend/package.json b/app/frontend/package.json index 5561550..5f76f81 100644 --- a/app/frontend/package.json +++ b/app/frontend/package.json @@ -1,7 +1,7 @@ { "name": "frontend", "private": true, - "version": "0.0.0", + "version": "1.2.0", "type": "module", "engines": { "node": ">=14.0.0" diff --git a/app/indexer/cli/dependency-reduced-pom.xml b/app/indexer/cli/dependency-reduced-pom.xml index 55bc9ce..05159a6 100644 --- a/app/indexer/cli/dependency-reduced-pom.xml +++ b/app/indexer/cli/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ indexer-parent com.microsoft.openai.samples - 1.2.0-SNAPSHOT + 1.2.0 4.0.0 indexer-cli diff --git a/app/indexer/cli/pom.xml b/app/indexer/cli/pom.xml index b984552..34bf77d 100644 --- a/app/indexer/cli/pom.xml +++ b/app/indexer/cli/pom.xml @@ -7,7 +7,7 @@ com.microsoft.openai.samples indexer-parent - 1.2.0-SNAPSHOT + 1.2.0 ../pom.xml @@ -22,7 +22,7 @@ com.microsoft.openai.samples indexer-core - 1.2.0-SNAPSHOT + 1.2.0 diff --git a/app/indexer/core/pom.xml b/app/indexer/core/pom.xml index 945c7c7..ba1e78b 100644 --- a/app/indexer/core/pom.xml +++ b/app/indexer/core/pom.xml @@ -7,7 +7,7 @@ com.microsoft.openai.samples indexer-parent - 1.2.0-SNAPSHOT + 1.2.0 ../pom.xml diff --git a/app/indexer/functions/pom.xml b/app/indexer/functions/pom.xml index 749253d..d965899 100644 --- a/app/indexer/functions/pom.xml +++ b/app/indexer/functions/pom.xml @@ -6,13 +6,13 @@ com.microsoft.openai.samples indexer-parent - 1.2.0-SNAPSHOT + 1.2.0 ../pom.xml indexer-functions - 1.0-SNAPSHOT + 1.0 @@ -31,7 +31,7 @@ com.microsoft.openai.samples indexer-core - 1.0-SNAPSHOT + 1.2.0 @@ -47,16 +47,18 @@ ${project.build.sourceEncoding} + - + ${env.INDEXER_FUNCTIONAPP_NAME} - - + ${env.AZURE_RESOURCE_GROUP} @@ -74,6 +76,7 @@ + maven-clean-plugin diff --git a/app/indexer/microservice/pom.xml b/app/indexer/microservice/pom.xml index 1620f90..b8b868f 100644 --- a/app/indexer/microservice/pom.xml +++ b/app/indexer/microservice/pom.xml @@ -11,7 +11,7 @@ com.microsoft.openai.samples indexer-microservice - 1.2.0-SNAPSHOT + 1.2.0 @@ -41,7 +41,7 @@ com.microsoft.openai.samples indexer-core - 1.2.0-SNAPSHOT + 1.2.0 org.springframework.boot diff --git a/app/indexer/pom.xml b/app/indexer/pom.xml index 90bd6a7..96f9faa 100644 --- a/app/indexer/pom.xml +++ b/app/indexer/pom.xml @@ -6,7 +6,7 @@ com.microsoft.openai.samples indexer-parent - 1.2.0-SNAPSHOT + 1.2.0 pom @@ -25,6 +25,7 @@ core cli microservice + functions diff --git a/deploy/aca/azure.yaml b/deploy/aca/azure.yaml index 6bf7a33..9dd31de 100644 --- a/deploy/aca/azure.yaml +++ b/deploy/aca/azure.yaml @@ -2,7 +2,7 @@ name: azure-search-openai-demo-java-aca metadata: - template: azure-search-openai-demo-java-aca@1.2.0-alpha + template: azure-search-openai-demo-java-aca@1.2.0 services: api: project: ../../app/backend diff --git a/deploy/aks/azure.yaml b/deploy/aks/azure.yaml index ca9e9e8..e9f84b8 100644 --- a/deploy/aks/azure.yaml +++ b/deploy/aks/azure.yaml @@ -2,7 +2,7 @@ name: azure-search-openai-demo-java-aks metadata: - template: azure-search-openai-demo-java-aks@1.2.0-alpha + template: azure-search-openai-demo-java-aks@1.2.0 services: api: project: ../../app/backend diff --git a/docs/app-service/README-App-Service.md b/docs/app-service/README-App-Service.md index 5f910c9..867b41d 100644 --- a/docs/app-service/README-App-Service.md +++ b/docs/app-service/README-App-Service.md @@ -443,3 +443,4 @@ Here are the most common failure scenarios and solutions: az resource update --resource-group --name scm --namespace Microsoft.Web --resource-type basicPublishingCredentialsPolicies --parent sites/ --set properties.allow=true ``` For more details see this [issue](https://github.com/Azure-Samples/azure-search-openai-demo-java/issues/7). +10. When running azd up the first time it successfully complete but the zip file extraction fails on App Service during deployment. You can fix this by running azd deploy after azd up completes. This will only deploy the app code and not provision the resources again.