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.

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

Mapping spring legacy props #23166

Merged

Conversation

yiliuTo
Copy link
Member

@yiliuTo yiliuTo commented Jul 24, 2021

Map legacy spring properties of KeyVault, Cosmos and Storage to the current ones. The mapping relationship is recorded in file sdk/spring/azure-spring-cloud-autoconfigure/src/main/resources/legacy-property-mapping.properties.

Implemented by using an EnvironmentPostProcessor to convert all legacy properties detected from the environment to the associtaed current ones, and then put them into environment.

When Key Vault secret starter is used, the predeing processor will be executed again after KeyVaultEnvironmentPostProcessor to convert legacy properties load from Key Vault if exist.

@ghost ghost added the azure-spring All azure-spring related issues label Jul 24, 2021
@yiliuTo
Copy link
Member Author

yiliuTo commented Jul 24, 2021

/azp run java - spring - tests

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yiliuTo yiliuTo marked this pull request as ready for review July 24, 2021 11:22
@yiliuTo
Copy link
Member Author

yiliuTo commented Jul 27, 2021

@stliu please help to review this pr when you are available, thanks

@yiliuTo
Copy link
Member Author

yiliuTo commented Jul 30, 2021

/azp run java - spring - tests

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

* @throws UncheckedIOException If an I/O error occurs.
* @return The {@link Properties} Object.
*/
public static Properties loadProperties(String file) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the implementation doesn't match with method name

@Override
protected Properties convertLegacyPropertyToCurrent(Properties legacyToCurrentMap) {
Properties properties = new Properties();
List<KeyVaultPropertySource> propertySourceList = getKeyVaultPropertySourceList();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about this:

  1. getKeyVaultPropertySourceList returns a Stream ( change the method name as well )
  2. Stream.sorted(Collections.reverseOrder())

personally i think this has more readability

*
* @return A string with all Key Vaults names concatenated by commas, or null if no Key Vault names specified.
*/
private String getMultipleKeyVaultNames() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should be taking care in this method that return an array of names

@yiliuTo
Copy link
Member Author

yiliuTo commented Aug 6, 2021

/azp run java - spring - tests

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yiliuTo
Copy link
Member Author

yiliuTo commented Aug 6, 2021

/azp run java - spring - tests

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yiliuTo
Copy link
Member Author

yiliuTo commented Aug 7, 2021

/check-enforcer override

@yiliuTo yiliuTo merged commit 638c8b6 into Azure:feature/spring-unify-configurations Aug 7, 2021
saragluna pushed a commit to saragluna/azure-sdk-for-java that referenced this pull request Aug 16, 2021
* use file for property mapping

* add environmentpostprocessor after kv

* map multiple key vault use case
saragluna added a commit that referenced this pull request Aug 17, 2021
…23597)

