Merge branch 'main' into main

Azure-Samples · Oct 20, 2022 · 521fb33 · 521fb33
2 parents 46bad8c + 4edde1b
commit 521fb33
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/.github/GITHUB_ACTIONS_CONFIG.md b/.github/GITHUB_ACTIONS_CONFIG.md
@@ -25,12 +25,12 @@ The newly created GitHub repo uses GitHub Actions to deploy Azure resources and
    ```
 2. Store the output JSON as the value of a GitHub secret named 'AZURE_CREDENTIALS'
    + Under your repository name, click Settings. 
-   + In the "Security" section of the sidebar, select Secrets, and Actions. 
+   + In the "Security" section of the sidebar, select Secrets. Make sure you select Actions in Secrets.
    + At the top of the page, click New repository secret
    + Provide the secret name as AZURE_CREDENTIALS
    + Add the output JSON as secret value
   
-### Rewuired Parameter Definitions 
+### Required Parameter Definitions 
 
 3. The following  parameters are required.
 
@@ -49,15 +49,15 @@ The newly created GitHub repo uses GitHub Actions to deploy Azure resources and
 
   + Select Role Assignments.
 
-  + Type in the name of your Service Principle, check the access levels.
+  + Type in the name of your Service Principal, check the access levels.
 
   + Since you just created it, the Service Principal will have Contributor Access.
 
   + In the Top Menu...Click "+Add", and select App Role Assignment from the drop down menu...
 
   + In the Role Serach Box.... type "User Access Administrator"
 
-  + In the Details column, click "View"
+  + In the Details column, click "View" to review permissions to be assigned.
 
   + At the bottom of the page, click "Select Role"
 

diff --git a/.github/workflows/deploy-JavaAKSBicep.yml b/.github/workflows/deploy-JavaAKSBicep.yml
@@ -206,7 +206,7 @@ jobs:
       uses: actions/setup-java@v3
       with:
          java-version: '11'
-         distribution: 'adopt'
+         distribution: 'microsoft'
     - name: azure login
       uses: azure/login@v1
       with:
@@ -216,4 +216,4 @@ jobs:
       with:
          inlineScript: | 
           az deployment group create -g ${{ env.SPOKE_RG }} -f ./src/main.bicep
-         azPSVersion: "latest"
+         azPSVersion: "latest"
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ In this sample app template of the PetClinic Microservices application (a Spring
 
 ## Deploy Spring Boot apps using Azure Services:
 
---
+---
 Tech stack:
 
 - Azure 
@@ -34,7 +34,7 @@ Tech stack:
 This is a quickstart template. It deploys the following:
 
 * Deploying PetClinic App:
-  * Postgres SQL Database configuration
+  * PostgreSQL Database configuration
   * Provisioning Azure Infra Services with BICEP
   * Create the Microservices Spring-Petclinic - build with Maven
   * Create an Azure Container Registry
@@ -61,15 +61,15 @@ This is a quickstart template. It deploys the following:
 1.  Fork the repository by clicking the 'Fork' button on the top right of the page.
 This creates a local copy of the repository for you to work in. 
 
-2.  Configure GITHUB Actions:  Follow the instructions in the [GITHUB_ACTIONS_CONFIG.md file](https://github.com/Azure-Samples/app-templates-springboot-microservices-on-AKS/blob/main/.github/GITHUB_ACTIONS_CONFIG.md) (Located in the .github folder.)
+2.  Configure GITHUB Actions:  Follow the instructions in the [GITHUB_ACTIONS_CONFIG.md file](.github/GITHUB_ACTIONS_CONFIG.md) (Located in the .github folder.)
 
 3.  Run the workflow 
-   * If workflows are enabled for this repository it should run automatically. To enable the workflow run automatically, Go to Actions and enable the workflow if needed.
-   * Workflow can be manually run 
-     + Under your repository name, click Actions .
-     + In the left sidebar, click the workflow "Build and Deploy Application".
-     + Above the list of workflow runs, select Run workflow .
-     + Use the Branch dropdown to select the workflow's main branch, Click Run workflow .
+    * If workflows are enabled for this repository it should run automatically. To enable the workflow run automatically, Go to Actions and enable the workflow if needed.
+    * Workflow can be manually run 
+        + Under your repository name, click Actions .
+        + In the left sidebar, click the workflow "Build and Deploy Application".
+        + Above the list of workflow runs, select Run workflow .
+        + Use the Branch dropdown to select the workflow's main branch, Click Run workflow .
 
 
 # Pet Clinic Website
@@ -83,7 +83,7 @@ Congratulations! Now you have your containerized Java Sping Boot App deployed on
 
 4. If you wish to view the PetClinic Deployment, you have the following options:
 
-- Log into the Azure Portal
-- Nagivate the the "petclinic_spoke_eastus" Resource Group
-- Select the AKS Cluster
-- At the top of the page select "Connect" and follow the instructions listed on the Connect to AKS-petclinic
+    - Log into the Azure Portal
+    - Nagivate the the "petclinic_spoke_eastus" Resource Group
+    - Select the AKS Cluster
+    - At the top of the page select "Connect" and follow the instructions listed on the Connect to AKS-petclinic