Skip to content

Commit 8d637a2

Browse files
moarychanmoarychan
committed
rename project name
1 parent f7dd47e commit 8d637a2

File tree

15 files changed

+52
-52
lines changed

15 files changed

+52
-52
lines changed

‎README.md‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,16 @@
7979

8080
### 2.7 Azure Key Vault
8181

82-
| Sample Project | Spring Boot 3.x | Spring Boot 2.x |
83-
|-----------------------------------|----------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
84-
| keyvault-certificates-client-side | ❌ | ✅ [link](https://github.com/Azure-Samples/azure-spring-boot-samples/tree/spring-boot-2.x/keyvault/azure-spring-boot-starter-keyvault-certificates/keyvault-certificates-client-side) |
85-
| keyvault-certificates-server-side | ❌ | ✅ [link](https://github.com/Azure-Samples/azure-spring-boot-samples/tree/spring-boot-2.x/keyvault/azure-spring-boot-starter-keyvault-certificates/keyvault-certificates-server-side) |
86-
| keyvault-ssl-bundles | ✅ [link](keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles) | ❌ |
87-
| run-with-command-line-server-side | ✅ [link](keyvault/azure-securtiy-keyvault-jca/run-with-command-line-server-side) | ✅ [link](https://github.com/Azure-Samples/azure-spring-boot-samples/tree/spring-boot-2.x/keyvault/azure-securtiy-keyvault-jca/run-with-command-line-server-side) |
88-
| run-with-command-line-client-side | ✅ [link](keyvault/azure-securtiy-keyvault-jca/run-with-command-line-client-side) | ✅ [link](https://github.com/Azure-Samples/azure-spring-boot-samples/tree/spring-boot-2.x/keyvault/azure-securtiy-keyvault-jca/run-with-command-line-client-side) |
89-
| property-source | ✅ [link](keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source) | ✅ [link](https://github.com/Azure-Samples/azure-spring-boot-samples/tree/spring-boot-2.x/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source) |
90-
| secret-client | ✅ [link](keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client) | ✅ [link](https://github.com/Azure-Samples/azure-spring-boot-samples/tree/spring-boot-2.x/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client) |
82+
| Sample Project | Spring Boot 3.x | Spring Boot 2.x |
83+
|-----------------------------------|-----------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
84+
| keyvault-certificates-client-side | ❌ | ✅ [link](https://github.com/Azure-Samples/azure-spring-boot-samples/tree/spring-boot-2.x/keyvault/azure-spring-boot-starter-keyvault-certificates/keyvault-certificates-client-side) |
85+
| keyvault-certificates-server-side | ❌ | ✅ [link](https://github.com/Azure-Samples/azure-spring-boot-samples/tree/spring-boot-2.x/keyvault/azure-spring-boot-starter-keyvault-certificates/keyvault-certificates-server-side) |
86+
| keyvault-ssl-bundles-web | ✅ [link](keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles-web) | ❌ |
87+
| keyvault-ssl-bundles-webflux | ✅ [link](keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles-webflux) | ❌ |
88+
| run-with-command-line-server-side | ✅ [link](keyvault/azure-securtiy-keyvault-jca/run-with-command-line-server-side) | ✅ [link](https://github.com/Azure-Samples/azure-spring-boot-samples/tree/spring-boot-2.x/keyvault/azure-securtiy-keyvault-jca/run-with-command-line-server-side) |
89+
| run-with-command-line-client-side | ✅ [link](keyvault/azure-securtiy-keyvault-jca/run-with-command-line-client-side) | ✅ [link](https://github.com/Azure-Samples/azure-spring-boot-samples/tree/spring-boot-2.x/keyvault/azure-securtiy-keyvault-jca/run-with-command-line-client-side) |
90+
| property-source | ✅ [link](keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source) | ✅ [link](https://github.com/Azure-Samples/azure-spring-boot-samples/tree/spring-boot-2.x/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source) |
91+
| secret-client | ✅ [link](keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client) | ✅ [link](https://github.com/Azure-Samples/azure-spring-boot-samples/tree/spring-boot-2.x/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client) |
9192

9293
### 2.8 Azure Database for MySQL
9394

‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles/README.md‎ renamed to ‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles-web/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ name: Enable Server and Client SSL from Azure Key Vault SSL Bundles in Spring Bo
88
description: This sample demonstrates how to enable Server and Client SSL via Azure KeyVault SSL bundles in Spring Boot application.
99
---
1010

11-
# Enable Server and Client SSL from Azure Key Vault SSL Bundles in Spring Boot Application
11+
# Enable Server and Client SSL from Azure Key Vault SSL Bundles in Spring Boot Web Application
1212

13-
This sample demonstrates how to enable Server and Client SSL via Azure KeyVault SSL bundles in Spring Boot application. [Link to reference doc](https://learn.microsoft.com/azure/developer/java/spring-framework).
13+
This sample demonstrates how to enable Server and Client SSL via Azure KeyVault SSL bundles in Spring Boot web application. [Link to reference doc](https://learn.microsoft.com/azure/developer/java/spring-framework).
1414

1515
## What You Will Build
1616

‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles/pom.xml‎ renamed to ‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles-web/pom.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>com.azure.spring</groupId>
12-
<artifactId>keyvault-ssl-bundles</artifactId>
12+
<artifactId>keyvault-ssl-bundles-web</artifactId>
1313
<version>1.0.0</version>
1414
<packaging>jar</packaging>
15-
<name>keyvault-ssl-bundles</name>
16-
<description>Spring Cloud Azure Starter Key Vault JCA: Enable Server SSL and Client SSL</description>
15+
<name>keyvault-ssl-bundles-web</name>
16+
<description>Spring Cloud Azure Starter Key Vault JCA: Enable Server SSL and Client SSL in Spring Boot Web application</description>
1717
<properties>
1818
<java.version>17</java.version>
1919
<spring-cloud-azure.version>5.21.0-beta.1</spring-cloud-azure.version>
@@ -23,10 +23,6 @@
2323
<groupId>org.springframework.boot</groupId>
2424
<artifactId>spring-boot-starter-web</artifactId>
2525
</dependency>
26-
<dependency>
27-
<groupId>com.azure.spring</groupId>
28-
<artifactId>spring-cloud-azure-starter</artifactId>
29-
</dependency>
3026
<dependency>
3127
<groupId>com.azure.spring</groupId>
3228
<artifactId>spring-cloud-azure-starter-keyvault-jca</artifactId>

‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles/src/main/java/com/azure/spring/sample/keyvault/jca/KeyVaultSslBundlesApplication.java‎ renamed to ‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles-web/src/main/java/com/azure/spring/sample/keyvault/jca/KeyVaultSslBundlesWebApplication.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import org.springframework.boot.autoconfigure.SpringBootApplication;
88

99
@SpringBootApplication
10-
public class KeyVaultSslBundlesApplication {
10+
public class KeyVaultSslBundlesWebApplication {
1111

1212
public static void main(String[] args) {
13-
SpringApplication.run(KeyVaultSslBundlesApplication.class, args);
13+
SpringApplication.run(KeyVaultSslBundlesWebApplication.class, args);
1414
}
1515

1616
}

‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles/src/main/java/com/azure/spring/sample/keyvault/jca/WebConfiguration.java‎ renamed to ‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles-web/src/main/java/com/azure/spring/sample/keyvault/jca/WebConfiguration.java‎

File renamed without changes.

‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles/src/main/java/com/azure/spring/sample/keyvault/jca/WebController.java‎ renamed to ‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles-web/src/main/java/com/azure/spring/sample/keyvault/jca/WebController.java‎

File renamed without changes.

‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles/src/main/resources/application.yaml‎ renamed to ‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles-web/src/main/resources/application.yaml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
spring:
2+
application:
3+
name: keyvault-ssl-bundles-web
24
ssl:
35
bundle:
46
azure-keyvault:
@@ -8,12 +10,12 @@ spring:
810
certificates-refresh-interval: 60s
911
keyVaultBundle2:
1012
inherit: false
11-
endpoint: ${KEY_VAULT_SSL_BUNDLE_KEYVAULT_URI_02}
13+
endpoint: ${KEY_VAULT_SSL_BUNDLES_WEB_KEYVAULT_URI_02}
1214
profile:
13-
tenant-id: ${KEY_VAULT_SSL_BUNDLE_TENANT_ID}
15+
tenant-id: ${KEY_VAULT_SSL_BUNDLES_WEB_TENANT_ID}
1416
credential:
15-
client-id: ${KEY_VAULT_SSL_BUNDLE_CLIENT_ID}
16-
client-secret: ${KEY_VAULT_SSL_BUNDLE_CLIENT_SECRET}
17+
client-id: ${KEY_VAULT_SSL_BUNDLES_WEB_CLIENT_ID}
18+
client-secret: ${KEY_VAULT_SSL_BUNDLES_WEB_CLIENT_SECRET}
1719
key:
1820
alias: tomcat
1921
myLocalBundle:
@@ -24,12 +26,12 @@ spring:
2426
azure:
2527
keyvault:
2628
jca:
27-
endpoint: ${KEY_VAULT_SSL_BUNDLE_KEYVAULT_URI_01}
29+
endpoint: ${KEY_VAULT_SSL_BUNDLES_WEB_KEYVAULT_URI_01}
2830
profile:
29-
tenant-id: ${KEY_VAULT_SSL_BUNDLE_TENANT_ID}
31+
tenant-id: ${KEY_VAULT_SSL_BUNDLES_WEB_TENANT_ID}
3032
credential:
31-
client-id: ${KEY_VAULT_SSL_BUNDLE_CLIENT_ID}
32-
client-secret: ${KEY_VAULT_SSL_BUNDLE_CLIENT_SECRET}
33+
client-id: ${KEY_VAULT_SSL_BUNDLES_WEB_CLIENT_ID}
34+
client-secret: ${KEY_VAULT_SSL_BUNDLES_WEB_CLIENT_SECRET}
3335
server:
3436
port: 8443
3537
ssl:

‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles/src/main/resources/local-custom/test-cert.pem‎ renamed to ‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles-web/src/main/resources/local-custom/test-cert.pem‎

File renamed without changes.

‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles/terraform/main.tf‎ renamed to ‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles-web/terraform/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ data "azurerm_client_config" "current" {
4444
}
4545

4646
resource "azuread_application" "app" {
47-
display_name = "Spring Cloud Azure sample - keyvault-ssl-bundles"
47+
display_name = "Spring Cloud Azure sample - keyvault-ssl-bundles-web"
4848
}
4949

5050
resource "azuread_service_principal" "service_principal" {
@@ -57,7 +57,7 @@ resource "azuread_application_password" "service_principal_password" {
5757

5858
// ===========azurerm_key_vault_01===========
5959
resource "azurecaf_name" "azurecaf_name_kv_01" {
60-
name = "ssl-bundles-01"
60+
name = "ssl-bundles-web-01"
6161
resource_type = "azurerm_key_vault"
6262
random_length = 4
6363
clean_input = true
@@ -157,7 +157,7 @@ resource "azurerm_key_vault_certificate" "self_signed" {
157157

158158
// ===========azurerm_key_vault_02===========
159159
resource "azurecaf_name" "azurecaf_name_kv_02" {
160-
name = "ssl-bundles-02"
160+
name = "ssl-bundles-web-02"
161161
resource_type = "azurerm_key_vault"
162162
random_length = 4
163163
}

‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles/terraform/outputs.tf‎ renamed to ‎keyvault/spring-cloud-azure-starter-keyvault-jca/keyvault-ssl-bundles-web/terraform/outputs.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
output "KEY_VAULT_SSL_BUNDLE_KEYVAULT_URI_01" {
1+
output "KEY_VAULT_SSL_BUNDLES_WEB_KEYVAULT_URI_01" {
22
value = azurerm_key_vault.kv_account_01.vault_uri
33
description = "The key vault uri 01."
44
}
55

6-
output "KEY_VAULT_SSL_BUNDLE_KEYVAULT_URI_02" {
6+
output "KEY_VAULT_SSL_BUNDLES_WEB_KEYVAULT_URI_02" {
77
value = azurerm_key_vault.kv_account_02.vault_uri
88
description = "The key vault uri 02."
99
}
1010

11-
output "KEY_VAULT_SSL_BUNDLE_TENANT_ID" {
11+
output "KEY_VAULT_SSL_BUNDLES_WEB_TENANT_ID" {
1212
value = data.azuread_client_config.current.tenant_id
1313
description = "The tenant id."
1414
}
1515

16-
output "KEY_VAULT_SSL_BUNDLE_CLIENT_ID" {
16+
output "KEY_VAULT_SSL_BUNDLES_WEB_CLIENT_ID" {
1717
value = azuread_application.app.application_id
1818
description = "The application id of service principal."
1919
}
2020

21-
output "KEY_VAULT_SSL_BUNDLE_CLIENT_SECRET" {
21+
output "KEY_VAULT_SSL_BUNDLES_WEB_CLIENT_SECRET" {
2222
value = azuread_application_password.service_principal_password.value
2323
sensitive = true
2424
description = "The client secret of service principal."
2525
}
2626

27-
output "KEY_VAULT_SSL_BUNDLE_RESOURCE_GROUP_NAME" {
27+
output "KEY_VAULT_SSL_BUNDLES_WEB_RESOURCE_GROUP_NAME" {
2828
value = azurerm_resource_group.main.name
2929
description = "The resource group name."
3030
}

0 commit comments

Comments
 (0)