* Unify spring configurations (#22937)
* Refactor Azure Spring projects structure (#23004)
* Mapping spring legacy props (#23166)
  ** use file for property mapping
  ** add environmentpostprocessor after kv
  ** map multiple key vault use case
* update readme for unified configuration (#23452)

Co-authored-by: Yi Liu <yiliu6@microsoft.com>
azure-sdk pushed a commit to azure-sdk/azure-sdk-for-java that referenced this pull request Apr 13, 2023
Review request for Microsoft.ContainerInstance to add version stable/2023-05-01 (Azure#23485)

* Adds base for updating Microsoft.ContainerInstance from version preview/2022-10-01-preview to version 2023-05-01

* Updates readme

* Updates API version in new specs and examples

* add container security context property

* update readme tag to previous stable version

* add example with security context

* avocado fix default tag should contain all endpoints

* add back spot priority changes

* use previous stable version as default tag

* prettier fix

* use spaces

* add container security context property

* update readme tag to previous stable version

* add example with security context

* avocado fix default tag should contain all endpoints

* add back spot priority changes

* use previous stable version as default tag

* prettier fix

* use spaces

* fix error

* use spaces

* Fnuarnav containerinstance microsoft.container instance 2023 05 01 (Azure#23166)

* add container security context property

* update readme tag to previous stable version

* add example with security context

* avocado fix default tag should contain all endpoints

* add back spot priority changes

* use previous stable version as default tag

* prettier fix

* use spaces

* fix error

* use spaces

* fix CI errors

* Fnuarnav containerinstance microsoft.container instance 2023 05 01 (Azure#23169)

* add container security context property

* update readme tag to previous stable version

* add example with security context

* avocado fix default tag should contain all endpoints

* add back spot priority changes

* use previous stable version as default tag

* prettier fix

* use spaces

* fix error

* use spaces

* fix CI errors

* use altest api version as default for Avocado

* Fnuarnav containerinstance microsoft.container instance 2023 05 01 (Azure#23170)

* add container security context property

* update readme tag to previous stable version

* add example with security context

* avocado fix default tag should contain all endpoints

* add back spot priority changes

* use previous stable version as default tag

* prettier fix

* use spaces

* fix error

* use spaces

* fix CI errors

* use altest api version as default for Avocado

* update host to eastus2euap endpoint to check manifest

* Fnuarnav containerinstance microsoft.container instance 2023 05 01 (Azure#23452)

* add container security context property

* update readme tag to previous stable version

* add example with security context

* avocado fix default tag should contain all endpoints

* add back spot priority changes

* use previous stable version as default tag

* prettier fix

* use spaces

* fix error

* use spaces

* fix CI errors

* use altest api version as default for Avocado

* update host to eastus2euap endpoint to check manifest

* use old api versionf or operations

* Fnuarnav containerinstance microsoft.container instance 2023 05 01 (Azure#23453)

* add container security context property

* update readme tag to previous stable version

* add example with security context

* avocado fix default tag should contain all endpoints

* add back spot priority changes

* use previous stable version as default tag

* prettier fix

* use spaces

* fix error

* use spaces

* fix CI errors

* use altest api version as default for Avocado

* update host to eastus2euap endpoint to check manifest

* use old api versionf or operations

* revert Operations example api version

* Fnuarnav containerinstance microsoft.container instance 2023 05 01 (Azure#23471)

* add container security context property

* update readme tag to previous stable version

* add example with security context

* avocado fix default tag should contain all endpoints

* add back spot priority changes

* use previous stable version as default tag

* prettier fix

* use spaces

* fix error

* use spaces

* fix CI errors

* use altest api version as default for Avocado

* update host to eastus2euap endpoint to check manifest

* use old api versionf or operations

* revert Operations example api version

* Fnuarnav containerinstance microsoft.container instance 2023 05 01 (Azure#23473)

* add container security context property

* update readme tag to previous stable version

* add example with security context

* avocado fix default tag should contain all endpoints

* add back spot priority changes

* use previous stable version as default tag

* prettier fix

* use spaces

* fix error

* use spaces

* fix CI errors

* use altest api version as default for Avocado

* update host to eastus2euap endpoint to check manifest

* MGRP S360 Vuln (Azure#22832)

* Add blockchain to latest profile

* Add additional types

* Fix Swagger issues

* Solve validation

---------

Co-authored-by: Mark Cowlishaw <markcowl@microsoft.com>

* use old api versionf or operations

* Azure Orbital - swagger fix for api-version 2022-11-01 (Azure#23441)

* added example for the new field

* updated the double ref that was causing build failure

* Fixed PrometheusRuleGroups examples (Azure#23390)

* Fixed PrometheusRuleGroups examples

* One more fix

* Remvoe flattern (Azure#23460)

Co-authored-by: Will Huang <huangwill@microsoft.com>

* Mvad update (Azure#23434)

* Add default value 10 for topContributorCount

* Update AnomalyDetector typespec to latest typespec and Azure.Core versions and fix all warnings

* Update TypeSpec config

* Add back language emitter options

* Fix cspell and model validation errors

---------

Co-authored-by: Chunlei Wang <chuwan@microsoft.com>

* revert Operations example api version

---------

Co-authored-by: ramoka178 <57157576+ramoka178@users.noreply.github.com>
Co-authored-by: Mark Cowlishaw <markcowl@microsoft.com>
Co-authored-by: Stuti Kumar <113545470+stuti-1807@users.noreply.github.com>
Co-authored-by: giladsu <43436811+giladsu@users.noreply.github.com>
Co-authored-by: will <koyasu221b@gmail.com>
Co-authored-by: Will Huang <huangwill@microsoft.com>
Co-authored-by: Mike Kistler <mikekistler@microsoft.com>
Co-authored-by: Chunlei Wang <chuwan@microsoft.com>

* use management.auzre.com endpoint

* Fnuarnav containerinstance microsoft.container instance 2023 05 01 (Azure#23483)

* add container security context property

* update readme tag to previous stable version

* add example with security context

* avocado fix default tag should contain all endpoints

* add back spot priority changes

* use previous stable version as default tag

* prettier fix

* use spaces

* fix error

* use spaces

* fix CI errors

* use altest api version as default for Avocado

* update host to eastus2euap endpoint to check manifest

* MGRP S360 Vuln (Azure#22832)

* Add blockchain to latest profile

* Add additional types

* Fix Swagger issues

* Solve validation

---------

Co-authored-by: Mark Cowlishaw <markcowl@microsoft.com>

* use old api versionf or operations

* Azure Orbital - swagger fix for api-version 2022-11-01 (Azure#23441)

* added example for the new field

* updated the double ref that was causing build failure

* Fixed PrometheusRuleGroups examples (Azure#23390)

* Fixed PrometheusRuleGroups examples

* One more fix

* Remvoe flattern (Azure#23460)

Co-authored-by: Will Huang <huangwill@microsoft.com>

* Mvad update (Azure#23434)

* Add default value 10 for topContributorCount

* Update AnomalyDetector typespec to latest typespec and Azure.Core versions and fix all warnings

* Update TypeSpec config

* Add back language emitter options

* Fix cspell and model validation errors

---------

Co-authored-by: Chunlei Wang <chuwan@microsoft.com>

* revert Operations example api version

* use management.auzre.com endpoint

---------

Co-authored-by: ramoka178 <57157576+ramoka178@users.noreply.github.com>
Co-authored-by: Mark Cowlishaw <markcowl@microsoft.com>
Co-authored-by: Stuti Kumar <113545470+stuti-1807@users.noreply.github.com>
Co-authored-by: giladsu <43436811+giladsu@users.noreply.github.com>
Co-authored-by: will <koyasu221b@gmail.com>
Co-authored-by: Will Huang <huangwill@microsoft.com>
Co-authored-by: Mike Kistler <mikekistler@microsoft.com>
Co-authored-by: Chunlei Wang <chuwan@microsoft.com>

* fix package version in readme

* Fnuarnav containerinstance microsoft.container instance 2023 05 01 (Azure#23484)

* add container security context property

* update readme tag to previous stable version

* add example with security context

* avocado fix default tag should contain all endpoints

* add back spot priority changes

* use previous stable version as default tag

* prettier fix

* use spaces

* fix error

* use spaces

* fix CI errors

* use altest api version as default for Avocado

* update host to eastus2euap endpoint to check manifest

* MGRP S360 Vuln (Azure#22832)

* Add blockchain to latest profile

* Add additional types

* Fix Swagger issues

* Solve validation

---------

Co-authored-by: Mark Cowlishaw <markcowl@microsoft.com>

* use old api versionf or operations

* Azure Orbital - swagger fix for api-version 2022-11-01 (Azure#23441)

* added example for the new field

* updated the double ref that was causing build failure

* Fixed PrometheusRuleGroups examples (Azure#23390)

* Fixed PrometheusRuleGroups examples

* One more fix

* Remvoe flattern (Azure#23460)

Co-authored-by: Will Huang <huangwill@microsoft.com>

* Mvad update (Azure#23434)

* Add default value 10 for topContributorCount

* Update AnomalyDetector typespec to latest typespec and Azure.Core versions and fix all warnings

* Update TypeSpec config

* Add back language emitter options

* Fix cspell and model validation errors

---------

Co-authored-by: Chunlei Wang <chuwan@microsoft.com>

* revert Operations example api version

* add codeowners for Compute Instance swagger (Azure#23437)

Co-authored-by: Naman Agarwal <naagarw@microsoft.com>

* [Hub Generated] Review request for Microsoft.DevHub to add version preview/2022-10-11-preview (Azure#22828)

* Adds base for updating Microsoft.DevHub from version preview/2022-04-01-preview to version 2022-10-11-preview

* Updates readme

* Updates API version in new specs and examples

* start 10-11 preview

* add words

* fix readme version

* update swagger version

* add second putworkflow example

* fix generatepreviewartifactsresponse

* align generate preview artifacts example

* update param locations that got changed

* add x-ms-client-flatten for artifact properties

* Adding WorkflowRunStatus

* Fixing enum name

* add namespace to example

---------

Co-authored-by: Brandon Foley <brandonfoley13@gmail.com>

* Update readme.python.md (Azure#23208)

* fixing async response type for machinelearningservices-2023-02-01-preview (Azure#23105)

* fixing regex pattern and async response type

* remove update to regex

* Fix lint error for Datadog RP (Azure#23477)

* Fix link error for Datadog RP

* Fix version

* merging billing fix to public repo (Azure#23424)

Co-authored-by: Gaurav Bang <gauravbang@microsoft.com>

* use management.auzre.com endpoint

* fix package version in readme

---------

Co-authored-by: ramoka178 <57157576+ramoka178@users.noreply.github.com>
Co-authored-by: Mark Cowlishaw <markcowl@microsoft.com>
Co-authored-by: Stuti Kumar <113545470+stuti-1807@users.noreply.github.com>
Co-authored-by: giladsu <43436811+giladsu@users.noreply.github.com>
Co-authored-by: will <koyasu221b@gmail.com>
Co-authored-by: Will Huang <huangwill@microsoft.com>
Co-authored-by: Mike Kistler <mikekistler@microsoft.com>
Co-authored-by: Chunlei Wang <chuwan@microsoft.com>
Co-authored-by: Naman Agarwal <namanag16@gmail.com>
Co-authored-by: Naman Agarwal <naagarw@microsoft.com>
Co-authored-by: David Gamero <david340804@gmail.com>
Co-authored-by: Brandon Foley <brandonfoley13@gmail.com>
Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
Co-authored-by: Karishma Daga <karishmadaga@microsoft.com>
Co-authored-by: vikotha <81368129+vikotha@users.noreply.github.com>
Co-authored-by: Gaurav <bang.gourav@gmail.com>
Co-authored-by: Gaurav Bang <gauravbang@microsoft.com>

* fix tag in readme

* update example with capabilities example

* fix typo

---------

Co-authored-by: ramoka178 <57157576+ramoka178@users.noreply.github.com>
Co-authored-by: Mark Cowlishaw <markcowl@microsoft.com>
Co-authored-by: Stuti Kumar <113545470+stuti-1807@users.noreply.github.com>
Co-authored-by: giladsu <43436811+giladsu@users.noreply.github.com>
Co-authored-by: will <koyasu221b@gmail.com>
Co-authored-by: Will Huang <huangwill@microsoft.com>
Co-authored-by: Mike Kistler <mikekistler@microsoft.com>
Co-authored-by: Chunlei Wang <chuwan@microsoft.com>
Co-authored-by: Naman Agarwal <namanag16@gmail.com>
Co-authored-by: Naman Agarwal <naagarw@microsoft.com>
Co-authored-by: David Gamero <david340804@gmail.com>
Co-authored-by: Brandon Foley <brandonfoley13@gmail.com>
Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
Co-authored-by: Karishma Daga <karishmadaga@microsoft.com>
Co-authored-by: vikotha <81368129+vikotha@users.noreply.github.com>
Co-authored-by: Gaurav <bang.gourav@gmail.com>
Co-authored-by: Gaurav Bang <gauravbang@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
azure-spring All azure-spring related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants