Skip to content

Commit

Permalink
Merge pull request #78 from kevinhillinger/master
Browse files Browse the repository at this point in the history
removing jq dependency
  • Loading branch information
yevster authored Feb 2, 2021
2 parents 5055e51 + 45109e3 commit 42ffd51
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
6 changes: 0 additions & 6 deletions 00-setup-your-environment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@ This training lab requires the following to be installed on your machine:

* The Bash shell. While Azure CLI should behave identically on all environments, some shell semantics may need to be modified for use with other shells. To complete this training on Windows, use [Git Bash that accompanies the Windows distribution of Git](https://git-scm.com/download/win).

* The `jq` utility. On Windows, download [this Windows port of JQ](https://github.com/stedolan/jq/releases) and add the following to the `~/.bashrc` file (create the file from scratch if it does not exist):

```bash
alias jq=<JQ Download location>/jq-win64.exe
```

* 🚧 The `spring-cloud` extension for Azure CLI. You can install this extension after installing Azure CLI by running `az extension add -n spring-cloud -y`.

> 💡 In sections 9 and 10, you will access the UI of the Microservice applications in a web browser. Use the [new Edge](https://microsoft.com/edge/?WT.mc_id=azurespringcloud-github-judubois), Google Chrome, or Firefox for these sections.
Expand Down
7 changes: 3 additions & 4 deletions 07-build-a-spring-boot-microservice-using-mysql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,12 @@ Before we can use it however, we will need to perform several tasks:

> 💡When prompted for a password, enter the MySQL password you specified when deploying the ARM template in [Section 00](../00-setup-your-environment/README.md).
> 💡The following scripts require jq (https://stedolan.github.io/jq/) to be installed if run locally, jq is already installed if running Cloud Shell
```bash
# Obtain the info on the MYSQL server in our resource group:
MYSQL_INFO=$(az mysql server list --query '[0]')
MYSQL_SERVERNAME=$(echo $MYSQL_INFO | jq -r .name)
MYSQL_USERNAME="$(echo $MYSQL_INFO | jq -r .administratorLogin)@${MYSQL_SERVERNAME}"
MYSQL_HOST="$(echo $MYSQL_INFO | jq -r .fullyQualifiedDomainName)"
MYSQL_SERVERNAME=$(az mysql server list --query '[0].name' -o tsv)
MYSQL_USERNAME="$(az mysql server list --query '[0].administratorLogin' -o tsv)@${MYSQL_SERVERNAME}"
MYSQL_HOST="$(az mysql server list --query '[0].fullyQualifiedDomainName' -o tsv)"

# Create a firewall rule to allow connections from your machine:
MY_IP=$(curl whatismyip.akamai.com 2>/dev/null)
Expand Down

0 comments on commit 42ffd51

Please sign in to comment.