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

Jump to bottom

Deploy PetClinic microservices using azd #49

Merged

rujche merged 22 commits into azure-javaee:feature/sjad from haoozhang:haozhan/petclinic

Dec 2, 2024

haoozhang commented Nov 26, 2024 •

edited

Loading

Deploy PetClinic microservices using azd

Current problems:

application name is not aligned. (spring-petclinic-customer-service -> customer-service)
DB access still have issue, will investigate further.

haozhang added 4 commits

November 25, 2024 17:21


          add dependsOn in azure.yaml, then reflect on the infraSpec, to exec b…

31744c9

…icep template


          when multi-modules, add Dockerfile and prebuild hooks

5ce87dd


          not all services need service connector

ca22c11


          fix Env Var injection for eureka client and config client

9e31521

haoozhang commented

View reviewed changes

cli/azd/internal/appdetect/java.go Outdated Show resolved Hide resolved

haoozhang commented

View reviewed changes

cli/azd/internal/appdetect/spring_boot.go Show resolved Hide resolved

haoozhang commented

View reviewed changes

cli/azd/internal/appdetect/spring_boot.go Outdated Show resolved Hide resolved

haoozhang commented

View reviewed changes

cli/azd/internal/repository/app_init.go Outdated Show resolved Hide resolved

haoozhang commented

View reviewed changes

cli/azd/internal/repository/app_init.go Outdated Show resolved Hide resolved

haoozhang commented

View reviewed changes

cli/azd/pkg/project/scaffold_gen.go Outdated Show resolved Hide resolved

haoozhang commented

View reviewed changes

cli/azd/resources/scaffold/templates/resources.bicept Show resolved Hide resolved

haoozhang commented

View reviewed changes

schemas/alpha/azure.yaml.json Outdated Show resolved Hide resolved

haoozhang commented

View reviewed changes

cli/azd/resources/scaffold/templates/resources.bicept Outdated Show resolved Hide resolved


          small fix

3749bad

haoozhang marked this pull request as ready for review

November 27, 2024 05:06

rujche reviewed

View reviewed changes

cli/azd/internal/appdetect/appdetect.go Outdated Show resolved Hide resolved

rujche reviewed

View reviewed changes

cli/azd/internal/appdetect/java.go Outdated Show resolved Hide resolved

rujche reviewed

View reviewed changes

cli/azd/internal/appdetect/java.go Outdated Show resolved Hide resolved

saragluna reviewed

View reviewed changes

cli/azd/internal/repository/app_init.go Outdated Show resolved Hide resolved

haozhang added 9 commits

November 28, 2024 10:02


          Merge remote-tracking branch 'origin/feature/sjad' into haozhan/petcl…

d57936e

…inic

# Conflicts:
#	cli/azd/internal/appdetect/java.go


          pack build multi-module

98a1200


          Merge remote-tracking branch 'origin/feature/sjad' into haozhan/petcl…

71397a7

…inic

# Conflicts:
#	cli/azd/pkg/project/scaffold_gen.go
#	cli/azd/resources/scaffold/templates/resources.bicept


          commit

a72e1a2


          comment for escape bicep

4253d81


          Merge remote-tracking branch 'origin/feature/sjad' into haozhan/petcl…

1cf94d3

…inic

# Conflicts:
#	cli/azd/internal/appdetect/spring_boot_test.go
#	cli/azd/pkg/project/framework_service_docker.go


          simplify some changes

88295b0

fix

da2017e


          small fix nil Env

5553b65

rujche reviewed

View reviewed changes

cli/azd/internal/repository/app_init.go Outdated Show resolved Hide resolved

rujche reviewed

View reviewed changes

cli/azd/internal/repository/app_init.go Outdated Show resolved Hide resolved

rujche reviewed

View reviewed changes

cli/azd/internal/repository/infra_confirm.go Show resolved Hide resolved

haozhang added 3 commits

December 2, 2024 10:29


          inject env by resource type eureka / config server

d87262c


          lint fix

a0e34cf


          small fix

bf7a198

rujche reviewed

View reviewed changes

cli/azd/pkg/project/scaffold_gen_environment_variables.go Outdated Show resolved Hide resolved

rujche reviewed

View reviewed changes

cli/azd/pkg/project/scaffold_gen_environment_variables.go Outdated Show resolved Hide resolved

rujche reviewed

View reviewed changes

cli/azd/pkg/project/service_config.go

@@ @@ -45,6 +45,8 @@ type ServiceConfig struct { @@
               	DotNetContainerApp *DotNetContainerAppOptions `yaml:"-,omitempty"`
               	// Custom configuration for the service target
               	Config map[string]any `yaml:"config,omitempty"`
+              	// Environment variables for service
+              	Env map[string]string `yaml:"env,omitempty"`

rujche Dec 2, 2024

Do we need to add environment variables here? IMU, it should be keep align with other services like PostgreSQL, currently, the PostgreSQL related environment variables are not displayed in azure.yaml.

Author

haoozhang Dec 2, 2024

Need to sync with @saragluna together: where to place these Envs.

rujche commented Dec 2, 2024

Please fix the check failure:

haoozhang closed this

Author

haoozhang commented Dec 2, 2024 •

edited

Loading

Please fix the check failure:

Updated.

haoozhang reopened this

haozhang added 4 commits

December 2, 2024 14:06


          process escape logic in backend

59c094c


          add UT

7bdc8a0


          fix to avoid escape placeholder

94b6fe9


          fix UT

3414f44

rujche reviewed

View reviewed changes

cli/azd/internal/repository/app_init.go Outdated Show resolved Hide resolved


          use func to refactor

d91b456

rujche approved these changes

View reviewed changes

rujche left a comment

LGTM.

rujche merged commit b5aceaa into azure-javaee:feature/sjad

6 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet