Merge branch 'master' into dependabot/npm_and_yarn/glob-parent-and-on…

…change-5.1.2

.github/workflows/delete-slot.yml

@@ -13,15 +13,23 @@ env:
   RESOURCE_GROUP: appserviceblogsite
   SLOT_NAME: pr-${{ github.event.number }}
 
+#OIDC
+permissions:
+    id-token: write
+    contents: read
+
 jobs:
   delete-slot:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Log into Azure CLI with service principal
-      uses: azure/[email protected]
+    #OIDC
+    - name: Run Azure Login with OIDC
+      uses: azure/login@v2
       with:
-        creds: ${{ secrets.ANTARES_BLOG_SITE_SP }}
+        client-id: ${{ secrets.AZURE_CLIENT_ID }}
+        tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+        subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
     - name: Delete slot on staging site
       run: | 

.github/workflows/deploy-to-gh-pages.yml

@@ -4,22 +4,26 @@ on:
   push:
     branches:
     - master
+  # Run build every day at 00:00 UTC every day for future-dated articles
   schedule:
-    - cron:  '0 0 * * *'  # Run build every day at 00:00 UTC every day for future-dated articles
+    - cron:  '0 0 * * *' 
+
+permissions:
+  contents: write
+  pages: write
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
     - name: Check out repo
       uses: actions/checkout@v1
 
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - name: Set up Ruby 3.0
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
+        ruby-version: '3.0'
 
     - name: Install Ruby dependencies
       run: |
@@ -31,5 +35,5 @@ jobs:
         chmod 750 deployment-script.sh
         ./deployment-script.sh
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         JEKYLL_ENV: production

.github/workflows/deploy-to-staging-site.yml

@@ -12,6 +12,10 @@ env:
   RESOURCE_GROUP: appserviceblogsite
   SLOT_NAME: pr-${{ github.event.number }}
 
+permissions:
+    id-token: write
+    contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -20,10 +24,10 @@ jobs:
     - name: Check out repo
       uses: actions/checkout@v1
 
-    - name: Set up Ruby 2.6
+    - name: Set up Ruby 3.0
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.6'
+        ruby-version: '3.0'
         bundler-cache: true
 
     - name: Install Ruby dependencies
@@ -40,21 +44,33 @@ jobs:
       run: cd _site && zip -r ../blog.zip .
 
     - name: Upload artifact for deployment job
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: jekyll-app
         path: blog.zip
 
   set-up-test-env:
     name: Create test env
     runs-on: ubuntu-latest
+    permissions:
+     id-token: write
+     contents: read
 
     steps:
-    - name: Log into Azure CLI with service principal
-      uses: azure/login@v1.1
+    - name: Run Azure Login with OIDC
+      uses: azure/login@v2
       with:
-        creds: ${{ secrets.ANTARES_BLOG_SITE_SP }}
+        client-id: ${{ secrets.AZURE_CLIENT_ID }}
+        tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+        subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
+    - name: Azure CLI script
+      uses: azure/CLI@v2
+      with:
+        azcliversion: latest
+        inlineScript: |
+          az account show
+
     - name: Create slot on staging site
       run: | 
         az webapp deployment slot create \
@@ -67,25 +83,36 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build, set-up-test-env]
     environment:
-      name: "PR #${{ github.event.number }}"
+      name: "production"
       url: "${{ steps.deploy-to-webapp.outputs.webapp-url }}"
     permissions:
+      id-token: write
+      contents: read
       pull-requests: write
-    
+
     steps:
-    - name: Log into Azure CLI with service principal
-      uses: azure/[email protected]
+    - name: Run Azure Login with OIDC
+      uses: azure/login@v2
+      with:
+        client-id: ${{ secrets.AZURE_CLIENT_ID }}
+        tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+        subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
+    - name: Azure CLI script
+      uses: azure/CLI@v2
       with:
-        creds: ${{ secrets.ANTARES_BLOG_SITE_SP }}
+        azcliversion: latest
+        inlineScript: |
+          az account show
 
     - name: Download artifact from build job
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
         name: jekyll-app
 
     - name: Deploy to slot on staging site
-      uses: azure/webapps-deploy@v1
-      with: 
+      uses: Azure/webapps-deploy@v3.0.0
+      with:
         app-name: ${{ env.WEBAPP_NAME }}
         slot-name: ${{ env.SLOT_NAME }}
         package: blog.zip

