Release 1.2.0 fix

.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

app/backend/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.microsoft.openai.samples.rag</groupId>
 	<artifactId>search-demo-java</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.0</version>
 	<name>openai-search-demo-java</name>
 	<description>This sample demonstrates a few approaches for creating ChatGPT-like experiences over your own data using the Retrieval Augmented Generation pattern</description>
 	<properties>

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"

app/indexer/cli/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>indexer-parent</artifactId>
     <groupId>com.microsoft.openai.samples</groupId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>indexer-cli</artifactId>

app/indexer/cli/pom.xml

@@ -7,7 +7,7 @@
      <parent>
         <groupId>com.microsoft.openai.samples</groupId>
         <artifactId>indexer-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
 <dependency>
   <groupId>com.microsoft.openai.samples</groupId>
   <artifactId>indexer-core</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.0</version>
   </dependency>
 </dependencies>
 

app/indexer/core/pom.xml

@@ -7,7 +7,7 @@
      <parent>
         <groupId>com.microsoft.openai.samples</groupId>
         <artifactId>indexer-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

app/indexer/functions/pom.xml

@@ -6,13 +6,13 @@
     <parent>
         <groupId>com.microsoft.openai.samples</groupId>
         <artifactId>indexer-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
 
     <artifactId>indexer-functions</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
 
 
     <properties>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.microsoft.openai.samples</groupId>
             <artifactId>indexer-core</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
     </dependencies>
 
@@ -47,16 +47,18 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
+            <!--
+             Functions deployment generation is disabled as we are still figuring out how to make it azd compliant.
+             The problem is that we haven't found a working example of passing the app name generated by azd provision as env variables to maven during azd package phase.
+             That's because probably azd try to package the app before provision phase
             <plugin>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-functions-maven-plugin</artifactId>
                 <version>${azure.functions.maven.plugin.version}</version>
                 <configuration>
-                    <!-- function app name -->
-                    <!--suppress UnresolvedMavenProperty -->
+
                     <appName>${env.INDEXER_FUNCTIONAPP_NAME}</appName>
-                    <!-- function app resource group -->
-                    <!--suppress UnresolvedMavenProperty -->
+
                     <resourceGroup>${env.AZURE_RESOURCE_GROUP}</resourceGroup>
                     <appSettings>
                         <property>
@@ -74,6 +76,7 @@
                     </execution>
                 </executions>
             </plugin>
+            </-->
             <!--Remove obj folder generated by .NET SDK in maven clean-->
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>

app/indexer/microservice/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.microsoft.openai.samples</groupId>
     <artifactId>indexer-microservice</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
 
 
     <properties>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.microsoft.openai.samples</groupId>
             <artifactId>indexer-core</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

app/indexer/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.microsoft.openai.samples</groupId>
     <artifactId>indexer-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -25,6 +25,7 @@
         <module>core</module>
         <module>cli</module>
         <module>microservice</module>
+        <module>functions</module>
     </modules>
 
     <dependencyManagement>

deploy/aca/azure.yaml

@@ -2,7 +2,7 @@
 
 name: azure-search-openai-demo-java-aca
 metadata:
-  template: [email protected]-alpha
+  template: [email protected]
 services:
   api:
     project: ../../app/backend

deploy/aks/azure.yaml

@@ -2,7 +2,7 @@
 
 name: azure-search-openai-demo-java-aks
 metadata:
-  template: [email protected]-alpha
+  template: [email protected]
 services:
   api:
     project: ../../app/backend

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 <resource-group> --name scm --namespace Microsoft.Web --resource-type basicPublishingCredentialsPolicies --parent sites/<site-name> --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.