Skip to content

Commit 31b81ff

Browse files
saraglunastliuhui-00rujcheyiliuTo
authored
Merge 4.0.0 to main branch (Azure-Samples#249)
* migrate to Spring Cloud Azure 4.0 (Azure-Samples#73) * add pom * update storage sample to use spring cloud azure 4.0 * update condition with matching bean instead of properties * remove version since we have added this dependency to bom * Update the servicebus binder samples. * Change folder name from "azure-spring-boot-starter-keyvault-secrets" to "spring-cloud-azure-starter-keyvault-secrets". * Change parent's artifactId to azure-spring-boot-samples. * Change sample's artifactId. * Delete dependencyManagement. * Change dependency to spring-cloud-azure-starter-keyvault-secrets. * Change configuration property prefix from `azure.keyvault.` to `spring.cloud.azure.keyvault.secret.`. * add si sample * modify sb binder * add new sample * Update servicebus binder samples. * update sample * rename directory * remove unnecessary dependencies * update for multiple ns * Update pom and readme of servicebus binder samples. * delete samples * update configuration for sp/msi credential * remove javadoc * Update application-mi.yaml,application-sp.yaml,application.yaml and readme of servicebus binder samples. * Update Cache and Kafka sample * servicebus-jms sample update for 4.0 * Update the catalog and readme of servicebus binder samples. * Delete old link. * Delete unused contents. * Update application.yml. * Delete unused code. * Add new configuration item: property-source-enabled. * update binder directory * Fix error in application.yml. * Update README.md. * Change the placeholder in application.yml. * Update configuration and link. * update the kafka sample to make it not required to depend on eh sdk or resource manager * Update configuration and link. * Update cosmos storage samples follow convention with spring cloud azure 4.0 (Azure-Samples#88) * servicebus-jms sample update for 4.0(artifact-id,link) * fix sb-si sample * Change folder's name to "single-property-source". * Change sample's artifact name. * Change package name. * Change placeholder to upper case. * Fix parent.relativePath. * Add new sample: Key Vault secrets, multiple property source. * Update the property name. * Change the application class name. * Update README.md. * merge 4.0 branch (2.0) * update README.md * update directory name * Use version 4.0 for aad related sample (Azure-Samples#72) * remove auto create resources in sb-si samples * Remove unused samples and add relativePath (Azure-Samples#92) * Update the readme and properties configuration of servicebus multibinders. * Change the representation of value. * Change the version comment of pom. * update version.spring.cloud.azure to 4.0.0-beta.2 * 1. update readme links to 4.0.0-beta.2 2. delete cloudfoundry * Change the representation of value in yaml and readme. * Revert "1. update readme links to 4.0.0-beta.2" This reverts commit 6ed8967. * update readme links to 4.0.0-beta.2 * add cloudfoundry entry * remove conditionalbean on storage * Delete the build in the pom and modify the value representation. * add entry for keyvault jca * Update all AAD sample's application.yml. * Change to upper case for all placeholders. * Delete readme headers (Azure-Samples#91) * Add dependencyManagement to use version 4.0.0-beta.3. * Fix warning: redundant definition of groupId. * update samples for eventhubs related project (Azure-Samples#103) * update samples for eventhubs related project * fix some typo errors and formats * fix some typo errors and formats * fix some typo errors and formats remove header info * fix some typo errors and formats rearrange Enhencement Section * Update properties in README.md. * Fix compile error. * Update indent: Use space instead of tab. * Copy files from this repo: https://github.com/Azure-Samples/spring-boot-application-with-azure-active-directory * Delete unused files. * Add "aad/spring-security" into root pom. * Delete "multi version support" related content in README.md. * Point out that these samples are using spring-security. * Delete all links related to this repo: https://github.com/Azure-Samples/spring-boot-application-with-azure-active-directory * Make AAD B2C support global properties. * Add dependencyManagement to use latest version. * Update package names after api-review. * Delete unused files. * Update .gitignore: 1. Ignore property file used for local test. 2. Remove duplicated item. * add description for content type of batch mode * Delete number in folder name and artifact id. * Update module name in pom. * Add a new sample: OAuth2 Login. * Add document about login sample. * Run sample with terraform and Default Azure Credential (Azure-Samples#104) * run sample with terraform and tokencredential * add random value to create resourcegroup and servicebus * add servicebus namespace output * update servicebus_namespace name * update readme and tf script * add "Azure Service Bus Data Owner" for current user. * update readme for single-namespace * - init config with terraform for demo multi-namespace * update application configuration * init README.md * add git ignore file for terraform * format git ignore file * update readme * update readme * clean up script * bugfix: create servicebus group * update README.md * remove application-mi,sp.yaml * export values to environment_values.sh * update readme * make sure environment_values.sh is clean * fix README.md errors * add null_resource * add **/terraform/environment_values.sh to gitignore * add **/terraform/.terraform.lock.hcl to gitignore * format README.md * Revert "format README.md" This reverts commit 7ee7b77. * remove unused variables * fix the error when running shell scipt * fix typo * add .history/ to gitignore * fix sample configuration bug * fix env issue * remove unused output * update terrafrom and README.md * add resources tags * use var * remove unused terraform provider * fix typo Co-authored-by: Strong Liu(刘少壮) <shaozliu@microsoft.com> * Fix link error in keyvault-jca sample README.md * Fix error about redirect uri template. * modify autoconfiguration error (Azure-Samples#123) * Refactor with terrafrom and defaultCredential for keyvault sample (Azure-Samples#126) * Refactor with terrafrom and defaultCredential for storage and cosmos (Azure-Samples#125) * Add description for role assignment in Spring Cloud Azure samples. (Azure-Samples#127) * format tf scripts (Azure-Samples#135) * Fix the error in the appconfiguration samples (Azure-Samples#121) * Update the parent pom of the spring-security module in aad. * Change version to 1.0.0 for spring security related samples (Azure-Samples#145) * Update the name of sample modules (Azure-Samples#128) * Updated Feature Management Readme * Update petclinic with latest spring integration libraries (Azure-Samples#131) * Update spring.cloud.azure version from 4.0.0-beta.2 to 4.0.0-beta.3 (Azure-Samples#146) * Update permissons for servicebus namespaces (Azure-Samples#148) * Update README.md (Azure-Samples#140) * Refactor samples with terraform and defaultCredential for keyvault samples (Azure-Samples#137) * Fix break changes servicebus in 4.0.0-beta.3 (Azure-Samples#150) * 1. Update the property name. (Azure-Samples#151) 2. Fix error in README.md. * Create sample spring-cloud-gateway + AAD resource server (Azure-Samples#147) * Fix problems in pom files (Azure-Samples#154) * Add "<packaging>jar</packaging>". * 1. Update the order according to pom code convention: https://maven.apache.org/developers/conventions/code.html#pom-code-convention 2. Delete parentId because it's same to parent's parentId. 3. Uniform the indent in one file. * 1. Delete duplicated dependency. * Refactor samples with terraform and defaultCredential for Eventhubs samples (Azure-Samples#136) * Refactor samples with terraform and defaultCredential for Storage Queue samples (Azure-Samples#139) * Refactor Service Bus sample:multiple-namespaces and eventhubs-integration (Azure-Samples#134) * Refactor samples with terraform and defaultCredential for Servicebus samples (Azure-Samples#138) * Fix Storage Queue compilation error * Remove unused files (Azure-Samples#156) * Fix issues caused by line breaks (Azure-Samples#155) * Update readme and terraform scripts (Azure-Samples#159) * Update broken links (Azure-Samples#161) * Update storage queue beta4 (Azure-Samples#164) * update to 4.0.0-beta.4 (Azure-Samples#166) * Update redis kafka sample (Azure-Samples#165) * Update Storageblob sample (Azure-Samples#171) * fix terraform outputs.tf error (Azure-Samples#173) * - clean unused imports (Azure-Samples#174) * Support terraform to run in Powershell. (Azure-Samples#168) * Add resource manager usage for sample readme (Azure-Samples#169) * Add some information in root readme (Azure-Samples#176) * Remove unnecessary dependencyManagement config and update webclient config. (Azure-Samples#179) * Remove test folders and dependencies for beta.4 branch (Azure-Samples#184) * Update versions and dependencymanagement (Azure-Samples#180) * Remove test folders in petclinic samples (Azure-Samples#189) * Refactor sample_cosmos.azure-spring-data-cosmos (Azure-Samples#187) * Refactor sample_spring-petclinic-microservices. (Azure-Samples#186) * Update github actions (Azure-Samples#191) Co-authored-by: backwind <zhihaoguo@foxmail.com> * Update pom.xml * Change order of properties in pom.xml (Azure-Samples#197) * Update README.md * Update pom.xml * Add resouce group in output gzh (Azure-Samples#201) * update springboot version (Azure-Samples#200) * Update markdown-link-check.yml * Fix compilation error to update latest code on 4.0 branch (Azure-Samples#203) * fix compilation error after 4.0 branch changes * fix compilation error after 4.0 branch changes (Azure-Samples#204) * simple improvement (Azure-Samples#205) * avoid hard code resource (Azure-Samples#206) * simplify code (Azure-Samples#207) * add link to reference doc (Azure-Samples#199) * add link to reference doc * Sync the root package name change of Spring modules (Azure-Samples#210) * fix compilation error (Azure-Samples#213) * Rename from allowed-groups to allowed-group-names (Azure-Samples#216) * Fix readme doc issues of jca (Azure-Samples#215) * Fix error in setup_env.ps1 (Azure-Samples#211) * Feature/create sample about login authenticate using private key jwt (Azure-Samples#196) * Fix messaging sample (Azure-Samples#219) * change to eventhubs * change to servicebus * Keep the version of provider in terraform scripts fixed. (Azure-Samples#218) * Add section in readme for debugging samples (Azure-Samples#212) * add section to README.md to debug example. * Add a new sample: key-vault-secret-client. (Azure-Samples#220) 1. This sample is copied from "single-property-source". 2. Change package to "com.azure.spring.keyvault.secrets.sample.client". 3. In SampleApplication, Use SecretClient to get the secret value. 4. Delete unnecessary dependencies: spring-boot-starter-actuator and spring-boot-starter-web. 5. Update root pom and root README.md 6. Update the value stored in Azure Key Vault Secret, to make the output more clear. * Use one sample to demonstrate the feature of keyvault secret property source (Azure-Samples#221) * fix checkpoint (Azure-Samples#226) * Add sample:servicebus-queue-binder-arm (Azure-Samples#225) * add sample * Create README.md * AAD support for terraform (Azure-Samples#217) * fix some errors (Azure-Samples#227) * fix some format for all the project. (Azure-Samples#230) * Update aad samples (Azure-Samples#223) * Update aad sample due to conditional access removal * Make the aad reference classes not in implementation package * change Lists from cosmos.impl package to guava Lists (Azure-Samples#231) * Update mlc_config.json * Refactor multi-namespace sample of spring integration service bus (Azure-Samples#233) * remain compatible * refactor sample Co-authored-by: Xiaolu Dai <31124698+saragluna@users.noreply.github.com> * Fix problem: pfx file not committed. (Azure-Samples#232) Co-authored-by: Xiaolu Dai <31124698+saragluna@users.noreply.github.com> * Update keyvault property configuration. (Azure-Samples#235) Update the keyvault property configuration to make sure the sample works properly. * Migration guide (Azure-Samples#236) * fix output scirpts (Azure-Samples#237) * Update petclinic sample & version upgrade (Azure-Samples#229) * Use terraform commands instead of az commands in shell script and upgrade version Co-authored-by: Xiaolu Dai <31124698+saragluna@users.noreply.github.com> * remove the spring data cosmos from the dependency management, the spring-cloud-azure-dependencies contains it (Azure-Samples#238) * Update version (Azure-Samples#244) * Complete keyvault sample (Azure-Samples#245) * add description * change dir * add more description * Replace duplicate part. (Azure-Samples#246) * Update AAD Sample (Azure-Samples#248) * change aad-resource-server-by-filter * change aad-resource-server-by-filter * change aad-resource-server-by-filter-stateless Co-authored-by: Xiaolu Dai <31124698+saragluna@users.noreply.github.com> * upgrade spring cloud azure versions * add missing project to aggregator * change links and versions to 4.0.0 Co-authored-by: Strong Liu(刘少壮) <shaozliu@microsoft.com> Co-authored-by: yonghuiye <hui1110rui@163.com> Co-authored-by: Rujun Chen <rujche@microsoft.com> Co-authored-by: yiliu6 <yiliu6@microsoft.com> Co-authored-by: Moary Chen <v-moaryc@microsoft.com> Co-authored-by: Muyao Feng <v-muyaofeng@microsoft.com> Co-authored-by: zhihaoguo <zhihaoguo@microsoft.com> Co-authored-by: Gary Liu <jialicrazy@163.com> Co-authored-by: Yonghui Ye <58474919+hui1110@users.noreply.github.com> Co-authored-by: mrm9084 <mrm9084@gmail.com> Co-authored-by: Moary Chen <moary@126.com> Co-authored-by: backwind <zhihaoguo@foxmail.com> Co-authored-by: Muyao Feng <92105726+Netyyyy@users.noreply.github.com>
1 parent 0702701 commit 31b81ff

File tree

801 files changed

+20928
-9782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

801 files changed

+20928
-9782
lines changed

.gitattributes

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Declare files that will always have LF line endings.
2+
*.tf text eol=lf
3+
*.sh text eol=lf

.github/workflows/java_ci_with_maven_adopt.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
33

4-
name: CI
4+
name: CI
55

66
on: [push, pull_request]
77

.github/workflows/mlc_config.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
{
44
"pattern": "^http://127.0.0.1"
55
},
6-
{
6+
{
77
"pattern": "^https://127.0.0.1"
88
},
99
{
1010
"pattern": "^http://localhost"
1111
},
12-
{
13-
"pattern": "^https://www.terraform.io"
14-
},
1512
{
1613
"pattern": "^https://localhost"
1714
},
1815
{
1916
"pattern": "^http://proxyserver"
2017
},
18+
{
19+
"pattern": "^https://www.terraform.io"
20+
},
2121
{
2222
"pattern": "^https://mvnrepository.com/artifact/com.azure/azure-security-keyvault-jca"
2323
}

.gitignore

+49-4
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ _ReSharper*/
130130
# TeamCity is a build add-in
131131
_TeamCity*
132132

133+
.vscode
133134
# DotCover is a Code Coverage Tool
134135
*.dotCover
135136

@@ -227,6 +228,7 @@ ClientBin/
227228
*.dbproj.schemaview
228229
*.jfm
229230
*.pfx
231+
!/aad/spring-security/servlet/oauth2/login-authenticate-using-private-key-jwt/src/test/resources/encrypted-private-key-and-certificate.pfx
230232
*.publishsettings
231233
orleans.codegen.cs
232234

@@ -352,9 +354,6 @@ MigrationBackup/
352354
# Compiled class file
353355
*.class
354356

355-
# Log file
356-
*.log
357-
358357
# BlueJ files
359358
*.ctxt
360359

@@ -395,4 +394,50 @@ tmp/**/*
395394
local.properties
396395
.classpath
397396
.settings/
398-
.loadpath
397+
.loadpath
398+
399+
### Terraform template
400+
# Local .terraform directories
401+
**/.terraform/*
402+
403+
# .tfstate files
404+
*.tfstate
405+
*.tfstate.*
406+
407+
# Crash log files
408+
crash.log
409+
410+
# Exclude all .tfvars files, which are likely to contain sentitive data, such as
411+
# password, private keys, and other secrets. These should not be part of version
412+
# control as they are data points which are potentially sensitive and subject
413+
# to change depending on the environment.
414+
#
415+
*.tfvars
416+
417+
# Ignore override files as they are usually used to override resources locally and so
418+
# are not checked in
419+
override.tf
420+
override.tf.json
421+
*_override.tf
422+
*_override.tf.json
423+
424+
# Include override files you do wish to add to version control using negated pattern
425+
#
426+
# !example_override.tf
427+
428+
# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
429+
# example: *tfplan*
430+
431+
# Ignore CLI configuration files
432+
.terraformrc
433+
terraform.rc
434+
**/terraform/environment_values.sh
435+
**/terraform/.terraform.lock.hcl
436+
437+
438+
# Property file used for local test.
439+
**/application-develop.properties
440+
**/application-develop.yml
441+
**/application-develop.yaml
442+
443+
.history/

README.md

+101-73
Large diffs are not rendered by default.

aad/azure-spring-boot-starter-active-directory-b2c/aad-b2c-resource-server/pom.xml

-39
This file was deleted.

aad/azure-spring-boot-starter-active-directory-b2c/aad-b2c-resource-server/src/main/resources/application.yml

-11
This file was deleted.

aad/azure-spring-boot-starter-active-directory-b2c/aad-b2c-web-application/src/main/resources/application.yml

-13
This file was deleted.

aad/azure-spring-boot-starter-active-directory/aad-resource-server-by-filter-stateless/src/main/resources/application.properties

-7
This file was deleted.

aad/azure-spring-boot-starter-active-directory/aad-resource-server-by-filter/src/main/java/com/azure/spring/sample/aad/AzureAdIntegrationSpringBootAutoconfigureSampleApplication.java

-15
This file was deleted.

aad/azure-spring-boot-starter-active-directory/aad-resource-server-by-filter/src/main/resources/application.yml

-17
This file was deleted.

aad/azure-spring-boot-starter-active-directory/aad-resource-server-obo/src/main/resources/application.yml

-21
This file was deleted.

aad/azure-spring-boot-starter-active-directory/aad-resource-server/README.md

-134
This file was deleted.

aad/azure-spring-boot-starter-active-directory/aad-resource-server/src/main/resources/application.yml

-13
This file was deleted.

0 commit comments

Comments
 (0)