CONTRIBUTING.md

@@ -31,7 +31,10 @@ The App Service Team Blog is a great place to share content with our users. Befo
 
 ### Get access
 
-1. Get contributor access to the repository. Email Jason Freeberg with your GitHub username. This will allow you to submit pull requests without creating and maintaining your own fork of the repository.
+1. Get contributor access to the repository. Email Jeff Martinez with your GitHub username. This will allow you to submit pull requests without creating and maintaining your own fork of the repository.
+
+> **NOTE**
+You cannot contribute from a forked repository
 
 ### Set up your environment
 
@@ -124,7 +127,7 @@ You can add images, GIFs, or other digital content to your post by adding it to
 
 1. Submit a pull request. You can use [GitHub Desktop](https://help.github.com/en/desktop/contributing-to-projects/creating-a-pull-request) or the command line.
 
-1. Assign `jasonfreeberg` as a reviewer for your pull request. Send an email to Jason if it is high priority.
+1. Assign `jeffwmartinez` as a reviewer for your pull request. Send an email to Jeff if it is high priority.
 
 ## The team pages
 
@@ -135,7 +138,7 @@ There are team pages in the left sidebar to help organize content from that team
 1. Find your team's page under `_pages/team_pages/`
 1. Edit the markdown content as you wish. You can use in-line HTML as well, see the [theme's utility classes](https://mmistakes.github.io/minimal-mistakes/docs/utility-classes/) for more information.
 1. Any images should be placed under `media/pages/team_pages/your-team-name/`. See [adding digital content](#adding-digital-content) for more information on adding these images to your post.
-1. When you're done making changes, submit a Pull Request and add `jasonfreeberg` as a reviewer
+1. When you're done making changes, submit a Pull Request and add `jeffwmartinez` as a reviewer
 
 ### Add a team page
 

_config.yml

@@ -138,7 +138,7 @@ footer:
   links:
     - label: "Twitter"
       icon: "fab fa-fw fa-twitter-square"
-      url: "https://twitter.com/Azure"
+      url: "https://twitter.com/AzAppService"
       # - label: "Facebook"
       #   icon: "fab fa-fw fa-facebook-square"
       # url:

_pages/team_pages/java.md

@@ -13,7 +13,7 @@ pagination:
     after: 2
 ---
 
-App Service supports Java SE and Tomcat applications on Windows and Linux. Use the REST APIs to deploy your .jar or .war files. You can also use the [Zulu OpenJDK for Azure Docker images](https://hub.docker.com/_/microsoft-java-jdk) to deploy a custom container, fully supported by Azure.
+App Service supports Java SE and Tomcat applications on Windows and Linux. Use the REST APIs to deploy your .jar or .war files. You can also use the [Container images for the Microsoft Build of OpenJDK](https://learn.microsoft.com/en-us/java/openjdk/containers) to deploy a custom container, fully supported by Azure.
 
 ## Helpful resources
 

_posts/2019-12-12-App Service Environment Support for Availability Zones.md

@@ -4,6 +4,8 @@ author_name: "Stefan Schackow"
 category: networking
 ---
 
+> NOTE! As of March 2023, the content in this post may be outdated. For the latest information on Availability Zone support for App Service Environment, see [Azure App Service and reliability](https://learn.microsoft.com/azure/architecture/framework/services/compute/azure-app-service/reliability) and [Migrate App Service Environment to availability zone support](https://learn.microsoft.com/azure/reliability/migrate-app-service-environment).
+
 App Service has GA'd App Service Environment (ASE) support for deploying into Availability Zones (AZ).  Customers can choose to optionally deploy internal load balancer (ILB) ASEs into a specific AZ (Zone 1, 2 or 3) within an Azure region, and the resources used by that ILB ASE will either be pinned to the specified AZ, or deployed in a zone redundant manner.  
 
 An ILB ASE that is explicitly deployed into an AZ is considered a zonal resource because the ILB ASE is pinned to a specific zone. The following ILB ASE dependencies will be located (pinned) in the specified zone:
@@ -21,7 +23,7 @@ Zonal ILB ASEs can be created in any of the following regions:
 - East US
 - East US 2
 - East US 2 (EUAP)
-- France Central 
+- France Central
 - Japan East
 - North Europe
 - West Europe