feat: add validation steps back to Python CEA templates

OfficeDev · Dec 18, 2024 · 76f241c · 76f241c
1 parent 8f0fc45
commit 76f241c
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 72 deletions.
diff --git a/templates/python/custom-copilot-assistant-assistants-api/teamsapp.local.yml.tpl b/templates/python/custom-copilot-assistant-assistants-api/teamsapp.local.yml.tpl
@@ -39,13 +39,11 @@ provision:
       channels:
         - name: msteams
 
-  {{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-  {{/CEAEnabled}}
 
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
@@ -54,13 +52,12 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-  {{^CEAEnabled}}
+
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-  {{/CEAEnabled}}
 
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
@@ -69,6 +66,7 @@ provision:
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
+
   {{#CEAEnabled}}
   - uses: teamsApp/extendToM365
     with:

diff --git a/templates/python/custom-copilot-assistant-assistants-api/teamsapp.yml.tpl b/templates/python/custom-copilot-assistant-assistants-api/teamsapp.yml.tpl
@@ -57,34 +57,34 @@ provision:
       # will use bicep CLI in PATH if you remove this config.
       bicepCliVersion: v0.9.1
 
-  {{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-  {{/CEAEnabled}}
+
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-  {{^CEAEnabled}}
+
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-  {{/CEAEnabled}}
+
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
   - uses: teamsApp/update
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
+
   {{#CEAEnabled}}
   - uses: teamsApp/extendToM365
     with:
@@ -115,27 +115,26 @@ deploy:
 
 # Triggered when 'teamsapp publish' is executed
 publish:
-  {{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-  {{/CEAEnabled}}
+
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-  {{^CEAEnabled}}
+
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-  {{/CEAEnabled}}
+
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.

diff --git a/templates/python/custom-copilot-assistant-new/teamsapp.local.yml.tpl b/templates/python/custom-copilot-assistant-new/teamsapp.local.yml.tpl
@@ -39,13 +39,11 @@ provision:
       channels:
         - name: msteams
 
-  {{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-  {{/CEAEnabled}}
 
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
@@ -54,13 +52,12 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-  {{^CEAEnabled}}
+
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-  {{/CEAEnabled}}
 
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
@@ -69,6 +66,7 @@ provision:
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
+
   {{#CEAEnabled}}
   - uses: teamsApp/extendToM365
     with:

diff --git a/templates/python/custom-copilot-assistant-new/teamsapp.yml.tpl b/templates/python/custom-copilot-assistant-new/teamsapp.yml.tpl
@@ -57,34 +57,34 @@ provision:
       # will use bicep CLI in PATH if you remove this config.
       bicepCliVersion: v0.9.1
 
-  {{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-  {{/CEAEnabled}}
+
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-  {{^CEAEnabled}}
+
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-  {{/CEAEnabled}}
+
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
   - uses: teamsApp/update
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
+
   {{#CEAEnabled}}
   - uses: teamsApp/extendToM365
     with:
@@ -115,27 +115,26 @@ deploy:
 
 # Triggered when 'teamsapp publish' is executed
 publish:
-  {{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-  {{/CEAEnabled}}
+
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-  {{^CEAEnabled}}
+
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-  {{/CEAEnabled}}
+
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.

diff --git a/templates/python/custom-copilot-basic/teamsapp.local.yml.tpl b/templates/python/custom-copilot-basic/teamsapp.local.yml.tpl
@@ -39,13 +39,11 @@ provision:
       channels:
         - name: msteams
 
-  {{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-  {{/CEAEnabled}}
 
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
@@ -54,13 +52,12 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-  {{^CEAEnabled}}
+
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-  {{/CEAEnabled}}
 
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
@@ -69,6 +66,7 @@ provision:
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
+
   {{#CEAEnabled}}
   - uses: teamsApp/extendToM365
     with:

diff --git a/templates/python/custom-copilot-basic/teamsapp.yml.tpl b/templates/python/custom-copilot-basic/teamsapp.yml.tpl
@@ -57,34 +57,34 @@ provision:
       # will use bicep CLI in PATH if you remove this config.
       bicepCliVersion: v0.9.1
 
-  {{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-  {{/CEAEnabled}}
+
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-  {{^CEAEnabled}}
+
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-  {{/CEAEnabled}}
+
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
   - uses: teamsApp/update
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
+
   {{#CEAEnabled}}
   - uses: teamsApp/extendToM365
     with:
@@ -115,27 +115,26 @@ deploy:
 
 # Triggered when 'teamsapp publish' is executed
 publish:
-  {{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-  {{/CEAEnabled}}
+
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-  {{^CEAEnabled}}
+
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-  {{/CEAEnabled}}
+
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.

diff --git a/templates/python/custom-copilot-rag-azure-ai-search/teamsapp.local.yml.tpl b/templates/python/custom-copilot-rag-azure-ai-search/teamsapp.local.yml.tpl
@@ -39,13 +39,11 @@ provision:
       channels:
         - name: msteams
 
-  {{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-  {{/CEAEnabled}}
 
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
@@ -54,13 +52,12 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-  {{^CEAEnabled}}
+
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-  {{/CEAEnabled}}
 
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
@@ -69,6 +66,7 @@ provision:
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
+
   {{#CEAEnabled}}
   - uses: teamsApp/extendToM365
     with: