Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update petclinic sample & version upgrade #229

Merged
merged 12 commits into from
Mar 28, 2022
Merged

Update petclinic sample & version upgrade #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
83cee63
Use terraform commands instead of az commands in shell script and upg…
moarychan Mar 21, 2022
ab2d175
Merge branch 'spring-cloud-azure_4.0.0-beta.4' of github.com:Azure-Sa…
moarychan Mar 21, 2022
7b76998
Fix issues
moarychan Mar 21, 2022
a266289
Fix conflicts
moarychan Mar 21, 2022
ce6048c
Merge branch 'spring-cloud-azure_4.0.0-beta.4' of github.com:Azure-Sa…
moarychan Mar 21, 2022
e221c1d
Fix issues
moarychan Mar 21, 2022
1ce260e
Fix conflicts
moarychan Mar 25, 2022
fd79eea
Fix conflicts issue
moarychan Mar 25, 2022
9b1311b
fix issues
moarychan Mar 25, 2022
7b03b50
Merge branch 'spring-cloud-azure_4.0.0-beta.4' into moary/update-samp…
saragluna Mar 25, 2022
24b3eeb
fix issues
moarychan Mar 25, 2022
3acc8cd
Merge remote-tracking branch 'origin/moary/update-sample-terraform-sc…
moarychan Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@


## Current Branch Supported versions
- [spring-boot-dependencies:2.5.5](https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-dependencies/2.5.5/spring-boot-dependencies-2.5.5.pom).
- [spring-cloud-dependencies:2021.0.0](https://repo.maven.apache.org/maven2/org/springframework/cloud/spring-cloud-dependencies/2021.0.0/spring-cloud-dependencies-2021.0.0.pom).
- [spring-boot-dependencies:2.6.3](https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.3/spring-boot-dependencies-2.6.3.pom).
- [spring-cloud-dependencies:2021.0.0](https://repo.maven.apache.org/maven2/org/springframework/cloud/spring-cloud-dependencies/2021.0.1/spring-cloud-dependencies-2021.0.1.pom).

## All active branches

| Spring Boot Version | Spring Cloud version | Spring Cloud Azure Version |
|----------------------|-----------------------|---------------------------------------------------------------------------------------------------|
| 2.5.5 | 2021.0.0 | [4.0](https://github.com/Azure/azure-sdk-for-java/tree/feature/azure-spring-cloud-4.0/sdk/spring) |
| 2.6.3 | 2021.0.1 | [4.0](https://github.com/Azure/azure-sdk-for-java/tree/feature/azure-spring-cloud-4.0/sdk/spring) |

## All samples in this repo

Expand All @@ -43,16 +43,16 @@
| App Configuration| [azure-spring-cloud-appconfiguration-config:2.3.0] | [azure-appconfiguration-conversion-sample-complete](appconfiguration/azure-appconfiguration-conversion-sample-complete) |
| Cache | N/A | [azure-spring-cloud-sample-cache](cache/spring-cloud-azure-starter/spring-cloud-azure-sample-cache) |
| Cloud Foundry | N/A | [azure-cloud-foundry-service-sample](cloudfoundry/azure-cloud-foundry-service-sample) |
| Cosmos DB | [azure-spring-data-cosmos:3.17.0] | [cosmos-multi-database-multi-account](cosmos/azure-spring-data-cosmos/cosmos-multi-database-multi-account) |
| Cosmos DB | [azure-spring-data-cosmos:3.17.0] | [cosmos-multi-database-single-account](cosmos/azure-spring-data-cosmos/cosmos-multi-database-single-account) |
| Cosmos DB | [azure-spring-data-cosmos:3.18.0] | [cosmos-multi-database-multi-account](cosmos/azure-spring-data-cosmos/cosmos-multi-database-multi-account) |
| Cosmos DB | [azure-spring-data-cosmos:3.18.0] | [cosmos-multi-database-single-account](cosmos/azure-spring-data-cosmos/cosmos-multi-database-single-account) |
| Cosmos DB | [spring-cloud-azure-starter-data-cosmos:4.0.0-beta.4] | [spring-cloud-azure-data-cosmos-sample](cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample) |
| Cosmos DB | [spring-cloud-azure-starter-cosmos:4.0.0-beta.4] | [spring-cloud-azure-cosmos-sample](cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample) |
| Event Hubs | N/A | [spring-cloud-azure-sample-eventhubs-kafka](eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka) |
| Event Hubs | [spring-cloud-azure-starter-integration-eventhubs:4.0.0-beta.4] | [eventhubs-integration](eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration) |
| Event Hubs | [spring-cloud-azure-stream-binder-eventhubs:4.0.0-beta.4] | [eventhubs-binder](eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder) |
| Event Hubs | [spring-cloud-azure-stream-binder-eventhubs:4.0.0-beta.4] | [eventhubs-multibinders](eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders) |
| Key Vault | [azure-spring-boot-starter-keyvault-certificates:3.13.0] | [keyvault-certificates-client-side](keyvault/azure-spring-boot-starter-keyvault-certificates/keyvault-certificates-client-side) |
| Key Vault | [azure-spring-boot-starter-keyvault-certificates:3.13.0] | [keyvault-certificates-server-side](keyvault/azure-spring-boot-starter-keyvault-certificates/keyvault-certificates-server-side) |
| Key Vault | [azure-spring-boot-starter-keyvault-certificates:3.14.0] | [keyvault-certificates-client-side](keyvault/azure-spring-boot-starter-keyvault-certificates/keyvault-certificates-client-side) |
| Key Vault | [azure-spring-boot-starter-keyvault-certificates:3.14.0] | [keyvault-certificates-server-side](keyvault/azure-spring-boot-starter-keyvault-certificates/keyvault-certificates-server-side) |
| Key Vault | | [run-with-command-line-server-side](keyvault/azure-securtiy-keyvault-jca/run-with-command-line-server-side) |
| Key Vault | | [run-with-command-line-client-side](keyvault/azure-securtiy-keyvault-jca/run-with-command-line-client-side) |
| Key Vault | [spring-cloud-azure-starter-keyvault-secrets:4.0.0-beta.4] | [property-source](keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source) |
Expand Down Expand Up @@ -107,5 +107,5 @@ Please refer to [README.md](servicebus/spring-cloud-azure-starter-integration-se
[spring-cloud-azure-starter-data-cosmos:4.0.0-beta.4]: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-starter-data-cosmos/4.0.0-beta.4/jar
[azure-spring-cloud-feature-management:2.2.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-cloud-feature-management/2.2.0/jar
[azure-spring-cloud-appconfiguration-config:2.3.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-cloud-appconfiguration-config/2.3.0/jar
[azure-spring-boot-starter-keyvault-certificates:3.13.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-keyvault-certificates/3.13.0/jar
[azure-spring-data-cosmos:3.17.0]: https://search.maven.org/artifact/com.azure/azure-spring-data-cosmos/3.17.0/jar
[azure-spring-boot-starter-keyvault-certificates:3.14.0]: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-keyvault-certificates/3.14.0/jar
[azure-spring-data-cosmos:3.18.0]: https://search.maven.org/artifact/com.azure/azure-spring-data-cosmos/3.17.0/jar
2 changes: 1 addition & 1 deletion aad/spring-security/docs/reactive/webflux/oauth2/spring-cloud-gateway.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ Read [document about Application manifest](https://docs.microsoft.com/azure/acti
12. Access **http://localhost:8080/resource-server-2**, consent as before, it will return **Hello, this is resource-server-2.**.

# 5. Homework
1. Read [rfc6749](https://datatracker.ietf.org/doc/html/rfc6749).
1. Read [rfc6749](https://datatracker.ietf.org/doc/html/rfc6749).
2 changes: 1 addition & 1 deletion cache/spring-cloud-azure-starter/spring-cloud-azure-sample-cache/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion cosmos/azure-spring-data-cosmos/cosmos-multi-database-multi-account/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion cosmos/azure-spring-data-cosmos/cosmos-multi-database-single-account/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion ...os/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion ...cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion ...pring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion .../spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion ...ubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion keyvault/azure-securtiy-keyvault-jca/run-with-command-line-server-side/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ jdk 11.0.12 or above

<!-- LINKS -->
[azure-security-keyvault-jca]: https://mvnrepository.com/artifact/com.azure/azure-security-keyvault-jca
[client sample]: ../run-with-command-line-client-side/README.md
[client sample]: ../run-with-command-line-client-side/README.md
2 changes: 1 addition & 1 deletion ...-boot-starter-keyvault-certificates/keyvault-certificates-server-side/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,4 @@ azure:
[the_managed_identity_overview]: https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/overview
[register_app_with_AAD]: https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app
[create_key_vault_and_certificates]: https://docs.microsoft.com/en-us/azure/key-vault/certificates/quick-create-portal
[assign_key_vault_access_policy]: https://docs.microsoft.com/en-us/azure/key-vault/general/assign-access-policy?tabs=azure-portal
[assign_key_vault_access_policy]: https://docs.microsoft.com/en-us/azure/key-vault/general/assign-access-policy?tabs=azure-portal
2 changes: 1 addition & 1 deletion keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
10 changes: 2 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<version.guava>25.0-jre</version.guava>
<version.spring.cloud>2021.0.0</version.spring.cloud>
<version.azure-spring-data-cosmos>3.17.0</version.azure-spring-data-cosmos>
<version.spring.cloud>2021.0.1</version.spring.cloud>
<version.spring.cloud.azure>4.0.0-beta.4</version.spring.cloud.azure>
<version.spring-cloud-appconfiguration-config>2.3.0</version.spring-cloud-appconfiguration-config>
<version.spring-cloud-feature-management>2.2.0</version.spring-cloud-feature-management>
<version.azure-spring-boot-starter-keyvault-certificates>3.13.0</version.azure-spring-boot-starter-keyvault-certificates>
<version.azure-spring-boot-starter-keyvault-certificates>3.14.0</version.azure-spring-boot-starter-keyvault-certificates>
</properties>

<modules>
Expand Down Expand Up @@ -109,11 +108,6 @@
<artifactId>guava</artifactId>
<version>${version.guava}</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-spring-data-cosmos</artifactId>
<version>${version.azure-spring-data-cosmos}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-keyvault-certificates</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion ...us/spring-cloud-azure-starter-integration-servicebus/single-namespace/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion ...icebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion ...icebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion ...s/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion ...s/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
2 changes: 1 addition & 1 deletion ...s/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ source ./terraform/setup_env.sh
#### Run with Powershell

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

If you want to run the sample in debug mode, you can save the output value.
Expand Down
23 changes: 13 additions & 10 deletions spring-petclinic-microservices/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,23 +116,26 @@ terraform -chdir=terraform apply -auto-approve
It may take a few minutes to run the script. After successful running, you will see prompt information like below:

```shell
azurecaf_name.resource_group: Creating...
azurecaf_name.redis: Creating...
azurecaf_name.service-principal: Creating...
azurecaf_name.cosmos: Creating...
azurecaf_name.kv: Creating...
...
azurerm_resource_group.main: Creating...
...
azurerm_key_vault.kv_account: Creating...
azurerm_redis_cache.redis: Creating...
azurerm_cosmosdb_account.application: Creating...
azurerm_key_vault.kv_account: Still creating... [10s elapsed]
azurerm_redis_cache.redis: Still creating...
azurerm_key_vault.kv_account: Still creating...
azurerm_cosmosdb_account.application: Still creating...
...
azurerm_cosmosdb_account.application: Still creating...
azurerm_redis_cache.redis: Still creating...
azurerm_key_vault.kv_account: Still creating...
azurerm_key_vault.kv_account: Still creating...
azurerm_redis_cache.redis: Still creating...
...

Apply complete! Resources: 8 added, 0 changed, 0 destroyed.

Outputs:
...

```

You can go to [Azure portal](https://ms.portal.azure.com/) in your web browser to check the resources you created.
Expand All @@ -144,15 +147,15 @@ You can go to [Azure portal](https://ms.portal.azure.com/) in your web browser t
Running the command below to export environment values:

```shell
source ./terraform/setup_env.sh
source ./terraform/setup_env.sh
```

#### Run with Powershell

Running the command below to export environment values:

```shell
. terraform\setup_env.ps1
. terraform\setup_env.ps1
```

make sure keyvault.env file is created at the root of the repo.
Expand Down
Loading