Compare commits

...

492 Commits

Author SHA1 Message Date
Satyendra Hari
47643eb2d0 added docs 2023-07-24 19:39:44 +05:30
Satyendra Hari
7a5e502428 update the port 2023-07-24 18:06:46 +05:30
Satyendra Hari
47d4d3cff6 add to the container 2023-07-24 16:32:36 +05:30
Satyendra Hari
becce91a7c added new module 2023-07-24 16:31:13 +05:30
David Fowler
06d5164532
Remove envoy (#2127)
- Just go through the gateway directly
- We'll need to update the mobile version eventually
2023-06-16 10:40:57 -07:00
David Fowler
67d4c06b6d
Fixed the spa project (#2126)
- Clean up the SPA project (removed dead code)
- Fixed URLs in override file
2023-06-15 08:03:56 -07:00
David Fowler
508fa593d7
Added implict usings (#2125) 2023-06-15 05:25:36 -07:00
David Fowler
3b9560c26e
Clean up usings and controller attributes (#2124)
* Clean up usings and controller attributes
- Removed redundant attributes when the controllers already specifies what the result type is.
- Use StatusCodes instead of HttpStatusCode.
- Clean up namespaces and use type aliases to disambiguate the many DTOs defined.

* Forgot one

* Update src/Services/Webhooks/Webhooks.API/Controllers/WebhooksController.cs

Co-authored-by: Reuben Bond <203839+ReubenBond@users.noreply.github.com>

---------

Co-authored-by: Reuben Bond <203839+ReubenBond@users.noreply.github.com>
2023-06-14 20:56:52 -07:00
David Fowler
c7c2d1ca2f
Merge pull request #2123 from eerhardt/FixRedisBasketRepository
Cache JsonSerializerOptions
2023-06-13 13:52:36 -07:00
Eric Erhardt
5d13c097d3 Address PR feedback 2023-06-13 14:41:55 -05:00
Eric Erhardt
42e161d1f9 Use file scoped namespace. 2023-06-13 11:33:29 -05:00
Eric Erhardt
fd76f390ef Cache JsonSerializerOptions
According to https://github.com/dotnet/runtime/issues/65396, using a new JsonSerializerOptions every time JsonSerializer is invoked is a suboptimal pattern.

Fix this by caching JsonSerializerOptions instances.
2023-06-13 11:31:11 -05:00
Tarun Jain
3169a93344
Merge pull request #2107 from dotnet-architecture/davidfowl/common-services
Modernization
2023-05-16 22:54:58 +05:30
David Fowler
df4eb4c124 More code sharing and clean up WebHooks client 2023-05-09 07:05:40 -07:00
Reuben Bond
e4b94decb2 Use Services.Common in WebhookClient 2023-05-09 07:05:40 -07:00
Reuben Bond
6f4ae509f1 Port WebhookClient to WebApplicationBuilder 2023-05-09 07:05:40 -07:00
David Fowler
dbef61fdaf Nuke the cors from the mobile BFF 2023-05-09 07:05:40 -07:00
Reuben Bond
6ebde3fb5c Remove on-start health check in Ordering.BackgroundTasks so that it doesn't crash on startup 2023-05-09 07:05:39 -07:00
Reuben Bond
8f9f9d168f Add libman package to WebMVC to fix site 2023-05-09 07:05:39 -07:00
Reuben Bond
f5218e8087 Start adding connection strings for VS launch profile 2023-05-09 07:05:39 -07:00
Reuben Bond
72c8167ec0 Attempt to migrate Mobile BFF to common services pattern 2023-05-09 07:05:39 -07:00
Reuben Bond
8c9524c771 Reduce double writes in Application.FunctionalTests build 2023-05-09 07:05:39 -07:00
Reuben Bond
9c2b972cc9 Correctly set scopes for AuthorizeCheckOperationFilter 2023-05-09 07:05:39 -07:00
Reuben Bond
3858d7ccf7 Fix integration tests 2023-05-09 07:05:39 -07:00
David Fowler
a87efdef32 Small nit 2023-05-09 07:05:39 -07:00
Reuben Bond
52cdd1645a Fix Handler_sends_no_command_when_order_already_exists test 2023-05-09 07:05:39 -07:00
David Fowler
89a42e6c8f Removed session since its not used 2023-05-09 07:05:39 -07:00
David Fowler
d5533c0ff9 Move the pic controller to a minimal API 2023-05-09 07:05:39 -07:00
David Fowler
8debda5c67 Don't read the file into memory 2023-05-09 07:05:39 -07:00
David Fowler
6ad5e8fb09 Deleted test controller 2023-05-09 07:05:39 -07:00
David Fowler
bdebee70dc Clean up SignIn action 2023-05-09 07:05:39 -07:00
David Fowler
184ed15ef6 Clean up the auth delegating handler 2023-05-09 07:05:39 -07:00
David Fowler
af42aab95e Don't launch the browser for signalr 2023-05-09 07:05:39 -07:00
David Fowler
6933d9997d Forward SignalR requests through the web app 2023-05-09 07:05:39 -07:00
David Fowler
992b58d4bc Fixed cookies 2023-05-09 07:05:39 -07:00
David Fowler
a7cdb1df68 Remove unused code 2023-05-09 07:05:39 -07:00
David Fowler
0a07aea4ff Small refactoring of the helper methods 2023-05-09 07:05:38 -07:00
David Fowler
8c2ca8dbd9 Make WebMVC use the service common helpers 2023-05-09 07:05:38 -07:00
David Fowler
40315c69d7 Make docker use the reverse proxy 2023-05-09 07:05:38 -07:00
David Fowler
62a6f17595 Removed unneeded usings 2023-05-09 07:05:38 -07:00
David Fowler
64a2d69e92 Use YARP native config 2023-05-09 07:05:38 -07:00
David Fowler
69476a3175 Use the default YARP configuration 2023-05-09 07:05:38 -07:00
David Fowler
758d4bbe88 Specify routes in config 2023-05-09 07:05:38 -07:00
David Fowler
bd745121b2 Added comment about allowed origins 2023-05-09 07:05:38 -07:00
David Fowler
84c6b11c69 Remove cors from the signalr service
- The frontend hits the gateway which does the preflight request
2023-05-09 07:05:38 -07:00
David Fowler
561d48bc62 Fix cors and prefix rewriting 2023-05-09 07:05:38 -07:00
David Fowler
6a2fceb57c Fix more urls 2023-05-09 07:05:38 -07:00
David Fowler
c3efea0293 Add YARP to the BFF directly.
- This avoids the extra process hop
2023-05-09 07:05:38 -07:00
David Fowler
30ed0011cb Added YARP as an API gateway
- It will eventually replace envoy
2023-05-09 07:05:38 -07:00
David Fowler
06d74d1658 Small tweaks to make the MVC application run locally 2023-05-09 07:05:38 -07:00
David Fowler
50952bed10 Sort usings and delete web.config 2023-05-09 07:05:38 -07:00
David Fowler
f76a8c61db Make default URLs work 2023-05-09 07:05:38 -07:00
David Fowler
5a2d38575e Fixed identity url 2023-05-09 07:05:38 -07:00
David Fowler
670a9452e1 Remove health check 2023-05-09 07:05:38 -07:00
David Fowler
69b28c6add Added gRPC and HTTP endpoints via config 2023-05-09 07:05:38 -07:00
David Fowler
d0c710ebdc Docker compose works 2023-05-09 07:05:38 -07:00
David Fowler
e1ec790ddf Make more things work with docker compose 2023-05-09 07:05:38 -07:00
David Fowler
6b8992153a Rename extensions to extensions 2023-05-09 07:05:38 -07:00
David Fowler
d086d278e8 Moved repository to top level folder 2023-05-09 07:05:38 -07:00
David Fowler
3c00be38f9 Make BFF work and clean up ports 2023-05-09 07:05:37 -07:00
David Fowler
031996d87c Fixed check 2023-05-09 07:05:37 -07:00
David Fowler
5ea034106c Move extensions to Extensions folder 2023-05-09 07:05:37 -07:00
David Fowler
acd9a6d04b Clean up the identity project and make it use services common 2023-05-09 07:05:37 -07:00
David Fowler
7027967568 More random clean up 2023-05-09 07:05:37 -07:00
David Fowler
e166b28a0a Update the webhooks project to use service common 2023-05-09 07:05:37 -07:00
Reuben Bond
bcb1374d1e Avoid logging exception details twice in a given log, clean up 2023-05-09 07:05:37 -07:00
David Fowler
57d9baf106 Make the payment API use the common code 2023-05-09 07:05:37 -07:00
David Fowler
a37b0430b2 Remove unneeded dependencies 2023-05-09 07:05:37 -07:00
David Fowler
2a4a6abf9b Small tweaks
- Fix the payment profile's launch profile
- Added Services.Common to global usings
2023-05-09 07:05:37 -07:00
David Fowler
c41cd3830c Updated background tasks to use common service logic 2023-05-09 07:05:37 -07:00
David Fowler
0cb6b08300 Clean up the project 2023-05-09 07:05:37 -07:00
David Fowler
9743c83221 Use the common services in the Ordering.SignalRHub project 2023-05-09 07:05:37 -07:00
David Fowler
6e69a2472e Small naming tweaks for consistency 2023-05-09 07:05:37 -07:00
David Fowler
3357c70bc1 Clean up excess in project file 2023-05-09 07:05:37 -07:00
David Fowler
909f08675b Make the ordering API use the commmon services 2023-05-09 07:05:37 -07:00
David Fowler
a41560544c Split redis and health checks for redis 2023-05-09 07:05:37 -07:00
David Fowler
08e7c3424d Delete more cruft
- Remove migration from the tests
2023-05-09 07:05:37 -07:00
David Fowler
7681405eaf More clean up 2023-05-09 07:05:37 -07:00
David Fowler
ccaad9dc20 Removed unneeded project deps 2023-05-09 07:05:37 -07:00
Reuben Bond
cf02e90aad Migrate from ILoggerFactory to ILogger<T> and use Logging Source Generator 2023-05-09 07:05:37 -07:00
David Fowler
5397e8d5c8 Made small tweak to startup 2023-05-09 07:05:36 -07:00
David Fowler
0fd20ee962 More clean up
- Make the catalog API runnable
- Delete some cruft
2023-05-09 07:05:36 -07:00
David Fowler
34fc9496fd Small clean up to error handling code 2023-05-09 07:05:36 -07:00
David Fowler
a381a6923c Removed filters and special errors handling from MVC 2023-05-09 07:05:36 -07:00
David Fowler
3056418c92 Made a health check api 2023-05-09 07:05:36 -07:00
Reuben Bond
917764273b Remove superfluous UseDeveloperExceptionPage() and AddOptions() calls 2023-05-09 07:05:36 -07:00
Reuben Bond
e2d8590a26 Use WebApplicationBuilder in Mobile.Shopping.HttpAggregator 2023-05-09 07:05:36 -07:00
Reuben Bond
f8abb36bc6 Remove non-existent wwwroot from HttpAggregator projects 2023-05-09 07:05:36 -07:00
Reuben Bond
16b63001df Add Identity sections to config and consume (likely broken). Simplify integration tests 2023-05-09 07:05:36 -07:00
Reuben Bond
83200f9331 Fix Dockerfiles to include Services.Common 2023-05-09 07:05:36 -07:00
Reuben Bond
fea08c78bb Finish removing Autofac 2023-05-09 07:05:36 -07:00
Reuben Bond
b9f48faf99 Use simpler syntax for default 2023-05-09 07:05:36 -07:00
Reuben Bond
02c163246b Add EventBus connection string to Catalog.API 2023-05-09 07:05:36 -07:00
Reuben Bond
da024f9812 Remove Program.AppName 2023-05-09 07:05:36 -07:00
Reuben Bond
8da0a81514 Remove Serilog usage 2023-05-09 07:05:35 -07:00
Reuben Bond
5342c86af0 Remove Serilog from Identity.API and clean up 2023-05-09 07:05:35 -07:00
Reuben Bond
3f5f0b94ed Remove Program from Catalog.API 2023-05-09 07:05:35 -07:00
Reuben Bond
7d28625959 Remove Serilog from Web.Shopping.HttpAggregator 2023-05-09 07:05:35 -07:00
David Fowler
d96e4db08c Remove Program 2023-05-09 07:05:35 -07:00
David Fowler
c59e66861f - Add redis health check
- Add health checks on startup
2023-05-09 07:05:35 -07:00
David Fowler
56d47db91e Read from the connection strings section 2023-05-09 07:05:35 -07:00
David Fowler
b48ba7b74b More clean up 2023-05-09 07:05:35 -07:00
David Fowler
41056e54d8 Update grpc reference 2023-05-09 07:05:35 -07:00
David Fowler
45a04e4a6d Make services run individually and outside of docker
- Removed manual port binding code
- Disable Seq and logstash if config is null
- Disable serilog for now
- Remove IIS from some launch profiles
- Clean up some logging.
2023-05-09 07:05:35 -07:00
David Fowler
bff808016e Remove the UseVault and use the existance of the section 2023-05-09 07:05:35 -07:00
David Fowler
48f640088b More clean up 2023-05-09 07:05:35 -07:00
David Fowler
4e743ef666 Not needed 2023-05-09 07:05:35 -07:00
David Fowler
366019aaa3 Use the assembly name instead of the type name 2023-05-09 07:05:35 -07:00
David Fowler
d4319bdd47 Redirect to swagger 2023-05-09 07:05:35 -07:00
David Fowler
c565a8f799 Unify configuration 2023-05-09 07:05:35 -07:00
David Fowler
794c546d2e Fix the catalog tests 2023-05-09 07:05:35 -07:00
David Fowler
f46b03cb36 Use before Map 2023-05-09 07:05:35 -07:00
David Fowler
d1372cba64 First pass at making the catalog API use the common service helpers 2023-05-09 07:05:34 -07:00
David Fowler
7da7e98a55 Configure so tests work again 2023-05-09 07:05:34 -07:00
David Fowler
9d52426a49 Use default logger 2023-05-09 07:05:34 -07:00
David Fowler
57a93f63f0 More customization 2023-05-09 07:05:34 -07:00
David Fowler
8a40e9fb48 More schema 2023-05-09 07:05:34 -07:00
David Fowler
3fee612e68 More tweaks 2023-05-09 07:05:34 -07:00
David Fowler
00fc3d8a65 More defaults 2023-05-09 07:05:34 -07:00
David Fowler
9af6d6342d Initial attempt at making a common service configuration 2023-05-09 07:05:34 -07:00
David Fowler
e7e0eed9cc Fixed remaining tests
- Lots of duplication zomg
2023-05-09 07:05:34 -07:00
David Fowler
c7edd50b38 Fix ordering and basked scenarios 2023-05-09 07:05:34 -07:00
David Fowler
233b6e56c1 Fixed catalog functional tests 2023-05-09 07:05:34 -07:00
David Fowler
d4c2f17c36 Remove whitespace 2023-05-09 07:05:34 -07:00
David Fowler
746e5da7fa Make more tests pass 2023-05-09 07:05:34 -07:00
David Fowler
f3d2843166 Make tests work 2023-05-09 07:05:34 -07:00
Reuben Bond
91247ec52e BAD MISC - playing with tests 2023-05-09 07:05:34 -07:00
Reuben Bond
d62ebcb791 Fix IncludeScopes 2023-05-09 07:05:34 -07:00
Reuben Bond
109853983d Remove gRPC generated code from global usings etc 2023-05-09 07:05:34 -07:00
Reuben Bond
d91da03665 Fix IncludeScopes setting in appsettings.json for WebSPA 2023-05-09 07:05:34 -07:00
Reuben Bond
746363bfd3 Remove accidentally committed keys and update .gitignore to prevent them being added again 2023-05-09 07:05:34 -07:00
Tarun Jain
3ae0cefbcf
Merge pull request #2105 from ReubenBond/rebond/1
Fix brace placement
2023-05-08 14:40:50 +05:30
Reuben Bond
451d79f7b9 Fix formatting 2023-05-04 06:48:37 -07:00
Reuben Bond
9d38de0c83
Merge pull request #2092 from erjain/update/webshoppingagg-webap-builder
Update/webshoppingagg webapp builder
2023-04-27 12:35:12 -07:00
Tarun Jain
65e2f13ca2 Resolving conversation on PR 2023-04-28 00:43:58 +05:30
Tarun Jain
7e2a966dbf
Merge pull request #2088 from RikVanHaaren/dev
Fix spelling
2023-04-25 17:11:27 +05:30
Tarun Jain
24858e50b7 formatting program.cs 2023-04-25 01:54:48 +05:30
Tarun Jain
52fb849b84 WebShopping-Agg: migrate to WebApplicationBuilder 2023-04-25 01:53:28 +05:30
Tarun Jain
7d06508e22
Merge pull request #2089 from erjain/update/ordering-webappbuilder
Update/ordering webappbuilder
2023-04-25 01:49:28 +05:30
Tarun Jain
ce5a165dd0 add editorconfig at solution root node 2023-04-25 01:38:59 +05:30
Tarun Jain
9a707ecaa1 remove editorconfig.bak 2023-04-19 00:20:42 +05:30
Tarun Jain
9759596899 Commit to migrate Oredeing.BackkgroundTasks and SignalRHub to webAppBuilder 2023-04-19 00:19:52 +05:30
Tarun Jain
b9e585b2e4
Merge pull request #2085 from erjain/update/payment-api
Commit to migrate payment api to WebApplicationBuilder
2023-04-19 00:17:19 +05:30
Rik van Haaren
ff78bb7577
Fix spelling 2023-04-18 15:49:56 +02:00
Tarun Jain
212343f274 delete startup.cs 2023-04-17 22:45:12 +05:30
Tarun Jain
433419b583 update payment.csproj 2023-04-17 22:28:28 +05:30
Tarun Jain
c0cc12ad0c Commit to migrate payment api to WebApplicationBuilder 2023-04-12 23:32:11 +05:30
Tarun Jain
ee673d9180
Merge pull request #2079 from erjain/update/ordering-api-webAppBuilder
Migrate Ordering.API to WebApplicationBuilder
2023-04-12 22:23:57 +05:30
Tarun Jain
e1fc28be8b add .editorconfigfiles 2023-03-31 23:26:34 +05:30
Tarun Jain
fee79c40a4 Migrate Ordering.API to WebApplicationBuilder 2023-03-30 12:01:37 +05:30
Tarun Jain
c8f1e0f148
Merge pull request #2075 from erjain/update/basket-api-webAppBuilder
Basket.API: Commit to migrate to WebApplication Builder
2023-03-29 00:37:28 +05:30
Tarun Jain
bb4307478c Fix formatting 2023-03-28 22:10:42 +05:30
Tarun Jain
19217e0939 Basket.API: Commit to migrate to WebApplication Builder 2023-03-27 23:56:55 +05:30
Tarun Jain
4a86d5e93f
Merge pull request #2073 from erjain/update/catalog-api-webapplication-builder
Catalog.API: Commit to migrate catalog api to webapplication builder
2023-03-27 23:50:54 +05:30
Tarun Jain
d6ea0cbdf5 commit use use CreateAsyncScope 2023-03-27 23:48:14 +05:30
Tarun Jain
e9351bfb2c Catalog.API: Commit to migrate catalog api to webapplication builder 2023-03-24 15:18:06 +05:30
Tarun Jain
0740fd42b1
Merge pull request #2066 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/webpack-5.76.0
Bump webpack from 5.75.0 to 5.76.0 in /src/Web/WebSPA/Client
2023-03-15 00:10:17 +05:30
dependabot[bot]
88a9a49da4
Bump webpack from 5.75.0 to 5.76.0 in /src/Web/WebSPA/Client
Bumps [webpack](https://github.com/webpack/webpack) from 5.75.0 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.75.0...v5.76.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-14 17:59:40 +00:00
Tarun Jain
390a37aca2
Merge pull request #2064 from erjain/update/eShop-refresh
Update and cleanup eShop
2023-03-14 23:28:27 +05:30
Reuben Bond
f92e02f3dd Convert WebStatus to WebApplicationBuilder 2023-03-10 13:47:18 +05:30
Reuben Bond
a0adc4bbf3 Remove unnecessary jQuery from WebStatus 2023-03-10 13:09:41 +05:30
Reuben Bond
98635a3e93 Eliminate Azure Dev Spaces 2023-03-10 13:09:35 +05:30
Reuben Bond
3097651747 Fix Docker build after moving to centralized packaging 2023-03-10 11:50:14 +05:30
Reuben Bond
10a783c5b4 NuGet: clear other sources 2023-03-10 11:49:56 +05:30
Reuben Bond
8552d3ada6 Do not publish or pack test projects 2023-03-10 11:49:24 +05:30
Reuben Bond
631a64940e Fix compiler warnings for unused variables 2023-03-10 11:49:01 +05:30
Reuben Bond
0cbd7b24e8 FIX: add Key Vault configuration 2023-03-10 11:48:21 +05:30
Reuben Bond
a2c45956a3 Use centralized package versioning 2023-03-10 11:45:18 +05:30
Reuben Bond
dbee1dad6d Add launchSettings.json 2023-03-10 01:14:51 +05:30
Reuben Bond
7a6e07cb64 WebMVC: Migrate to WebApplicationBuilder and delete Startup 2023-03-10 00:43:44 +05:30
Tarun Jain
242cbeabaf minor fix to removal of deprecated Azure Dev Spaces support 2023-03-10 00:39:19 +05:30
Reuben Bond
e43cf8effa Remove deprecated Azure Dev Spaces support 2023-03-09 23:35:11 +05:30
Reuben Bond
68d0df2e2f WebSPA: minor style fixes 2023-03-09 23:21:36 +05:30
Reuben Bond
77ea8ef352 Remove obsolete Azure Key Vault package 2023-03-09 23:18:46 +05:30
Reuben Bond
f7f4259147 Update JS libraries 2023-03-09 23:18:36 +05:30
Reuben Bond
049c4af196 WebSPA: migrate to WebApplicationBuilder and delete Startup 2023-03-09 22:26:46 +05:30
Reuben Bond
85ad916fcb Remove redundant using directives 2023-03-09 17:37:33 +05:30
Reuben Bond
b5d9d9653d Fix tests in Visual Studio by correcting connection strings 2023-03-09 17:36:11 +05:30
Reuben Bond
2c94c38269 Update NodeJS, NPM, and deps 2023-03-09 17:30:47 +05:30
Tarun Jain
faeebd3e2b
Merge pull request #2054 from erjain/fix/dependabot-alerts
migrate WebSPA to angular@15.x and fix vulnerability
2023-03-03 11:54:53 +05:30
James Montemagno
fed2b179eb
Merge pull request #2061 from erjain/fix/docs#19072
fixes docs issue #19072
2023-03-02 10:44:06 -08:00
Tarun Jain
4f58e58d46 fixes docs issue #19072 2023-03-02 18:40:56 +05:30
Tarun Jain
9c655ff9f0 commit to fix WebSPA build error 2023-02-25 16:58:51 +05:30
Tarun Jain
c0d58305b3 remove argument extract-css 2023-02-24 16:50:04 +05:30
Tarun Jain
2231774e70 fix Node_Image version 2023-02-24 16:45:21 +05:30
Tarun Jain
8bd43a4db4 Commit to update node version and npm version in Dockerfile docker-compose.yml 2023-02-24 16:29:29 +05:30
Tarun Jain
5ca9c997b7 commit to update vulnerable versions of minimist - Prototype Pollution in minimist 2023-02-24 15:20:06 +05:30
Tarun Jain
a04b214705 Commit to resolve minimatch ReDoS vulnerability 2023-02-24 15:13:05 +05:30
Tarun Jain
5ccbce36b5 commit to resolve vulnerable versions of @angular/core via node_modules/codelyzer 2023-02-24 13:34:46 +05:30
Tarun Jain
47f9559de0 Commit to migrate angular version to latest '15.x' 2023-02-23 16:20:31 +05:30
Tarun Jain
d9d0bd2302 commit to migrate angular version to '14.x' 2023-02-23 16:15:24 +05:30
Tarun Jain
0fd7b932fc commit to migrate angualr version to @angular 13.3.10 2023-02-23 16:01:05 +05:30
Tarun Jain
2a26c4be10 fixes with some package updates 2023-02-23 15:15:05 +05:30
Tarun Jain
042d6ce621 commit to migrate to 12.2.18 2023-02-23 13:17:19 +05:30
Tarun Jain
286971e60c
Merge pull request #2052 from sispehar/sispehar/fix/helm/configmap/trustservercertificate
adding TrustServerCertificate=true to ConnectionString in Helm templates
2023-02-20 19:45:10 +05:30
Simon
bb554c1706 adding TrustServerCertificate=True to ConnectionString in Helm templates 2023-02-17 20:51:53 +01:00
James Montemagno
7cf90e06fd
Merge pull request #2048 from erjain/fix/certificate-issue
commit to resolve RemoteCertificateValidationCallback issue
2023-02-14 09:00:48 -08:00
Tarun Jain
98e7e53636 commit to resolve RemoteCertificateValidationCallback issue 2023-02-10 11:46:13 +05:30
Tarun Jain
3e991acc50
Merge pull request #2019 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/express-4.18.2
Bump express from 4.17.2 to 4.18.2 in /src/Web/WebSPA/Client
2023-02-07 13:19:19 +05:30
Tarun Jain
fa9e955a2b
Merge pull request #2016 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/decode-uri-component-0.2.2
Bump decode-uri-component from 0.2.0 to 0.2.2 in /src/Web/WebSPA/Client
2023-02-06 18:36:42 +05:30
Tarun Jain
50d945a395
Merge pull request #2043 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/jszip-3.10.1
Bump jszip from 3.7.1 to 3.10.1 in /src/Web/WebSPA/Client
2023-02-06 18:34:49 +05:30
Tarun Jain
ea54e4482f
Merge pull request #2015 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/qs-6.5.3
Bump qs from 6.5.2 to 6.5.3 in /src/Web/WebSPA/Client
2023-02-06 18:31:56 +05:30
dependabot[bot]
e3715d0213
Bump qs from 6.5.2 to 6.5.3 in /src/Web/WebSPA/Client
Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-06 12:51:58 +00:00
Tarun Jain
678c80cf98
Merge pull request #2029 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/json5-1.0.2
Bump json5 from 1.0.1 to 1.0.2 in /src/Web/WebSPA/Client
2023-02-06 18:20:27 +05:30
Tarun Jain
676d138962
Merge pull request #2039 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/ua-parser-js-0.7.33
Bump ua-parser-js from 0.7.31 to 0.7.33 in /src/Web/WebSPA/Client
2023-02-06 18:18:23 +05:30
Tarun Jain
dabdcac3bd
Merge pull request #2044 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/http-cache-semantics-4.1.1
Bump http-cache-semantics from 4.1.0 to 4.1.1 in /src/Web/WebSPA/Client
2023-02-06 18:11:15 +05:30
Tarun Jain
9a914889fd
Merge pull request #2045 from erjain/net7-duende-fix
update README.md
2023-02-06 17:49:59 +05:30
Tarun Jain
ad8c8054fe updated Contributing.md 2023-02-06 16:29:19 +05:30
Tarun Jain
4119fe06dc updates the branch-guide.md 2023-02-06 16:20:32 +05:30
Tarun Jain
368952d432 update README.md 2023-02-03 14:50:35 +05:30
dependabot[bot]
72cf029258
Bump http-cache-semantics from 4.1.0 to 4.1.1 in /src/Web/WebSPA/Client
Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: http-cache-semantics
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-03 09:06:39 +00:00
Tarun Jain
e15a62270c
Merge pull request #2012 from erjain/net7-duende-fix
update to Net7 and Duende IdentityServer 6.2
2023-02-03 14:33:43 +05:30
dependabot[bot]
79c4d06747
Bump jszip from 3.7.1 to 3.10.1 in /src/Web/WebSPA/Client
Bumps [jszip](https://github.com/Stuk/jszip) from 3.7.1 to 3.10.1.
- [Release notes](https://github.com/Stuk/jszip/releases)
- [Changelog](https://github.com/Stuk/jszip/blob/main/CHANGES.md)
- [Commits](https://github.com/Stuk/jszip/compare/v3.7.1...v3.10.1)

---
updated-dependencies:
- dependency-name: jszip
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-02 18:34:10 +00:00
dependabot[bot]
29241ec3d2
Bump ua-parser-js from 0.7.31 to 0.7.33 in /src/Web/WebSPA/Client
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.31 to 0.7.33.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.31...0.7.33)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-27 10:08:16 +00:00
dependabot[bot]
dd18f8df55
Bump json5 from 1.0.1 to 1.0.2 in /src/Web/WebSPA/Client
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-07 19:26:34 +00:00
dependabot[bot]
8bfb1bd06b
Bump express from 4.17.2 to 4.18.2 in /src/Web/WebSPA/Client
Bumps [express](https://github.com/expressjs/express) from 4.17.2 to 4.18.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.2...4.18.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-15 18:49:44 +00:00
Tarun Jain
0f2ade49fb Merge branch 'net7-duende-fix' of https://github.com/erjain/eShopOnContainers into net7-duende-fix 2022-12-14 18:08:33 +05:30
Tarun Jain
9a5ea85223 Update seed data with card expiration date 2022-12-14 18:08:19 +05:30
Tarun Jain
365077a191
Merge branch 'dev' into net7-duende-fix 2022-12-14 18:03:52 +05:30
Tarun Jain
e4f2b62b5e update 7.0 sdk 2022-12-13 20:57:32 +05:30
Tarun Jain
a464a6996e fix authentication issue in identity.api 2022-12-13 18:18:06 +05:30
dependabot[bot]
6a00e8bb9b
Bump decode-uri-component from 0.2.0 to 0.2.2 in /src/Web/WebSPA/Client
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-07 16:24:16 +00:00
Tarun Jain
892da8b2c2 update devspaces.support to .NET 7 2022-12-06 00:08:40 +05:30
Tarun Jain
3a03508f8a minor fixes 2022-12-02 02:01:14 +05:30
Tarun Jain
b90d2d1cd4 implement Duende.IdentityServer 6.2.0 2022-11-30 21:55:07 +05:30
Tarun Jain
c10fff488c fix serilog error 2022-11-29 02:56:34 +05:30
Tarun Jain
9b3e00d756 update nuget packages for complete solution 2022-11-29 00:56:35 +05:30
Tarun Jain
b5b667b385 commit to update IdentityServer 3.1 to Duende.IdentityServer 6.2.0 2022-11-28 17:32:59 +05:30
Tarun Jain
4596d7aa99
Merge pull request #2005 from dotnet-architecture/dependabot/nuget/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/System.Data.SqlClient-4.8.5
Bump System.Data.SqlClient from 4.8.2 to 4.8.5 in /src/BuildingBlocks/WebHostCustomization/WebHost.Customization
2022-11-22 21:20:29 +05:30
Tarun Jain
b8cc0d2cff
Merge pull request #2003 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/engine.io-and-socket.io-6.2.1
Bump engine.io and socket.io in /src/Web/WebSPA/Client
2022-11-22 21:18:54 +05:30
dependabot[bot]
2e7f6823ab
Bump engine.io and socket.io in /src/Web/WebSPA/Client
Bumps [engine.io](https://github.com/socketio/engine.io) and [socket.io](https://github.com/socketio/socket.io). These dependencies needed to be updated together.

Updates `engine.io` from 6.1.2 to 6.2.1
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/6.1.2...6.2.1)

Updates `socket.io` from 4.4.1 to 4.5.3
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/4.4.1...4.5.3)

---
updated-dependencies:
- dependency-name: engine.io
  dependency-type: indirect
- dependency-name: socket.io
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-22 15:43:35 +00:00
dependabot[bot]
c80ee1ea62
Bump System.Data.SqlClient
Bumps [System.Data.SqlClient](https://github.com/dotnet/corefx) from 4.8.2 to 4.8.5.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

---
updated-dependencies:
- dependency-name: System.Data.SqlClient
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-22 15:41:44 +00:00
Tarun Jain
70a2548d8b
Merge pull request #2004 from dotnet-architecture/dependabot/nuget/src/Services/Ordering/Ordering.BackgroundTasks/System.Data.SqlClient-4.8.5
Bump System.Data.SqlClient from 4.8.2 to 4.8.5 in /src/Services/Ordering/Ordering.BackgroundTasks
2022-11-22 21:11:15 +05:30
Tarun Jain
2f2cf83167
Merge pull request #1999 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/loader-utils-1.4.2
Bump loader-utils from 1.1.0 to 1.4.2 in /src/Web/WebSPA/Client
2022-11-22 21:07:52 +05:30
dependabot[bot]
74830148f5
Bump System.Data.SqlClient
Bumps [System.Data.SqlClient](https://github.com/dotnet/corefx) from 4.8.2 to 4.8.5.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

---
updated-dependencies:
- dependency-name: System.Data.SqlClient
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-22 15:36:55 +00:00
Tarun Jain
911d7329b0
Merge pull request #1998 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/socket.io-parser-4.0.5
Bump socket.io-parser from 4.0.4 to 4.0.5 in /src/Web/WebSPA/Client
2022-11-22 21:06:15 +05:30
dependabot[bot]
970f63cbe1
Bump loader-utils from 1.1.0 to 1.4.2 in /src/Web/WebSPA/Client
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.1.0 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.1.0...v1.4.2)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-11 07:51:32 +00:00
dependabot[bot]
956f80a4ce
Bump socket.io-parser from 4.0.4 to 4.0.5 in /src/Web/WebSPA/Client
Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/socketio/socket.io-parser/releases)
- [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io-parser/compare/4.0.4...4.0.5)

---
updated-dependencies:
- dependency-name: socket.io-parser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-09 22:37:39 +00:00
Tarun Jain
2de2ddc041 update identity.api 2022-11-07 12:45:49 +05:30
Tarun Jain
390d737235 update webhooks.api 2022-10-27 20:17:06 +05:30
Tarun Jain
218759a5de update webapps 2022-10-27 18:55:55 +05:30
Tarun Jain
e38abbfba8 update Services\Ordering and services\Catalog 2022-10-27 17:56:07 +05:30
Tarun Jain
ea24ac57bf update basket.api, Basket.UnitTests, Basket.FunctionalTests & Application.FunctionalTests 2022-10-11 17:03:47 +05:30
Tarun Jain
8438a6a652
Merge pull request #1955 from teghoz/dev
move custom extension into a separate file
2022-09-02 14:29:10 +05:30
Tarun Jain
efb39deea2
Merge pull request #1956 from Ich1goSan/feature/webhooks-api-refactoring
minor refactoring of Webhooks.API
2022-09-02 14:24:31 +05:30
Daniyar Alpyspayev
7554b037e9
indent fixed 2022-08-31 18:01:10 +06:00
Daniyar Alpyspayev
e8e6e24d6b
Revert grant checking else block 2022-08-31 17:58:18 +06:00
Daniyar Alpyspayev
a339e213ba minor refactoring (typo, private fields, etc.), fix comparing hosts in GrantUrlTesterService 2022-08-20 00:06:27 +06:00
Aghogho Bernard
4857831269 move extension into a seperate file 2022-08-18 11:15:54 +04:00
Tarun Jain
1807e952cf
Merge pull request #1934 from TarasKovalenko/disposeAsync
feat: changing the Dispose with potential deadlocks to the DisposeAsync
2022-08-02 15:13:05 +05:30
Taras Kovalenko
94c300b604 Merge branch 'dev' into disposeAsync 2022-08-01 13:09:15 +03:00
Taras Kovalenko
acac295afc
Merge pull request #69 from dotnet-architecture/dev
update fork
2022-08-01 13:09:06 +03:00
Tarun Jain
ce50bb8a2f
Merge pull request #1944 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/got-12.1.0
Bump got from 6.7.1 to 12.1.0 in /src/Web/WebSPA/Client
2022-07-25 23:34:45 +05:30
dependabot[bot]
ea16ccbe9d
Bump got from 6.7.1 to 12.1.0 in /src/Web/WebSPA/Client
Bumps [got](https://github.com/sindresorhus/got) from 6.7.1 to 12.1.0.
- [Release notes](https://github.com/sindresorhus/got/releases)
- [Commits](https://github.com/sindresorhus/got/compare/v6.7.1...v12.1.0)

---
updated-dependencies:
- dependency-name: got
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-25 17:57:43 +00:00
Tarun Jain
e5abbd5f22
Merge pull request #1938 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/terser-4.8.1
Bump terser from 4.8.0 to 4.8.1 in /src/Web/WebSPA/Client
2022-07-25 23:26:32 +05:30
Tarun Jain
12ee00d660
Merge pull request #1924 from Ich1goSan/feature/minor-refactoring
Minor refactoring
2022-07-25 23:11:49 +05:30
Tarun Jain
e565a4ead4
Merge pull request #1939 from vlad2689/dev
Update LibraryManager to 2.1.175
2022-07-25 17:34:11 +05:30
vlad2689
d719444e61 Update LibraryManager to 2.1.175 2022-07-23 18:15:16 +03:00
dependabot[bot]
8c1de99091
Bump terser from 4.8.0 to 4.8.1 in /src/Web/WebSPA/Client
Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-20 07:26:37 +00:00
Taras Kovalenko
f14efba677 Merge branch 'dev' into disposeAsync 2022-07-03 15:10:41 +03:00
Taras Kovalenko
cdf073a53d
Merge pull request #68 from dotnet-architecture/dev
update fork
2022-07-03 14:45:46 +03:00
Taras Kovalenko
fe1b9218e0 feat: changing the Dispose with potential deadlocks to the DisposeAsync 2022-07-03 14:43:17 +03:00
Tarun Jain
c863b143d7
Update package-json to resolve dependabot alert due to got (npm) version (#1932)
* Update package-json to resolve dependabot alert due to got version

* update yarn.lock

Co-authored-by: Tarun Jain <v-tjain@microsoft.com>
2022-06-30 19:02:25 +05:30
Daniyar Alpyspayev
6d26221979 removed SetCompatibilityVersion as it was deprecated, removed duplicated usings, minor refactoring 2022-06-11 16:50:42 +06:00
Tarun Jain
d835809dc4
Commit to resolve dependabot alerts for eventsource (#1918)
Co-authored-by: Tarun Jain <v-tjain@microsoft.com>
2022-06-06 21:04:34 +05:30
Taras Kovalenko
657584cbfe
Merge pull request #67 from dotnet-architecture/dev
update eShopOnContainers forrk
2022-06-04 23:02:46 +03:00
Tarun Jain
7b7f65e755
Merge pull request #1914 from onurkanbakirci/dev
Typo in ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler
2022-05-19 13:23:36 +05:30
Tarun Jain
8c564a6edc
Merge pull request #1916 from dotnet-architecture/dependabot/nuget/src/Services/Webhooks/Webhooks.API/Microsoft.AspNetCore.Authentication.JwtBearer-5.0.9
Bump Microsoft.AspNetCore.Authentication.JwtBearer from 5.0.2 to 5.0.9 in /src/Services/Webhooks/Webhooks.API
2022-05-18 02:20:54 +05:30
dependabot[bot]
d295ed4909
Bump Microsoft.AspNetCore.Authentication.JwtBearer
Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/dotnet/aspnetcore) from 5.0.2 to 5.0.9.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.2...v5.0.9)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-16 17:17:35 +00:00
Onurkan Bakırcı
42f16acd9f
Typo in ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler 2022-05-14 14:31:46 +03:00
Tarun Jain
37474024fa
Merge pull request #1911 from onurkanbakirci/dev-mediator
MediatR error solved.
2022-05-13 00:43:32 +05:30
Tarun Jain
de90e6e198
Merge pull request #1910 from onurkanbakirci/dev
Shortcuts added for get methods.
2022-05-09 16:27:43 +05:30
Onurkan Bakırcı
3170b3e7ce
System.Collections.Generic namespace added to globalusings. 2022-05-06 10:18:06 +03:00
Onurkan Bakırcı
9817c865f3
Shortcut addSystem.Collections.Generic namespace added to globalusingsed for get methods. 2022-05-06 10:14:46 +03:00
Onurkan Bakırcı
d5b5d6cca7
MediatR error solved. 2022-05-06 10:09:41 +03:00
Onurkan Bakırcı
27445a34f3
Shortcuts added for get methods. 2022-05-06 10:06:20 +03:00
Tarun Jain
f026de60cf
Merge pull request #1903 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/async-2.6.4
Bump async from 2.6.3 to 2.6.4 in /src/Web/WebSPA/Client
2022-05-04 15:55:27 +05:30
dependabot[bot]
7252faaff0
Bump async from 2.6.3 to 2.6.4 in /src/Web/WebSPA/Client
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-29 17:00:19 +00:00
Tarun Jain
59805331cd
Merge pull request #1884 from szukuro/dev
Adding various language enhancements, removing unused/duplicated extension
2022-04-29 19:26:06 +05:30
szukuro
dd7d2bc086
Merge branch 'dotnet-architecture:dev' into dev 2022-04-05 13:46:05 +02:00
Tarun Jain
3af7133157
Merge pull request #1885 from MACEL94/patch-1
Removed useless comment in queue-all.ps1
2022-04-05 17:02:44 +05:30
Tarun Jain
e9f53d2c69
Merge pull request #1887 from BTDevelop/patch-1
basket api local port mistake fixed
2022-04-05 16:58:42 +05:30
Burak Tahtacıoğlu
e378d757a5
basket api local port mistake fixed 2022-04-02 12:04:25 +03:00
szukuro
7f1c6c9c5d
Merge branch 'dotnet-architecture:dev' into dev 2022-03-31 16:18:41 +02:00
Tarun Jain
3f7a2faae8
Commit to fix dependabot alerts - bump node-forge, minimist (#1886)
Co-authored-by: Tarun Jain <v-tjain@microsoft.com>
2022-03-31 18:07:51 +05:30
Francesco Belacca
8270b7e0bb
Update queue-all.ps1
removed useless comment
2022-03-27 10:53:21 +02:00
szukuro
303c958e43 Adding various language enhancements, removing unused/duplicated extension 2022-03-23 15:26:45 +01:00
Onurkan Bakırcı
981507dccb
Identity Server spelling mistake (#1881)
In Identity.API project's Startup.cs file contains spelling mistake.
2022-03-21 13:23:40 +05:30
Tarun Jain
91c71528f6
Merge pull request #1880 from marranica/patch-2
Fixed typo in Vault ClientId configuration value from "your-clien-id" to "your-client-id" on Catalog and Ordering API
2022-03-21 11:15:14 +05:30
Tarun Jain
5fd180a00d
Merge pull request #1879 from zahid-cakici/dev
Spelling mistakes on comments
2022-03-21 11:10:09 +05:30
Marranica
750d2db417
Update appsettings.json
Fixed typo in Vault ClientId configuration value from "your-clien-id" to "your-client-id"
2022-03-19 23:09:52 +00:00
Marranica
a24354bff2
Update appsettings.json
Fixed typo in Vault ClientId configuration value from "your-clien-id" to "your-client-id"
2022-03-19 23:05:35 +00:00
Zahid Cakici
9ee85f0d2c
Spelling mistakes fixed in comments 2022-03-19 19:48:57 +03:00
A-Soltani
4458a096c9
fix constructor injection for _validators (#1809) 2022-03-16 15:22:16 -05:00
Marranica
4ecd27ccf6
Update appsettings.json (#1875)
Fixed typo in Vault ClientId configuration value from "your-clien-id" to "your-client-id"
2022-03-16 17:30:22 +05:30
Tarun Jain
231da1c10b
update node-forge and glob-parent version (#1874) 2022-03-14 12:33:32 +05:30
Tarun Jain
2170f23bd1
Fix/dependabot alerts10 (#1872)
* update saa-lint version

* update after npm install

* commit

* Revert "commit"

This reverts commit e1c1408635f3e34f85eeaaefe018a6dd15c9a8ec.

* Revert "update after npm install"

This reverts commit a861324c752e10c286bb0ad74acd7f737198bc48.

* update sass-lint and eslint

* fix dependabot alerts - update shelljs

* update integrity

* update webpack-dev-server

* update minimist and merge dependencies

Co-authored-by: Tarun Jain <v-tjain@microsoft.com>
2022-03-10 17:55:20 +05:30
KurnakovMaksim
4ac25bf58d
Little fix and refactoring (#1860)
* Delete repeat setting a property in CreateOrderCommand ctor

* Fix catalogTypeName -> catalogBrandName in exception message

* Delete useless null check from ConsentController

* Add null check for subjectId
2022-03-09 20:21:19 +05:30
Tarun Jain
548a0ecaf2
commit to fix dependabot alerts (#1870)
* commit to fix dependabot alerts

* Commit to fix dependabot alerts - update webpack-dev-server

* commit to fix dependabot alerts

Co-authored-by: Tarun Jain <v-tjain@microsoft.com>
2022-03-09 15:26:56 +05:30
dependabot[bot]
48dbb225d7
Bump karma from 6.3.14 to 6.3.16 in /src/Web/WebSPA/Client (#1868)
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.14 to 6.3.16.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.14...v6.3.16)

---
updated-dependencies:
- dependency-name: karma
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-03 16:37:36 +05:30
Tarun Jain
77c117e014
Update envoy version for Mobile shopping API Gateway (#1866) 2022-03-02 14:33:53 +05:30
Tarun Jain
8ed7a0066f
commit to update dependabot alerts using npm audit fix (#1863)
Co-authored-by: Tarun Jain <v-tjain@microsoft.com>
2022-02-23 17:04:20 +05:30
dependabot[bot]
57bc496879
Bump url-parse from 1.5.2 to 1.5.9 in /src/Web/WebSPA/Client (#1861)
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.2 to 1.5.9.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.2...1.5.9)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-21 16:51:29 +05:30
Tarun Jain
97550d5f19
Commit to fix dependabot alert - Inefficient Regular Expression Complexity in marked (#1858)
Co-authored-by: Tarun Jain <v-tjain@microsoft.com>
2022-02-21 15:52:49 +05:30
Tarun Jain
4bdcbd4318
Merge pull request #1856 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/follow-redirects-1.14.8
Bump follow-redirects from 1.14.7 to 1.14.8 in /src/Web/WebSPA/Client
2022-02-16 21:40:08 +05:30
dependabot[bot]
73cc967879
Bump follow-redirects from 1.14.7 to 1.14.8 in /src/Web/WebSPA/Client
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-16 16:04:04 +00:00
Tarun Jain
a254b1f8a9
Merge pull request #1854 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/karma-6.3.14
Bump karma from 6.3.6 to 6.3.14 in /src/Web/WebSPA/Client
2022-02-16 21:32:21 +05:30
Tarun Jain
a73c216858
Merge pull request #1853 from dotnet-architecture/dependabot/nuget/src/Services/Ordering/Ordering.API/Google.Protobuf-3.15.0
Bump Google.Protobuf from 3.14.0 to 3.15.0 in /src/Services/Ordering/Ordering.API
2022-02-16 21:29:53 +05:30
Tarun Jain
59d10375f0
Merge pull request #1852 from dotnet-architecture/dependabot/nuget/src/ApiGateways/Web.Bff.Shopping/aggregator/Google.Protobuf-3.15.0
Bump Google.Protobuf from 3.14.0 to 3.15.0 in /src/ApiGateways/Web.Bff.Shopping/aggregator
2022-02-16 21:28:56 +05:30
dependabot[bot]
56233eb10e
Bump Google.Protobuf in /src/Services/Ordering/Ordering.API
Bumps [Google.Protobuf](https://github.com/protocolbuffers/protobuf) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/master/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.14.0...v3.15.0)

---
updated-dependencies:
- dependency-name: Google.Protobuf
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-16 15:56:07 +00:00
dependabot[bot]
67b60b5368
Bump Google.Protobuf in /src/ApiGateways/Web.Bff.Shopping/aggregator
Bumps [Google.Protobuf](https://github.com/protocolbuffers/protobuf) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/master/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.14.0...v3.15.0)

---
updated-dependencies:
- dependency-name: Google.Protobuf
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-16 15:56:06 +00:00
Tarun Jain
05f7a3cc85
Merge pull request #1851 from dotnet-architecture/dependabot/nuget/src/Services/Basket/Basket.API/Google.Protobuf-3.15.0
Bump Google.Protobuf from 3.14.0 to 3.15.0 in /src/Services/Basket/Basket.API
2022-02-16 21:25:20 +05:30
dependabot[bot]
acb16cd454
Bump Google.Protobuf in /src/Services/Basket/Basket.API
Bumps [Google.Protobuf](https://github.com/protocolbuffers/protobuf) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/master/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.14.0...v3.15.0)

---
updated-dependencies:
- dependency-name: Google.Protobuf
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-16 15:51:23 +00:00
Tarun Jain
074e91a5f8
Merge pull request #1850 from dotnet-architecture/dependabot/nuget/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Google.Protobuf-3.15.0
Bump Google.Protobuf from 3.14.0 to 3.15.0 in /src/ApiGateways/Mobile.Bff.Shopping/aggregator
2022-02-16 21:20:33 +05:30
dependabot[bot]
9a67f0a3ab
Bump Google.Protobuf in /src/ApiGateways/Mobile.Bff.Shopping/aggregator
Bumps [Google.Protobuf](https://github.com/protocolbuffers/protobuf) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/master/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.14.0...v3.15.0)

---
updated-dependencies:
- dependency-name: Google.Protobuf
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-16 15:48:08 +00:00
Tarun Jain
dc91064986
Merge pull request #1849 from dotnet-architecture/dependabot/nuget/src/Services/Catalog/Catalog.API/Google.Protobuf-3.15.0
Bump Google.Protobuf from 3.14.0 to 3.15.0 in /src/Services/Catalog/Catalog.API
2022-02-16 21:17:32 +05:30
Nish Anil
2685ed07d2
Updated envoy version for Webshopping API Gateway (#1857)
* Fixes to enoyroute

* Fix proxy buffer

* Fixes for AKS
2022-02-16 04:24:44 +05:30
Tarun Jain
d141ee6aa2
Merge pull request #1848 from dotnet-architecture/dependabot/npm_and_yarn/src/Web/WebSPA/Client/undefsafe-2.0.5
Bump undefsafe from 2.0.2 to 2.0.5 in /src/Web/WebSPA/Client
2022-02-15 13:14:45 +05:30
dependabot[bot]
c1cf5a1d84
Bump karma from 6.3.6 to 6.3.14 in /src/Web/WebSPA/Client
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.6 to 6.3.14.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.6...v6.3.14)

---
updated-dependencies:
- dependency-name: karma
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-11 12:35:42 +00:00
dependabot[bot]
3669a73651
Bump Google.Protobuf in /src/Services/Catalog/Catalog.API
Bumps [Google.Protobuf](https://github.com/protocolbuffers/protobuf) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/master/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.14.0...v3.15.0)

---
updated-dependencies:
- dependency-name: Google.Protobuf
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-11 02:37:12 +00:00
dependabot[bot]
79863be51e
Bump undefsafe from 2.0.2 to 2.0.5 in /src/Web/WebSPA/Client
Bumps [undefsafe](https://github.com/remy/undefsafe) from 2.0.2 to 2.0.5.
- [Release notes](https://github.com/remy/undefsafe/releases)
- [Commits](https://github.com/remy/undefsafe/compare/v2.0.2...v2.0.5)

---
updated-dependencies:
- dependency-name: undefsafe
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-10 13:01:49 +00:00
Tarun Jain
a8c7b746d1
Commit to fix dependabot alerts Bump jszip from 3.2.0 to 3.7.1 (#1847)
Co-authored-by: Tarun Jain <v-tjain@microsoft.com>
2022-02-08 17:02:33 +05:30
dependabot[bot]
967d009219
Bump dot-prop from 4.2.0 to 4.2.1 in /src/Web/WebSPA/Client (#1844)
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v4.2.0...v4.2.1)

---
updated-dependencies:
- dependency-name: dot-prop
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-07 13:58:11 +05:30
Tarun Jain
d7d288831b
Commit to update the changes for depedabot alerts - Bump jszip from 3.2.0 to 3.7.1 in /src/Web/WebSPA/Client (#1840)
Co-authored-by: Tarun Jain <v-tjain@microsoft.com>
2022-02-01 17:03:20 +05:30
Tarun Jain
5270d3de35
Fix Dependabot alerts - Bump dns-packet from 1.3.1 to 1.3.4 in /src/Web/WebSPA/Client (#1837) 2022-01-31 12:07:20 +05:30
Tarun Jain
5f17aec741
Fix dependabot alerts - Update yarn.lock and package-lock.json in WebSPA project (#1833)
Co-authored-by: Tarun Jain <v-tjain@microsoft.com>
2022-01-27 15:06:41 +05:30
Tarun Jain
7185809ab8
Update jsonpointer version 5.0.0, ansi-html version to 0.0.8 and webp… (#1822)
* Update jsonpointer version 5.0.0, ansi-html version to 0.0.8 and webpack-dev-server  to webpack-dev-server version 3.11.2 was using ansi-html which is depreciated but in latest version 3.11.3 it's changed to ansi-html-community version 0.0.8

* Fix integrity issue in PR #1822

Co-authored-by: Tarun Jain <v-tjain@microsoft.com>
2022-01-25 17:04:34 +05:30
Aaron Crawfis
5f649db4ae
Update Redis to not resolve DNS at startup (#1776)
Co-authored-by: Nish Anil <nish@microsoft.com>
2021-12-08 16:39:50 +05:30
chertby
346bab2225
docs: Fix typo in comments (#1796) 2021-12-07 14:52:32 +05:30
Sumit Ghosh
9e5cd835b4
Removed language preview version from csproj (#1793) 2021-11-17 16:42:17 +05:30
Sumit Ghosh
145357de1e
Updated credit card expiration details (#1794) 2021-11-17 16:41:37 +05:30
Sumit Ghosh
630cb35cfb
Updates to .NET 6.0 (#1786)
* Seeking feedback: Build and run on .Net 6 preview 6 (#1734)

* Updgrade build and hosting machines to .net6 latest

* Target .net 6

* ILogger is ambiguous?

* More ILogger ambiguity

* Use preview 6... seeing errors in preview 7...

* Of course the SDK version is different :)

* downgrade the last nonworking component

* Only restore the packages we need for the one off service stuck in .net 5

* Downgrade development docker files to use the preview 6 sdk

* Updates `basket-api` to .NET 6 (#1742)

* Use global usings

* Use file-scoped namespaces

* Updates docker images to preview 7

* Created a new migration plan

* Included global usings for identity project

* Updated docker file to preview version to 7

* Updated dockerfiles

* Merged conent from Startup.cs to Program.cs

* Removed Starup.cs

* Removed unnecessary files

* Revert "Removed unnecessary files"

This reverts commit 536bddcd96b54673401cedbe802520dce12b3472.

* Revert "Removed Starup.cs"

This reverts commit 46175d7aa97475d88ec46bce39ed498c7037d924.

* Revert "Merged conent from Startup.cs to Program.cs"

This reverts commit 2766ea86dfef9220fe3f0c27a37a9a6c18153078.

* Removed extra spaces

* Updated basket-api project file

* Update src/Services/Basket/Basket.API/Grpc/BasketService.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Moved the fully qualified namespace on top

* Updated relevant packages in basket.api project

* Updated relevant packages in identity.api project

Co-authored-by: David Pine <david.pine@microsoft.com>

* Updates all the services to .NET 6.0 (#1770)

* Created global using file for catalog.api

* Moved individual usings statements to globalusing

* Updated catalog.api project

* Fixed local run bug for catalog.api

* Included globalusing for payment.api

* Refactored namespace statement for payment.api

* Moved namespaces to ordering.domain project

* Included globalusing for ordering.domain project

* Included globalusings for ordering.infrastructure project

* Refactored namespaces for ordering.infrastructure project

* Updated relevant packages in ordering.infrastructure project

* Included globalusings for ordering.signalrHub project

* Moved all the namespace to globalusings

* Updated packages in ordering.signalrHub csproj file

* Refactored namespace statements in catalog.api project

* Fixed namespace name in ordering.domain

* Included global usings for ordering.api project

* Moved all usings to globalusing file

* Updated ordering.api csproj project

* Fixed bug in statup.cs

* Updated ordering.unittests.csproj file

* Included globalusings in webhooks.api project

* Moved using statements to globalusing file in webhooks.api

* Included globalusing for web.bff.shoppping aggregator project

* Moved namespaces to globalusing shopping aggregator

* Included globalusing mobile.bff.shoppping project

* Moved namespaces to globalusing file

* Included globalusing for eventbus project

* Moved namespaces to global usings for eventbus

* Included globalusing for EventBusRabbitMQ project

* Moved using statements to EventBusRabbitMQ project

* Included global using in EventBusServiceBus project

* Moved using statements to globalusing for EventBusServiceBus

* Included globalusing file for IntegrationEventLogEF project

* Move using statements to globalusing file

* Updated packages of IntegrationEventLogEF project

* Included globalusing to Devspaces.Support project

* Moved using statements to globalusing Devspaces

* Updated dependent packages for Devspaces.Support.csproj

* Fixed bug in Basket API

* Fixed bug in catalog.api

* Fixed bug Identity.API

* Included globalusing to Basket.UnitTest project

* Moved namespaces to Basket.UnitTest project

* Updated packages of Basket.UnitTest csproj

* Included globalusing for Basket.FunctionalTests project

* Included file-scoped namespaces Basket.FunctionalTests

* Updated packages of Basket.FunctionalTests.csproj file

* Updated catalog unit test project to Net 6.0

* Included global usings for Catalog.FunctionalTests

* Included file-scope namespace catalog.functionaltests

* Updated packages of catalog.functionaltest csproj

* Included MigrateDbContext method in HostExtensions

* Included globalusing for ordering.UnitTests project

* Included file-scope statement for Ordering.UnitTest project

* Included globalusing for Ordering.FunctionalTests

* Included file-scope namespace statement for using

* Updated packages in  Ordering.FunctionalTests.csproj

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.API/Startup.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.Domain/Events/OrderStatusChangedToPaidDomainEvent.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToSubmittedIntegrationEventHandler.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToAwaitingValidationIntegrationEvent.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

Co-authored-by: David Pine <david.pine@microsoft.com>

* Updates WebMVC to .NET 6.0 (#1773)

* Included globalusing WebMVC

* Included file scope namespaces for all files

* Updated dockerfile

* Updated packages to WebMVC

* Fixes few bugs in Net 6.0 service migration (#1774)

* Created global using file for catalog.api

* Moved individual usings statements to globalusing

* Updated catalog.api project

* Fixed local run bug for catalog.api

* Included globalusing for payment.api

* Refactored namespace statement for payment.api

* Moved namespaces to ordering.domain project

* Included globalusing for ordering.domain project

* Included globalusings for ordering.infrastructure project

* Refactored namespaces for ordering.infrastructure project

* Updated relevant packages in ordering.infrastructure project

* Included globalusings for ordering.signalrHub project

* Moved all the namespace to globalusings

* Updated packages in ordering.signalrHub csproj file

* Refactored namespace statements in catalog.api project

* Fixed namespace name in ordering.domain

* Included global usings for ordering.api project

* Moved all usings to globalusing file

* Updated ordering.api csproj project

* Fixed bug in statup.cs

* Updated ordering.unittests.csproj file

* Included globalusings in webhooks.api project

* Moved using statements to globalusing file in webhooks.api

* Included globalusing for web.bff.shoppping aggregator project

* Moved namespaces to globalusing shopping aggregator

* Included globalusing mobile.bff.shoppping project

* Moved namespaces to globalusing file

* Included globalusing for eventbus project

* Moved namespaces to global usings for eventbus

* Included globalusing for EventBusRabbitMQ project

* Moved using statements to EventBusRabbitMQ project

* Included global using in EventBusServiceBus project

* Moved using statements to globalusing for EventBusServiceBus

* Included globalusing file for IntegrationEventLogEF project

* Move using statements to globalusing file

* Updated packages of IntegrationEventLogEF project

* Included globalusing to Devspaces.Support project

* Moved using statements to globalusing Devspaces

* Updated dependent packages for Devspaces.Support.csproj

* Fixed bug in Basket API

* Fixed bug in catalog.api

* Fixed bug Identity.API

* Included globalusing to Basket.UnitTest project

* Moved namespaces to Basket.UnitTest project

* Updated packages of Basket.UnitTest csproj

* Included globalusing for Basket.FunctionalTests project

* Included file-scoped namespaces Basket.FunctionalTests

* Updated packages of Basket.FunctionalTests.csproj file

* Updated catalog unit test project to Net 6.0

* Included global usings for Catalog.FunctionalTests

* Included file-scope namespace catalog.functionaltests

* Updated packages of catalog.functionaltest csproj

* Included MigrateDbContext method in HostExtensions

* Included globalusing for ordering.UnitTests project

* Included file-scope statement for Ordering.UnitTest project

* Included globalusing for Ordering.FunctionalTests

* Included file-scope namespace statement for using

* Updated packages in  Ordering.FunctionalTests.csproj

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.API/Startup.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.Domain/Events/OrderStatusChangedToPaidDomainEvent.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToSubmittedIntegrationEventHandler.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToAwaitingValidationIntegrationEvent.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Fixed bugs in Mobile.BFF.Shopping project

* Fixed bugs in Web.Bff.Shopping aggregator project

* Fixed bugs in EventBusServiceBus project

* Fixed bug in Mobile.Bff.Shopping project

Co-authored-by: David Pine <david.pine@microsoft.com>

* Updates webhook client project to .NET 6.0 (#1777)

* Included globalusing file for webhookclient

* Included file scope namespaces for Webhookclient

* Updated packages in WebHookClient project

* Updates webspa project to Net 6.0 (#1778)

* Included globalusing in webspa project

* Included file scoped namespace for webspa project

* Updated packages in WebSPA project

* Updates the Application.FunctionalTests project to .NET 6.0 (#1781)

* Included globalusing in Application.FunctionalTests project

* Included file scoped namespace

* Renamed Azure.Messaging.ServiceBus namespace

* Updates .NET version of Dockerfile to 6.0 (#1785)

* Updatated package versions to RC2

* Updated package versions to RC2

* Updated Dockerfiles to .NET 6 RC2

* Changed docker file tag to 6.0

* Updated Program class

* Updated globalusing file

* Removed preview tag reference from Dockerfile.develop file

* Updated dotnet version to .NET 6.0

* Updated all packages to the .NET 6.0

* Removed RC tag from dockerfile

* Fixed bundleconfig json

* Updated readme files

* Fixed ingress yaml indentation

* Included globalusing for WebStatus project

* Updated WebStatus project to .NET 6.0

* Included scoped namespace

* Updated Dockerfile of WebStatus to .NET 6.0

Co-authored-by: Josh Coleman <83677148+JcolemanNR@users.noreply.github.com>
Co-authored-by: David Pine <david.pine@microsoft.com>
2021-11-15 19:02:23 +05:30
Olivier Gaumond
42abcad37e
fixes to deploy-all.sh (#1746) 2021-10-27 16:46:01 +05:30
Ryan Celeslie
e8611da6b6
Updated comment (#1783)
Comment was missing the last part of the sentence
2021-10-27 12:42:19 +05:30
dependabot[bot]
99f15a13b2
Bump ua-parser-js from 0.7.21 to 0.7.30 in /src/Web/WebSPA/Client (#1782)
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.21 to 0.7.30.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.21...0.7.30)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-26 17:57:34 +05:30
Wenjie Yu(MSFT)
c357aeac63
Update ServiceBus sdk from t1 to t2 (#1698)
* Update ServiceBus to the new SDKs.

* resolve errors

* resolve errors

* update codes

* update codes

* add a call in constructor

* remove changes

* add Dispose() menthod in interface

* Update codes

* update the method to get topicName

* Remove invalid changes

* resolve the errors in service

* fix issue

* fix issue

* update code

Co-authored-by: zedy <zedy@wicresoft.com>
2021-10-26 15:09:15 +05:30
dependabot[bot]
46219957ef
Bump nth-check from 1.0.2 to 2.0.1 in /src/Web/WebSPA/Client (#1762)
Bumps [nth-check](https://github.com/fb55/nth-check) from 1.0.2 to 2.0.1.
- [Release notes](https://github.com/fb55/nth-check/releases)
- [Commits](https://github.com/fb55/nth-check/compare/v1.0.2...v2.0.1)

---
updated-dependencies:
- dependency-name: nth-check
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-23 19:37:08 +05:30
Sumit Ghosh
2cf8fa7ce1
Updated set-value package to 4.0.1 (#1759) 2021-09-20 12:36:58 +05:30
Sumit Ghosh
93383de096
Updated az service bus arm template (#1721) 2021-09-15 16:46:28 +05:30
Michael Gregson
8807359057
Serialize properties in derived classes (#1732)
System.Text.Json serializes based on static type of value parameter. Polymorphic serialization requires type information
2021-09-15 15:16:26 +05:30
Colin Dembovsky
e57a97d515
Update workflows to use composite (#1753)
* Update workflows to use composite

* Add name to composite actions

* Revert name change
2021-09-09 18:13:29 +05:30
Sumit Ghosh
464b8fc0fd
Updated tar package (#1754) 2021-09-01 15:46:05 +05:30
dependabot[bot]
71994d0ad8
Bump Microsoft.AspNetCore.Authentication.JwtBearer (#1750)
Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/dotnet/aspnetcore) from 5.0.2 to 5.0.9.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.2...v5.0.9)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:28:48 +05:30
dependabot[bot]
9a9b8fbc6f
Bump Microsoft.AspNetCore.Authentication.JwtBearer in /src/Web/WebMVC (#1751)
Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/dotnet/aspnetcore) from 5.0.2 to 5.0.9.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.2...v5.0.9)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:28:35 +05:30
dependabot[bot]
86579613ec
Bump Microsoft.AspNetCore.Authentication.JwtBearer (#1749)
Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/dotnet/aspnetcore) from 5.0.2 to 5.0.9.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.2...v5.0.9)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:24:54 +05:30
dependabot[bot]
9e4ded9c61
Bump Microsoft.AspNetCore.Authentication.JwtBearer (#1748)
Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/dotnet/aspnetcore) from 5.0.2 to 5.0.9.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.2...v5.0.9)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:24:28 +05:30
dependabot[bot]
2e1f327eea
Bump Microsoft.AspNetCore.Authentication.JwtBearer (#1747)
Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/dotnet/aspnetcore) from 5.0.2 to 5.0.9.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.2...v5.0.9)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:24:03 +05:30
Sumit Ghosh
99ec828339
Updated npm packages (#1743) 2021-08-19 12:05:17 +05:30
Sumit Ghosh
39f9c9cadb
Updated path-parse package version 1.7 (#1741) 2021-08-17 16:38:12 +05:30
Roman Marusyk
3cc9d320ed
Change branch name from master to main. Fix grammar (#1737) 2021-08-10 13:37:24 +05:30
Ben Decker
9a2e9ece04
Fixed typo: Applciation -> Application (#1736) 2021-08-09 13:42:36 +05:30
Sumit Ghosh
1896af24f2
Updated tar package (#1733) 2021-08-05 19:48:11 +05:30
Sumit Ghosh
7ba14d9804
Updates ingress object version to use v1 api (#1725)
* Removed archived directory

* Updated ingress api version to v1

* Updates ingress yaml manifests

* Fixed the identity ingress manifest

* Fixed remaining ingress manifest
2021-08-02 16:56:15 +05:30
GitHubPang
a478fdabf6
Fix typo in field name. (#1727)
httpContextAccesor > httpContextAccessor
2021-07-26 13:15:59 +05:30
Sumit Ghosh
dc60280101
Removed WebMVC from master Readme (#1719) 2021-07-13 18:25:56 +05:30
AlanYu
5c57b8c3f9
Binding queue using existing cosumerChannel (#1716)
Co-authored-by: Alan.Yu <alan.yu@hidglobal.com>
2021-07-07 13:04:25 +05:30
Sumit Ghosh
8bb15ce987
Updated npm packages (#1714) 2021-06-30 19:52:08 +05:30
Sumit Ghosh
2afc00360f
Included Envoyproxy filrewall rules in the script (#1704) 2021-06-28 19:16:00 +05:30
Sumit Ghosh
6381df5801
Updates npm packages (#1710)
* Updated npm packages

* Updated packages
2021-06-28 19:15:00 +05:30
Kaypee
6982f0e7c4
Correct typo error in Shipping Address (#1712)
Co-authored-by: kwabena <kwabena@mpharma.com>
2021-06-28 11:25:24 +05:30
Miguel Veloso
8c2716339e
Merge pull request #1711 from dotnet-architecture/update/angular-version
Update Angular version to 11.2
2021-06-25 10:44:33 +01:00
Miguel Veloso
e858ac052d Update Angular version to 11.2 2021-06-25 10:10:59 +01:00
Miguel Veloso
e9aa5256aa
Merge pull request #1705 from dotnet-architecture/feature/refresh-spa-theme
Refresh SPA theme
2021-06-22 15:43:54 +01:00
Miguel Veloso
5afcd37caa Update item images 2021-06-22 14:58:16 +01:00
Miguel Veloso
7405ebaf80 Update README, catalog image files and MVC page size 2021-06-21 16:01:42 +01:00
Miguel Veloso
4b0c2c56dd Handle SPA/MVC branding for login and registration views 2021-06-18 15:08:05 +01:00
Miguel Veloso
9194b2cef6 Update other packages to latest versions 2021-06-17 23:39:16 +01:00
Miguel Veloso
67c248b2c2 Update versions in package.json 2021-06-17 23:27:41 +01:00
Miguel Veloso
066b055e36 Angular 10 version running 2021-06-17 23:23:52 +01:00
Miguel Veloso
c7f482d3f6 install packages for Angular 9 2021-06-17 22:46:06 +01:00
Miguel Veloso
c8a8884426 Update packages required by Angular 10 2021-06-17 19:28:29 +01:00
Miguel Veloso
4bf0db6b41 Update to Angular 9 2021-06-17 18:06:24 +01:00
Miguel Veloso
4bf307990c Update target js version 2021-06-17 17:37:58 +01:00
Miguel Veloso
2a0db634c4 Update to .NET 5 2021-06-17 17:17:04 +01:00
Miguel Veloso
07e0bfe0f2 running version without refresh page error 2021-06-17 14:44:50 +01:00
Miguel Veloso
7d26ef882d Initial SPA application working 2021-06-15 17:07:38 +01:00
Miguel Veloso
ae45ffb227 Remove campaigns, marketing and coupon-related components 2021-06-15 16:08:28 +01:00
Miguel Veloso
c60a49363f Fix catalog search error 2021-06-15 15:48:22 +01:00
Miguel Veloso
bbe423cf8e Initial version running 2021-06-15 15:34:41 +01:00
Miguel Veloso
dbf782d210 Initial eShop-Learn version 2021-06-15 09:57:28 +01:00
Taras Kovalenko
3b05d5d2a3
Merge pull request #66 from dotnet-architecture/dev
Updated package (#1696)
2021-06-10 22:22:19 +03:00
Sumit Ghosh
08d3a2b85c
Updated package (#1696) 2021-06-09 19:51:34 +05:30
Taras Kovalenko
3fbd8b4775
Merge pull request #65 from dotnet-architecture/dev
eShopOnContainers
2021-06-08 22:01:40 +03:00
Sumit Ghosh
d49334b049
Updated packages (#1695) 2021-06-08 22:31:13 +05:30
dependabot[bot]
e8fd578bb2
Bump ws from 6.2.1 to 6.2.2 in /src/Web/WebSPA (#1694)
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-08 22:30:54 +05:30
zedy
be9ce6d069
Update keyvault sdk from t1 to t2 (#1685)
* Upgrade Microsoft.Extensions.Configuration.AzureKeyVault to

* Update keyvault uri

* Update Program.cs

Modify format

* modify format

* resolve conflict

* replace credential

Co-authored-by: Wenjie Yu <v-wenjyu@microsoft.com>
2021-06-08 14:45:15 +05:30
Sander Obdeijn
8ed25875af
Added EventBus.Tests to solution (#1684)
* - Added EventBus.Tests to solution
- Updated targetframework to net5.0
- Consolidated nuget packages

* Added copy EventBus.Tests.csproj to DockerFile's
2021-05-31 14:46:44 +05:30
dependabot[bot]
ad7ff76fed
Bump browserslist from 4.16.0 to 4.16.6 in /src/Web/WebSPA (#1679)
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.0 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.16.0...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-26 19:07:29 +05:30
Sumit Ghosh
37aeaceeab
Updated dns-packet package to version 5.2.2 (#1682) 2021-05-26 19:06:55 +05:30
Sumit Ghosh
1cbd218dc4
Updates the postcss package version (#1672)
* Updated package postcss version to 8.2.10

* Updated the package version
2021-05-17 16:31:59 +05:30
David Pine
bf7ade80d2
Update CardType.cs (#1674)
Sync with https://github.com/dotnet/docs/pull/24236
2021-05-17 13:16:38 +05:30
Sumit Ghosh
2b8b6b5206
Updated package versions (#1669) 2021-05-07 16:41:24 +05:30
dependabot[bot]
3521fb892c
Bump lodash from 4.17.20 to 4.17.21 in /src/Web/WebSPA (#1667)
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-07 12:10:01 +05:30
dependabot[bot]
6556c4f4cc
Bump url-parse from 1.4.7 to 1.5.1 in /src/Web/WebSPA (#1666)
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.1.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.4.7...1.5.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-07 12:09:36 +05:30
dependabot[bot]
6b0890f90b
Bump handlebars from 4.7.6 to 4.7.7 in /src/Web/WebSPA (#1665)
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.7.6 to 4.7.7.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.7.6...v4.7.7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-07 12:09:15 +05:30
Sumit Ghosh
6007bdc2b1
Updated xmlhttprequest-ssl package to 1.6.2 (#1664) 2021-05-05 19:41:28 +05:30
dependabot[bot]
fb657f0634
Bump merge from 1.2.1 to 2.1.1 in /src/Web/WebSPA (#1662)
Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.1 to 2.1.1.
- [Release notes](https://github.com/yeikos/js.merge/releases)
- [Commits](https://github.com/yeikos/js.merge/compare/v1.2.1...v2.1.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-05 16:21:40 +05:30
Sumit Ghosh
19baeb7069
Migrates from Newtonsoft.Json to System.Text.Json (#1658)
* Included System.Text.Json related changes

* Fixed order details summary in WebMVC

* Updated custom JsonConverter
2021-05-03 16:36:31 +05:30
Colin Dembovsky
c4d40f16db Prevent deploy jobs 2021-04-23 00:20:38 -05:00
Colin Dembovsky
374cf8d710 Prevent deploy jobs 2021-04-23 00:20:29 -05:00
Colin Dembovsky
f66dadf705 Merge branch 'dev' of github.com:dotnet-architecture/eShopOnContainers into msftdev 2021-04-23 00:20:02 -05:00
Sumit Ghosh
81f05762ce
Updated sockjs package (#1651) 2021-04-21 20:04:54 +05:30
Colin Dembovsky
6f29ec52d4 Fixing casing 2021-04-15 12:12:43 -05:00
Colin Dembovsky
d8c65784e7 Fix casing 2021-04-15 12:06:17 -05:00
Colin Dembovsky
e367740725 Fix perms 2021-04-15 12:00:23 -05:00
Colin Dembovsky
e10f9c1c89 Fix file name 2021-04-15 11:55:10 -05:00
Colin Dembovsky
5ec02287b6 Fixing dotnet test cmd 2021-04-15 11:24:44 -05:00
Colin Dembovsky
87016c3280 Change verbosity to only test 2021-04-15 11:10:41 -05:00
Colin Dembovsky
95fc2197ed Update arg 2021-04-15 11:07:22 -05:00
Colin Dembovsky
f388b4fd17 Up verbosity 2021-04-15 11:02:21 -05:00
Colin Dembovsky
17dc8efb53 Adding unit tests 2021-04-15 10:50:19 -05:00
Colin Dembovsky
47ca5681f9 Adding workflow_dispatch and unit tests 2021-04-15 10:50:10 -05:00
Colin Dembovsky
99e86312f9 Change working dir 2021-04-15 10:28:08 -05:00
Colin Dembovsky
c6763a2aa6 Add workflow_dispatch 2021-04-15 10:25:56 -05:00
Colin Dembovsky
53ad2d19c3 Adding unit tests 2021-04-15 10:24:28 -05:00
Colin Dembovsky
e858b1af51 Full revert 2021-04-15 10:14:41 -05:00
Colin Dembovsky
d261523c05 Revert 2021-04-15 10:13:31 -05:00
Colin Dembovsky
9affd629be Adding unit tests 2021-04-15 10:11:49 -05:00
Colin Dembovsky
391de9fc9e Update DeployToK8s to deploy-to-k8s 2021-04-15 08:48:00 -05:00
Colin Dembovsky
c152b030ba Remove app-name 2021-04-15 08:46:11 -05:00
Colin Dembovsky
7343ceb4c2 Update namespace to NAMESPACE 2021-04-15 08:39:39 -05:00
Colin Dembovsky
ede057c6e7 Update chart to CHART 2021-04-15 08:37:30 -05:00
Colin Dembovsky
8414627340 Update chart-root to CHART_ROOT 2021-04-15 08:36:37 -05:00
Colin Dembovsky
996da7718a Update checkout from @v1 to @v2 2021-04-15 08:33:56 -05:00
Colin Dembovsky
acb304c06a Adding deploy workflows and script 2021-04-14 09:25:18 -05:00
Rich Lander
d0cd2830a8
Update sdk tag (#1647) 2021-04-13 18:45:38 +05:30
Mohamed Seada
6012fb0649
Fix aggregator address (#1646) 2021-04-12 11:19:26 +05:30
Matt Callahan
a71b004897
updated CardType and Enumeration classes (#1528)
* updated CardType and Enumeration classes

* Update per IEvangelist's suggestion

* Update src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

Co-authored-by: Sumit Ghosh <sumit.ghosh@neudesic.com>
Co-authored-by: David Pine <david.pine@microsoft.com>
2021-04-08 11:46:11 +05:30
Taras Kovalenko
dc2edea974
Merge pull request #64 from dotnet-architecture/dev
eShopOnContainers
2021-03-23 15:23:12 +02:00
Taras Kovalenko
9ca3262760
Merge pull request #63 from dotnet-architecture/dev
eShopOnContainers fork
2021-01-22 17:17:04 +02:00
Taras Kovalenko
6d7d67577e
Merge pull request #62 from dotnet-architecture/dev
eShopOnContainers
2020-12-25 20:54:08 +02:00
Taras Kovalenko
20673ad72b
Merge pull request #61 from dotnet-architecture/dev
eShopOnContainers
2020-08-14 19:17:22 +03:00
Taras Kovalenko
144769722d
Merge pull request #60 from dotnet-architecture/dev
eShopOnContainers fork
2019-11-05 15:26:28 +02:00
Taras Kovalenko
2faec10388
Merge pull request #59 from dotnet-architecture/dev
eShopOnContainers fork
2019-10-06 21:43:20 +03:00
Taras Kovalenko
a15e2957dc
Merge pull request #58 from dotnet-architecture/dev
eShopOnContainers fork
2019-08-27 14:08:25 +03:00
Taras Kovalenko
f3169ed424
Merge pull request #57 from dotnet-architecture/dev
eShopOnContainers fork
2019-06-28 09:41:14 -07:00
Taras Kovalenko
ec3063c23f
Merge pull request #56 from dotnet-architecture/dev
eShopOnContainers fork
2019-06-21 09:29:26 -06:00
Taras Kovalenko
3c064df1db
Merge pull request #55 from dotnet-architecture/dev
eShopOnContainers fork
2019-06-14 08:41:39 -06:00
Taras Kovalenko
2169c690da
Merge pull request #54 from dotnet-architecture/dev
eShopOnContainers fork
2019-06-10 15:55:11 -06:00
Taras Kovalenko
4140b99534
Merge pull request #53 from dotnet-architecture/dev
eShopOnContainers fork
2019-05-31 12:01:48 +03:00
Taras Kovalenko
df63d9ca9b
Merge pull request #52 from dotnet-architecture/dev
eShopOnContainers fork
2019-05-26 12:51:08 +03:00
Taras Kovalenko
3f0c46741a
Merge pull request #51 from dotnet-architecture/dev
eShopOnContainers fork
2019-05-09 15:04:15 +03:00
Taras Kovalenko
4d76ba42aa
Merge pull request #50 from dotnet-architecture/dev
eShopOnContainers fork
2019-04-19 13:19:18 +03:00
Taras Kovalenko
a98e65886f
Merge pull request #49 from dotnet-architecture/dev
eShopOnContainers fork
2019-03-29 11:31:37 +02:00
Taras Kovalenko
901847624d
Merge pull request #48 from dotnet-architecture/dev
eShopOnContainers fork
2019-03-16 19:12:45 +02:00
Taras Kovalenko
7a2f41aaf8
Merge pull request #47 from dotnet-architecture/dev
eShopOnContainers fork
2019-02-06 13:53:40 +02:00
Taras Kovalenko
6ce3769d4c
Merge pull request #46 from dotnet-architecture/dev
fork eShopOnContainers
2019-01-22 10:54:55 +02:00
Taras Kovalenko
52829097ba
Merge pull request #45 from dotnet-architecture/dev
Added serilog
2018-12-14 13:59:39 +02:00
Taras Kovalenko
9788f099f5
Merge pull request #44 from dotnet-architecture/dev
upd fork
2018-12-09 13:57:57 +02:00
Taras Kovalenko
6326194680
Merge pull request #43 from dotnet-architecture/dev
upd fork
2018-11-25 23:21:27 +02:00
Taras Kovalenko
134af2a755
Merge pull request #42 from dotnet-architecture/dev
udp fork
2018-11-04 12:29:31 +02:00
Taras Kovalenko
adc6678b0e
Merge pull request #41 from dotnet-architecture/dev
upd fork
2018-10-22 18:00:55 +03:00
Taras Kovalenko
03a824fd90
Merge pull request #40 from dotnet-architecture/dev
upd fork
2018-10-04 11:18:10 +03:00
Taras Kovalenko
3abc38acf4
Merge pull request #39 from dotnet-architecture/dev
upd fork
2018-10-01 11:29:46 +03:00
Taras Kovalenko
e2d6b5ce5f
Merge pull request #38 from dotnet-architecture/dev
upd fork
2018-09-23 00:10:58 +03:00
Taras Kovalenko
4b08492a3e
Merge pull request #37 from dotnet-architecture/dev
upd fork
2018-09-16 19:22:10 +03:00
Taras Kovalenko
3082e72dc1
Merge pull request #36 from dotnet-architecture/dev
upd fork
2018-09-06 11:07:31 +03:00
Taras Kovalenko
97061748ec
Merge pull request #35 from dotnet-architecture/dev
upd fork
2018-08-24 09:53:36 +03:00
Taras Kovalenko
d7f14447ed
Merge pull request #34 from dotnet-architecture/dev
upd fork
2018-08-14 09:24:59 +03:00
Taras Kovalenko
3e81555963
Merge pull request #33 from dotnet-architecture/dev
upd fork
2018-07-31 18:10:26 +03:00
Taras Kovalenko
17637141c0
Merge pull request #32 from dotnet-architecture/dev
upd fork
2018-07-24 13:23:02 +03:00
Taras Kovalenko
fd757f0af7
Merge pull request #31 from dotnet-architecture/dev
update the fork 17/07/2018
2018-07-17 00:24:14 +03:00
Taras Kovalenko
034cfdcda0
Merge pull request #30 from dotnet-architecture/dev
upd fork
2018-07-09 23:37:00 +03:00
Taras Kovalenko
f43ebe53ee
Merge pull request #29 from dotnet-architecture/dev
upd fork
2018-06-25 09:14:59 +03:00
Taras Kovalenko
7b1174a66f
Merge pull request #28 from dotnet-architecture/dev
upd fork
2018-06-18 15:33:17 +03:00
Taras Kovalenko
fc85e345fd
Merge pull request #27 from dotnet-architecture/dev
upd fork
2018-06-09 12:02:57 +03:00
Taras Kovalenko
2059d9c2c7
Merge pull request #26 from dotnet-architecture/dev
upd fork
2018-06-02 16:49:34 +03:00
Taras Kovalenko
7c30eb4f10
Merge pull request #25 from dotnet-architecture/dev
upd fork
2018-05-14 14:43:35 +03:00
Taras Kovalenko
b7a07ae119
Merge pull request #24 from dotnet-architecture/dev
update the fork
2018-05-02 10:52:17 +03:00
Taras Kovalenko
7fe4a9c490
Merge pull request #23 from dotnet-architecture/dev
upd fork
2018-04-14 10:23:09 +03:00
Taras Kovalenko
613a45d7e0
Merge pull request #22 from dotnet-architecture/dev
upd fork
2018-03-27 00:01:23 +03:00
Taras Kovalenko
e4107260db
Merge pull request #21 from dotnet-architecture/dev
upd fork
2018-03-15 09:31:57 +02:00
Taras Kovalenko
c52b4447a2
Merge pull request #20 from dotnet-architecture/dev
upd fork
2018-02-20 12:34:02 +02:00
Taras Kovalenko
9984f2a9a5
Merge pull request #19 from dotnet-architecture/dev
upd fork
2018-02-14 18:03:13 +02:00
Taras Kovalenko
0f1c179a5b
Merge pull request #18 from dotnet-architecture/dev
upd fork
2018-02-04 01:33:37 +02:00
Taras Kovalenko
33d9075a7a
Merge pull request #17 from dotnet-architecture/dev
upd fork
2018-01-22 09:24:32 +02:00
Taras Kovalenko
ba6f483061
Merge pull request #16 from dotnet-architecture/dev
upd fork
2018-01-11 13:30:17 +02:00
Taras Kovalenko
dc1ac3a541
Merge pull request #15 from dotnet-architecture/dev
upd fork
2018-01-08 16:45:43 +02:00
Taras Kovalenko
f0af8b9f3d
Merge pull request #14 from dotnet-architecture/dev
upd fork
2018-01-04 12:30:49 +02:00
Taras Kovalenko
93cfacde69
Merge pull request #13 from dotnet-architecture/dev
upd fork
2017-12-22 21:47:09 +02:00
Taras Kovalenko
7d6c8f8f92
Merge pull request #12 from dotnet-architecture/dev
upd fork
2017-12-12 14:46:59 +02:00
Taras Kovalenko
8c25f2028c
Merge pull request #11 from dotnet-architecture/dev
upd fork
2017-12-08 19:50:08 +02:00
Taras Kovalenko
2e8e335fdc
Merge pull request #10 from dotnet-architecture/dev
upd fork
2017-12-05 16:05:34 +02:00
Taras Kovalenko
a75d46fc26
Merge pull request #9 from dotnet-architecture/dev
upd fork
2017-11-23 21:35:41 +02:00
Taras Kovalenko
a7394be2bc
Merge pull request #8 from dotnet-architecture/dev
upd fork
2017-11-15 21:10:32 +05:30
Taras Kovalenko
84bbd10d65
Merge pull request #7 from dotnet-architecture/dev
upd fork
2017-10-30 16:48:36 +02:00
Taras Kovalenko
1c23986e8a Merge pull request #6 from dotnet-architecture/dev
upd fork
2017-10-27 11:50:08 +03:00
Taras Kovalenko
31cd206e7a Merge pull request #5 from dotnet-architecture/dev
upd fork
2017-10-24 14:08:47 +03:00
Taras Kovalenko
20183721fd Merge pull request #4 from dotnet-architecture/dev
upd fork
2017-10-02 09:44:44 +03:00
Taras Kovalenko
d833251519 Merge pull request #3 from dotnet-architecture/dev
upd fork
2017-09-13 15:19:37 +03:00
Taras Kovalenko
3a73cf22a2 Merge pull request #2 from dotnet-architecture/dev
upd fork
2017-08-25 14:28:47 +03:00
Taras Kovalenko
8676343f66 Merge pull request #1 from dotnet-architecture/dev
upd
2017-08-13 19:48:42 +03:00
1291 changed files with 115036 additions and 75232 deletions

132
.editorconfig Normal file
View File

@ -0,0 +1,132 @@
###############################
# Core EditorConfig Options #
###############################
root = true
# All files
[*]
indent_style = space
# XML project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
indent_size = 2
# XML config files
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
indent_size = 2
# Code files
[*.{cs,csx,vb,vbx}]
indent_size = 4
insert_final_newline = true
charset = utf-8-bom
###############################
# .NET Coding Conventions #
###############################
[*.{cs,vb}]
# Organize usings
dotnet_sort_system_directives_first = true
# this. preferences
dotnet_style_qualification_for_field = false:silent
dotnet_style_qualification_for_property = false:silent
dotnet_style_qualification_for_method = false:silent
dotnet_style_qualification_for_event = false:silent
# Language keywords vs BCL types preferences
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
dotnet_style_predefined_type_for_member_access = true:silent
# Parentheses preferences
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
# Modifier preferences
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
dotnet_style_readonly_field = true:suggestion
# Expression-level preferences
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_auto_properties = true:silent
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
###############################
# Naming Conventions #
###############################
# Style Definitions
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
# Use PascalCase for constant fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
dotnet_naming_symbols.constant_fields.applicable_kinds = field
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
dotnet_naming_symbols.constant_fields.required_modifiers = const
###############################
# C# Coding Conventions #
###############################
[*.cs]
# var preferences
csharp_style_var_for_built_in_types = true:silent
csharp_style_var_when_type_is_apparent = true:silent
csharp_style_var_elsewhere = true:silent
# Expression-bodied members
csharp_style_expression_bodied_methods = false:silent
csharp_style_expression_bodied_constructors = false:silent
csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_properties = true:silent
csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_accessors = true:silent
# Pattern matching preferences
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
# Null-checking preferences
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion
# Modifier preferences
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
# Expression-level preferences
csharp_prefer_braces = true:silent
csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_prefer_simple_default_expression = true:suggestion
csharp_style_prefer_local_over_anonymous_function = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion
###############################
# C# Formatting Rules #
###############################
# New line preferences
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_between_query_expression_clauses = true
# Indentation preferences
csharp_indent_case_contents = true
csharp_indent_switch_labels = true
csharp_indent_labels = flush_left
# Space preferences
csharp_space_after_cast = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_around_binary_operators = before_and_after
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
# Wrapping preferences
csharp_preserve_single_line_statements = true
csharp_preserve_single_line_blocks = true
###############################
# VB Coding Conventions #
###############################
[*.vb]
# Modifier preferences
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

35
.github/workflows/basket-api-deploy.yml vendored Normal file
View File

@ -0,0 +1,35 @@
name: Deploy basket-api
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["basket-api"]
branches: [dev]
types: [completed]
env:
CHART: basket-api
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: basket-api name: basket-api
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -28,65 +29,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

View File

@ -0,0 +1,35 @@
name: Deploy catalog-api
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["catalog-api"]
branches: [dev]
types: [completed]
env:
CHART: catalog-api
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: catalog-api name: catalog-api
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -21,6 +22,9 @@ on:
env: env:
SERVICE: catalog-api SERVICE: catalog-api
IMAGE: catalog.api IMAGE: catalog.api
DOTNET_VERSION: 7.0.x
PROJECT_PATH: Services/Catalog/Catalog.API
TESTS_PATH: Services/Catalog/Catalog.UnitTests
jobs: jobs:
@ -28,65 +32,27 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-test
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash dotnet_version: ${{ env.DOTNET_VERSION }}
env: project_path: ${{ env.PROJECT_PATH }}
TAG: ${{ env.BRANCH }} tests_path: ${{ env.TESTS_PATH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

View File

@ -0,0 +1,71 @@
name: "Build and push image"
description: "Builds and pushes an image to a registry"
inputs:
service:
description: "Service to build"
required: true
registry_host:
description: "Image registry host e.g. myacr.azureacr.io"
required: true
registry_endpoint:
description: "Image registry repo e.g. myacr.azureacr.io/eshop"
required: true
image_name:
description: "Name of image"
required: true
registry_username:
description: "Registry username"
required: true
registry_password:
description: "Registry password"
required: true
runs:
using: "composite"
steps:
- name: Enable experimental features for the Docker daemon and CLI
shell: bash
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with:
registry: ${{ inputs.registry_host }}
username: ${{ inputs.registry_username }}
password: ${{ inputs.registry_password }}
- name: Set branch name as env variable
run: |
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ inputs.service }}
shell: bash
run: sudo -E docker-compose build ${{ inputs.service }}
working-directory: ./src
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ inputs.registry_endpoint }}
- name: Compose push ${{ inputs.service }}
shell: bash
run: sudo -E docker-compose push ${{ inputs.service }}
working-directory: ./src
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ inputs.registry_endpoint }}
- name: Create multiarch manifest
shell: bash
run: |
docker --config ~/.docker manifest create ${{ inputs.registry_endpoint }}/${{ inputs.image_name }}:${{ env.BRANCH }} ${{ inputs.registry_endpoint }}/${{ inputs.image_name }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ inputs.registry_endpoint }}/${{ inputs.image_name }}:${{ env.BRANCH }}

View File

@ -0,0 +1,47 @@
name: "Build for PRe"
description: "Builds a docker image without pushing"
inputs:
service:
description: "Service to build"
required: true
registry_endpoint:
description: "Image registry repo e.g. myacr.azureacr.io/eshop"
required: true
dotnet_version:
description: "Version of dotnet to use for testing"
required: true
project_path:
description: "Path to project to test e.g. Services/Catalog/Catalog.API"
required: true
tests_path:
description: "Path to test project e.g. Services/Catalog/Catalog.UnitTests"
required: true
runs:
using: "composite"
steps:
- name: Setup dotnet
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{ inputs.dotnet_version }}
- name: Build and run unit tests
shell: bash
run: |
cd src
dotnet restore "eShopOnContainers-ServicesAndWebApps.sln"
cd ${{ inputs.project_path }}
dotnet build --no-restore
cd -
cd ${{ inputs.tests_path }}
dotnet build --no-restore
dotnet test --no-build -v=normal
- name: Compose build ${{ inputs.service }}
shell: bash
run: sudo -E docker-compose build ${{ inputs.service }}
working-directory: ./src
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ inputs.registry_endpoint }}

View File

@ -0,0 +1,21 @@
name: "Build for PRe"
description: "Builds a docker image without pushing"
inputs:
service:
description: "Service to build"
required: true
registry_endpoint:
description: "Image registry repo e.g. myacr.azureacr.io/eshop"
required: true
runs:
using: "composite"
steps:
- name: Compose build ${{ inputs.service }}
shell: bash
run: sudo -E docker-compose build ${{ inputs.service }}
working-directory: ./src
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ inputs.registry_endpoint }}

View File

@ -0,0 +1,54 @@
name: "Deploy Helm to AKS"
description: "Deploys a helm chart to AKS"
inputs:
azure_credentials:
description: "Credentials to connect to AKS"
required: true
cluster_name:
description: "Name of AKS cluster"
required: true
resource_group:
description: "Resource group of AKS cluster"
required: true
registry_host:
description: "Image registry host e.g. myacr.azureacr.io"
required: true
chart:
description: "Chart name"
required: true
chart_root:
description: "Root folder of chart"
required: true
namespace:
description: "Namespace to deploy to"
required: true
runs:
using: "composite"
steps:
- uses: azure/login@v1
with:
creds: ${{ inputs.azure_credentials }}
- uses: azure/aks-set-context@v1
name: Set AKS context
with:
creds: '${{ inputs.azure_credentials }}'
cluster-name: ${{ inputs.cluster_name }}
resource-group: ${{ inputs.resource_group }}
- name: Set branch name as env variable
shell: bash
run: |
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
- name: Deploy Chart
shell: bash
run: |
./deploy-chart.sh -c ${{ inputs.chart }} --dns aks --aks-name ${{ inputs.clusteR_name }} --aks-rg ${{ inputs.resource_group }} -r ${{ inputs.registry_host }} -t $TAG --namespace ${{ inputs.namespace }} --acr-connected
env:
TAG: ${{ env.BRANCH }}
working-directory: ${{ inputs.chart_root }}

View File

@ -0,0 +1,35 @@
name: Deploy identity-api
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["identity-api"]
branches: [dev]
types: [completed]
env:
CHART: identity-api
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: identity-api name: identity-api
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -28,65 +29,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

View File

@ -0,0 +1,35 @@
name: Deploy mobileshoppingagg
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["mobileshoppingagg"]
branches: [dev]
types: [completed]
env:
CHART: mobileshoppingagg
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: mobileshoppingagg name: mobileshoppingagg
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -26,65 +27,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

View File

@ -0,0 +1,35 @@
name: Deploy ordering-api
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["ordering-api"]
branches: [dev]
types: [completed]
env:
CHART: ordering-api
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: ordering-api name: ordering-api
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -21,6 +22,9 @@ on:
env: env:
SERVICE: ordering-api SERVICE: ordering-api
IMAGE: ordering.api IMAGE: ordering.api
DOTNET_VERSION: 7.0.x
PROJECT_PATH: Services/Ordering/Ordering.API
TESTS_PATH: Services/Ordering/Ordering.UnitTests
jobs: jobs:
@ -28,65 +32,27 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-test
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash dotnet_version: ${{ env.DOTNET_VERSION }}
env: project_path: ${{ env.PROJECT_PATH }}
TAG: ${{ env.BRANCH }} tests_path: ${{ env.TESTS_PATH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

View File

@ -0,0 +1,35 @@
name: Deploy ordering-backgroundtasks
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["ordering-backgroundtasks"]
branches: [dev]
types: [completed]
env:
CHART: ordering-backgroundtasks
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: ordering-backgroundtasks name: ordering-backgroundtasks
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -28,65 +29,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

View File

@ -0,0 +1,35 @@
name: Deploy ordering-signalrhub
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["ordering-signalrhub"]
branches: [dev]
types: [completed]
env:
CHART: ordering-signalrhub
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: ordering-signalrhub name: ordering-signalrhub
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -28,65 +29,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

View File

@ -0,0 +1,35 @@
name: Deploy payment-api
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["payment-api"]
branches: [dev]
types: [completed]
env:
CHART: payment-api
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: payment-api name: payment-api
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -28,65 +29,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

View File

@ -0,0 +1,35 @@
name: Deploy webhooks-api
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["webhooks-api"]
branches: [dev]
types: [completed]
env:
CHART: webhooks-api
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: webhooks-api name: webhooks-api
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -28,65 +29,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

View File

@ -1,6 +1,7 @@
name: webhooks-client name: webhooks-client
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -28,65 +29,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

39
.github/workflows/webmvc-deploy.yml vendored Normal file
View File

@ -0,0 +1,39 @@
name: Deploy webmvc
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["webmvc"]
branches: [dev]
types: [completed]
env:
CHART: webmvc
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: azure/login@v1
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: webmvc name: webmvc
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -29,65 +30,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

View File

@ -0,0 +1,35 @@
name: Deploy webshoppingagg
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["webshoppingagg"]
branches: [dev]
types: [completed]
env:
CHART: webshoppingagg
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: webshoppingagg name: webshoppingagg
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -26,65 +27,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

35
.github/workflows/webspa-deploy.yml vendored Normal file
View File

@ -0,0 +1,35 @@
name: Deploy webspa
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["webspa"]
branches: [dev]
types: [completed]
env:
CHART: webspa
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: webspa name: webspa
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -28,65 +29,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

35
.github/workflows/webstatus-deploy.yml vendored Normal file
View File

@ -0,0 +1,35 @@
name: Deploy webstatus
on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["webstatus"]
branches: [dev]
types: [completed]
env:
CHART: webstatus
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm
jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./.github/workflows/composite/deploy-helm
with:
azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
cluster_name: ${{ secrets.CLUSTER_NAME }}
resource_group: ${{ secrets.RESOURCE_GROUP }}
registry_host: ${{ secrets.REGISTRY_HOST }}
chart: ${{ env.CHART }}
chart_root: ${{ env.CHART_ROOT }}
namespace: ${{ env.NAMESPACE }}

View File

@ -1,6 +1,7 @@
name: webstatus name: webstatus
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -29,65 +30,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build
- name: Compose build ${{ env.SERVICE }} with:
run: sudo -E docker-compose build ${{ env.SERVICE }} service: ${{ env.SERVICE }}
working-directory: ./src registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
BuildLinux: BuildLinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: 'Checkout Github Action' - name: Checkout code
uses: actions/checkout@master uses: actions/checkout@v2
- uses: ./.github/workflows/composite/build-push
- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
mkdir -p ~/.docker
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
sudo service docker restart
docker version -f '{{.Client.Experimental}}'
docker version -f '{{.Server.Experimental}}'
- name: Login to Container Registry
uses: docker/login-action@v1
with: with:
registry: ${{ secrets.REGISTRY_HOST }} service: ${{ env.SERVICE }}
username: ${{ secrets.USERNAME }} registry_host: ${{ secrets.REGISTRY_HOST }}
password: ${{ secrets.PASSWORD }} registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
image_name: ${{ env.IMAGE }}
- name: Set branch name as env variable registry_username: ${{ secrets.USERNAME }}
run: | registry_password: ${{ secrets.PASSWORD }}
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash
- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Compose push ${{ env.SERVICE }}
run: sudo -E docker-compose push ${{ env.SERVICE }}
working-directory: ./src
shell: bash
env:
TAG: ${{ env.BRANCH }}
REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
- name: Create multiarch manifest
run: |
docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }} ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:linux-${{ env.BRANCH }}
docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT }}/${{ env.IMAGE }}:${{ env.BRANCH }}
shell: bash

2
.gitignore vendored
View File

@ -281,3 +281,5 @@ pub/
src/**/app.yaml src/**/app.yaml
src/**/inf.yaml src/**/inf.yaml
.angular/
/src/Services/Identity/Identity.API/keys/*.json

View File

@ -47,7 +47,7 @@ All contributions must be submitted as a [Pull Request (PR)](https://help.github
The main branches are **`dev`** and **`master`**: The main branches are **`dev`** and **`master`**:
- **`dev`**: Contains the latest code **and it is the branch actively developed**. - **`dev`**: Contains the latest code **and it is the branch actively developed**.
**All PRs must be against `dev` branch to be considered**. This branch is developed using `.NET 5` **All PRs must be against `dev` branch to be considered**. This branch is developed using `.NET 7`
- **`main`**: Synced from time to time from **`dev`**. It contains "stable" code.This branch contains changes specific to `.NET Core 3.1` (**Keep in mind "stable" does not mean PRODUCTION-READY!**) - **`main`**: Synced from time to time from **`dev`**. It contains "stable" code.This branch contains changes specific to `.NET Core 3.1` (**Keep in mind "stable" does not mean PRODUCTION-READY!**)

View File

@ -6,7 +6,9 @@
Sample .NET Core reference application, powered by Microsoft, based on a simplified microservices architecture and Docker containers. Sample .NET Core reference application, powered by Microsoft, based on a simplified microservices architecture and Docker containers.
![](img/eshop-webmvc-app-screenshot.png) ## SPA Application (Angular)
![](img/eshop-spa-app-home.png)
## Build Status (GitHub Actions) ## Build Status (GitHub Actions)
@ -54,25 +56,25 @@ The basic scenario can be run locally using docker-compose, and also deployed to
### Advanced scenario ### Advanced scenario
The Advanced scenario can be run only in a Kubernetes cluster. Currently this scenario is the same as a basic scenario with the following differences: The Advanced scenario can be run only in a Kubernetes cluster. Currently, this scenario is the same as a basic scenario with the following differences:
- [Deploy to AKS with a Service Mesh for resiliency](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Deploy-to-Azure-Kubernetes-Service-(AKS)) - [Deploy to AKS with a Service Mesh for resiliency](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Deploy-to-Azure-Kubernetes-Service-(AKS))
In the future more features will be implemented in the advanced scenario. In the future, more features will be implemented in the advanced scenario.
## IMPORTANT NOTES! ## IMPORTANT NOTES!
**You can use either the latest version of Visual Studio or simply Docker CLI and .NET CLI for Windows, Mac and Linux**. **You can use either the latest version of Visual Studio or simply Docker CLI and .NET CLI for Windows, Mac, and Linux**.
**Note for Pull Requests (PRs)**: We accept pull request from the community. When doing it, please do it onto the **DEV branch** which is the consolidated work-in-progress branch. Do not request it onto **master** branch. **Note for Pull Requests (PRs)**: We accept pull requests from the community. When doing it, please do it onto the **DEV branch** which is the consolidated work-in-progress branch. Do not request it onto **main** branch.
**NEWS / ANNOUNCEMENTS** **NEWS / ANNOUNCEMENTS**
Do you want to be up-to-date on .NET Architecture guidance and reference apps like eShopOnContainers? --> Subscribe by "WATCHING" this new GitHub repo: https://github.com/dotnet-architecture/News Do you want to be up-to-date on .NET Architecture guidance and reference apps like eShopOnContainers? --> Subscribe by "WATCHING" this new GitHub repo: https://github.com/dotnet-architecture/News
## Updated for .NET 5 ## Updated for .NET 7
eShopOnContainers is updated to .NET 5 "wave" of technologies. Not just compilation but also new recommended code in EF Core, ASP.NET Core, and other new related versions with several significant changes. eShopOnContainers is updated to .NET 7 "wave" of technologies. Not just compilation but also new recommended code in EF Core, ASP.NET Core, and other new related versions with several significant changes.
**See more details in the [Release notes](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Release-notes) wiki page**. **See more details in the [Release notes](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Release-notes) wiki page**.
@ -84,15 +86,15 @@ eShopOnContainers is updated to .NET 5 "wave" of technologies. Not just compilat
### Architecture overview ### Architecture overview
This reference application is cross-platform at the server and client side, thanks to .NET 5 services capable of running on Linux or Windows containers depending on your Docker host, and to Xamarin for mobile apps running on Android, iOS or Windows/UWP plus any browser for the client web apps. This reference application is cross-platform at the server and client-side, thanks to .NET 7 services capable of running on Linux or Windows containers depending on your Docker host, and to Xamarin for mobile apps running on Android, iOS, or Windows/UWP plus any browser for the client web apps.
The architecture proposes a microservice oriented architecture implementation with multiple autonomous microservices (each one owning its own data/db) and implementing different approaches within each microservice (simple CRUD vs. DDD/CQRS patterns) using Http as the communication protocol between the client apps and the microservices and supports asynchronous communication for data updates propagation across multiple services based on Integration Events and an Event Bus (a light message broker, to choose between RabbitMQ or Azure Service Bus, underneath) plus other features defined at the [roadmap](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Roadmap). The architecture proposes a microservice oriented architecture implementation with multiple autonomous microservices (each one owning its own data/db) and implementing different approaches within each microservice (simple CRUD vs. DDD/CQRS patterns) using HTTP as the communication protocol between the client apps and the microservices and supports asynchronous communication for data updates propagation across multiple services based on Integration Events and an Event Bus (a light message broker, to choose between RabbitMQ or Azure Service Bus, underneath) plus other features defined at the [roadmap](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Roadmap).
![](img/eshop_logo.png) ![](img/eshop_logo.png)
![](img/eShopOnContainers-architecture.png) ![](img/eShopOnContainers-architecture.png)
## Related documentation and guidance ## Related documentation and guidance
You can find the related reference **Guide/eBook** focusing on **architecting and developing containerized and microservice based .NET Applications** (download link available below) which explains in detail how to develop this kind of architectural style (microservices, Docker containers, Domain-Driven Design for certain microservices) plus other simpler architectural styles, like monolithic apps that can also live as Docker containers. You can find the related reference **Guide/eBook** focusing on **architecting and developing containerized and microservice-based .NET Applications** (download link available below) which explains in detail how to develop this kind of architectural style (microservices, Docker containers, Domain-Driven Design for certain microservices) plus other simpler architectural styles, like monolithic apps that can also live as Docker containers.
There are also additional eBooks focusing on Containers/Docker lifecycle (DevOps, CI/CD, etc.) with Microsoft Tools, already published plus an additional eBook focusing on Enterprise Apps Patterns with Xamarin.Forms. There are also additional eBooks focusing on Containers/Docker lifecycle (DevOps, CI/CD, etc.) with Microsoft Tools, already published plus an additional eBook focusing on Enterprise Apps Patterns with Xamarin.Forms.
You can download them and start reviewing these Guides/eBooks here: You can download them and start reviewing these Guides/eBooks here:
@ -105,7 +107,7 @@ You can download them and start reviewing these Guides/eBooks here:
For more free e-Books check out [.NET Architecture center](https://dot.net/architecture). If you have an e-book feedback, let us know by creating a new issue here: <https://github.com/dotnet-architecture/ebooks/issues> For more free e-Books check out [.NET Architecture center](https://dot.net/architecture). If you have an e-book feedback, let us know by creating a new issue here: <https://github.com/dotnet-architecture/ebooks/issues>
## Are you new to **microservices** and **cloud-native development**? ## Are you new to **microservices** and **cloud-native development**?
Take a look at the free course [Create and deploy a cloud-native ASP.NET Core microservice](https://docs.microsoft.com/en-us/learn/modules/microservices-aspnet-core/) on MS Learn. This module explains microservices concepts, cloud-native technologies, and reduce the friction in getting started with `eShopOnContainers`. Take a look at the free course [Create and deploy a cloud-native ASP.NET Core microservice](https://docs.microsoft.com/en-us/learn/modules/microservices-aspnet-core/) on MS Learn. This module explains microservices concepts, cloud-native technologies, and reduces the friction in getting started with `eShopOnContainers`.
## Read further ## Read further

View File

@ -2,8 +2,12 @@
Following are the most important branches: Following are the most important branches:
- `dev`: Contains the latest code **and it is the branch actively developed**. Note that **all PRs must be against the `dev` branch to be considered**. This branch is developed using `.NET 5` - `dev`: Contains the latest code **and it is the branch actively developed**. Note that **all PRs must be against the `dev` branch to be considered**. This branch is developed using `.NET 7`
- `main`: Synced time to time from `dev`.It contains "stable" code, although not the latest one. Right now, this branch contains changes specific to `.NET Core 3.1` - `release/net-6`: Contains the code changes specific to the `.NET 6`
- `release/net-5`: Contains the code changes specific to the `.NET 5`
- `release/net-3.1.1`: Contains the code changes specific to the `.NET 3.1`
> [!DISCLAIMER]: The `main` branch contains the old code base and will get obsolete in the future. So it's recommended to refer to different [tags](https://github.com/dotnet-architecture/eShopOnContainers/tags) to avoid any confusion.
Any other branch is considered temporary and could be deleted at any time. Do not submit any PR against them! Any other branch is considered temporary and could be deleted at any time. Do not submit any PR against them!

View File

@ -31,5 +31,3 @@ $services |% {
Write-Host "Setting ACR build $bname ($bimg)" Write-Host "Setting ACR build $bname ($bimg)"
az acr build-task create --registry $acrName --name $bname --image ${bimg}:$gitBranch --context $gitContext --branch $gitBranch --git-access-token $patToken --file $bfile az acr build-task create --registry $acrName --name $bname --image ${bimg}:$gitBranch --context $gitContext --branch $gitBranch --git-access-token $patToken --file $bfile
} }
# Basket.API

View File

@ -16,6 +16,9 @@
"OrderingSubscriptionName": "Ordering", "OrderingSubscriptionName": "Ordering",
"GracePeriodSubscriptionName": "GracePeriod", "GracePeriodSubscriptionName": "GracePeriod",
"PaymentSubscriptionName": "Payment", "PaymentSubscriptionName": "Payment",
"BackgroundTaskSubscriptionName": "backgroundtasks",
"OrderingSignalrHubSubscriptionName": "Ordering.signalrhub",
"WebhooksSubscriptionName": "Webhooks",
"location": "[resourceGroup().location]", "location": "[resourceGroup().location]",
"sbVersion": "2015-08-01", "sbVersion": "2015-08-01",
"defaultSASKeyName": "Root", "defaultSASKeyName": "Root",
@ -172,6 +175,66 @@
"autoDeleteOnIdle": "10675199.02:48:05.4775807", "autoDeleteOnIdle": "10675199.02:48:05.4775807",
"entityAvailabilityStatus": "Available" "entityAvailabilityStatus": "Available"
} }
},
{
"apiVersion": "[variables('sbVersion')]",
"name": "[variables('BackgroundTaskSubscriptionName')]",
"type": "Subscriptions",
"dependsOn": [
"[variables('serviceBusTopicName')]"
],
"properties": {
"lockDuration": "00:00:30",
"requiresSession": false,
"defaultMessageTimeToLive": "14.00:00:00",
"deadLetteringOnMessageExpiration": true,
"deadLetteringOnFilterEvaluationExceptions": true,
"maxDeliveryCount": 10,
"enableBatchedOperations": false,
"status": "Active",
"autoDeleteOnIdle": "10675199.02:48:05.4775807",
"entityAvailabilityStatus": "Available"
}
},
{
"apiVersion": "[variables('sbVersion')]",
"name": "[variables('OrderingSignalrHubSubscriptionName')]",
"type": "Subscriptions",
"dependsOn": [
"[variables('serviceBusTopicName')]"
],
"properties": {
"lockDuration": "00:00:30",
"requiresSession": false,
"defaultMessageTimeToLive": "14.00:00:00",
"deadLetteringOnMessageExpiration": true,
"deadLetteringOnFilterEvaluationExceptions": true,
"maxDeliveryCount": 10,
"enableBatchedOperations": false,
"status": "Active",
"autoDeleteOnIdle": "10675199.02:48:05.4775807",
"entityAvailabilityStatus": "Available"
}
},
{
"apiVersion": "[variables('sbVersion')]",
"name": "[variables('WebhooksSubscriptionName')]",
"type": "Subscriptions",
"dependsOn": [
"[variables('serviceBusTopicName')]"
],
"properties": {
"lockDuration": "00:00:30",
"requiresSession": false,
"defaultMessageTimeToLive": "14.00:00:00",
"deadLetteringOnMessageExpiration": true,
"deadLetteringOnFilterEvaluationExceptions": true,
"maxDeliveryCount": 10,
"enableBatchedOperations": false,
"status": "Active",
"autoDeleteOnIdle": "10675199.02:48:05.4775807",
"entityAvailabilityStatus": "Available"
}
} }
] ]
} }

View File

@ -1,8 +0,0 @@
# Kubernetes deployment
This folder contains the files required to deploy eShopOnContainers to a Kubernetes cluster.
For more information see the following articles in the [wiki](https://github.com/dotnet-architecture/eShopOnContainers/wiki):
- [Deploy to Local Kubernetes](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Deploy-to-Local-Kubernetes)
- [Deploy to Azure Kubernetes Service (AKS)](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Deploy-to-Azure-Kubernetes-Service-(AKS))

View File

@ -1,50 +0,0 @@
Param(
[parameter(Mandatory=$true)][string]$resourceGroupName,
[parameter(Mandatory=$true)][string]$location,
[parameter(Mandatory=$true)][string]$serviceName,
[parameter(Mandatory=$true)][string]$dnsNamePrefix,
[parameter(Mandatory=$false)][string]$registryName,
[parameter(Mandatory=$true)][bool]$createAcr=$true,
[parameter(Mandatory=$false)][int]$nodeCount=3,
[parameter(Mandatory=$false)][string]$nodeVMSize="Standard_D2_v2",
[parameter(Mandatory=$false)][bool]$enableHttpApplicationAddon=$true,
[parameter(Mandatory=$false)][bool]$enableAzureMonitoring=$false,
[parameter(Mandatory=$false)][ValidateSet("VirtualMachineScaleSets","AvailabilitySet",IgnoreCase=$true)]$vmSetType="VirtualMachineScaleSets"
)
# Create resource group
Write-Host "Creating Azure Resource Group..." -ForegroundColor Yellow
az group create --name=$resourceGroupName --location=$location
if ($createAcr -eq $true) {
# Create Azure Container Registry
if ([string]::IsNullOrEmpty($registryName)) {
$registryName=$serviceName
}
Write-Host "Creating Azure Container Registry named $registryName" -ForegroundColor Yellow
az acr create -n $registryName -g $resourceGroupName -l $location --admin-enabled true --sku Basic
}
# Create kubernetes cluster in AKS
Write-Host "Creating AKS $resourceGroupName/$serviceName" -ForegroundColor Yellow
az aks create --resource-group=$resourceGroupName --name=$serviceName --dns-name-prefix=$dnsNamePrefix --generate-ssh-keys --node-count=$nodeCount --node-vm-size=$nodeVMSize --vm-set-type $vmSetType
if ($enableHttpApplicationAddon) {
Write-Host "Enabling Http Applciation Routing in AKS $serviceName" -ForegroundColor Yellow
az aks enable-addons --resource-group $resourceGroupName --name $serviceName --addons http_application_routing
}
if ($enableAzureMonitoring) {
Write-Host "Enabling Azure Monitoring in AKS $serviceName" -ForegroundColor Yellow
az aks enable-addons --resource-group $resourceGroupName --name $serviceName --addons monitoring
}
# Retrieve kubernetes cluster configuration and save it under ~/.kube/config
Write-Host "Getting Kubernetes config..." -ForegroundColor Yellow
az aks get-credentials --resource-group=$resourceGroupName --name=$serviceName
if ($createAcr -eq $true) {
# Show ACR credentials
Write-Host "ACR $registryName credentials:" -ForegroundColor Yellow
az acr credential show -n $registryName
}

View File

@ -1,18 +0,0 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: admin-user
namespace: kubernetes-dashboard
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: admin-user
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: cluster-admin
subjects:
- kind: ServiceAccount
name: admin-user
namespace: kubernetes-dashboard

View File

@ -1,20 +0,0 @@
Param (
[parameter(Mandatory=$false)][string]$aksName="",
[parameter(Mandatory=$false)][string]$aksRg=""
)
if ($aksName -and $aksRg) {
$aks=$(az aks show -n $aksName -g $aksRg -o json | ConvertFrom-Json)
if (-not $aks) {
Write-Host "AKS $aksName not found in RG $aksRg" -ForegroundColor Red
exit 1
}
Write-Host "Switching kubectl context to $aksRg/$aksName" -ForegroundColor Yellow
az aks get-credentials -g $aksRg -n $aksName
}
Write-Host "Installing cert-manager on current cluster"
kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v0.11.0/cert-manager.yaml --validate=false

View File

@ -1,18 +0,0 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: tiller
namespace: kube-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: tiller
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: cluster-admin
subjects:
- kind: ServiceAccount
name: tiller
namespace: kube-system

View File

@ -1,12 +0,0 @@
apiVersion: v1
kind: ConfigMap
metadata:
labels:
# addonmanager.kubernetes.io/mode: Reconcile
app: addon-http-application-routing-ingress-nginx
kubernetes.io/cluster-service: "true"
name: addon-http-application-routing-nginx-configuration
namespace: kube-system
data:
proxy-buffer-size: "128k"
proxy-buffers: "4 256k"

View File

@ -1,21 +0,0 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj

View File

@ -1,5 +0,0 @@
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: apigwms
version: 0.1.0

View File

@ -1,139 +0,0 @@
admin:
access_log_path: "/dev/null"
address:
socket_address:
address: 0.0.0.0
port_value: 8001
static_resources:
listeners:
- address:
socket_address:
address: 0.0.0.0
port_value: 80
filter_chains:
- filters:
- name: envoy.http_connection_manager
config:
codec_type: auto
stat_prefix: ingress_http
route_config:
name: eshop_backend_route
virtual_hosts:
- name: eshop_backend
domains:
- "*"
routes:
- name: "c-short"
match:
prefix: "/c/"
route:
auto_host_rewrite: true
prefix_rewrite: "/catalog-api/"
cluster: catalog
- name: "c-long"
match:
prefix: "/catalog-api/"
route:
auto_host_rewrite: true
cluster: catalog
- name: "o-short"
match:
prefix: "/o/"
route:
auto_host_rewrite: true
prefix_rewrite: "/ordering-api/"
cluster: ordering
- name: "o-long"
match:
prefix: "/ordering-api/"
route:
auto_host_rewrite: true
cluster: ordering
- name: "h-long"
match:
prefix: "/hub/notificationhub"
route:
auto_host_rewrite: true
cluster: signalr-hub
timeout: 300s
- name: "b-short"
match:
prefix: "/b/"
route:
auto_host_rewrite: true
prefix_rewrite: "/basket-api/"
cluster: basket
- name: "b-long"
match:
prefix: "/basket-api/"
route:
auto_host_rewrite: true
cluster: basket
- name: "agg"
match:
prefix: "/"
route:
auto_host_rewrite: true
prefix_rewrite: "/"
cluster: shoppingagg
http_filters:
- name: envoy.router
access_log:
- name: envoy.file_access_log
filter:
not_health_check_filter: {}
config:
json_format:
time: "%START_TIME%"
protocol: "%PROTOCOL%"
duration: "%DURATION%"
request_method: "%REQ(:METHOD)%"
request_host: "%REQ(HOST)%"
path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
response_flags: "%RESPONSE_FLAGS%"
route_name: "%ROUTE_NAME%"
upstream_host: "%UPSTREAM_HOST%"
upstream_cluster: "%UPSTREAM_CLUSTER%"
upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
path: "/tmp/access.log"
clusters:
- name: shoppingagg
connect_timeout: 0.25s
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
address: webshoppingagg
port_value: 80
- name: catalog
connect_timeout: 0.25s
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
address: catalog-api
port_value: 80
- name: basket
connect_timeout: 0.25s
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
address: basket-api
port_value: 80
- name: ordering
connect_timeout: 0.25s
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
address: ordering-api
port_value: 80
- name: signalr-hub
connect_timeout: 0.25s
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
address: ordering-signalrhub
port_value: 80

View File

@ -1,2 +0,0 @@
eShop API Gateway for Mobile Shopping services installed
--------------------------------------------------------

View File

@ -1,32 +0,0 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "apigwms.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "apigwms.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "apigwms.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

View File

@ -1,52 +0,0 @@
{{- define "suffix-name" -}}
{{- if .Values.app.name -}}
{{- .Values.app.name -}}
{{- else -}}
{{- .Release.Name -}}
{{- end -}}
{{- end -}}
{{- define "sql-name" -}}
{{- if .Values.inf.sql.host -}}
{{- .Values.inf.sql.host -}}
{{- else -}}
{{- printf "%s" "sql-data" -}}
{{- end -}}
{{- end -}}
{{- define "mongo-name" -}}
{{- if .Values.inf.mongo.host -}}
{{- .Values.inf.mongo.host -}}
{{- else -}}
{{- printf "%s" "nosql-data" -}}
{{- end -}}
{{- end -}}
{{- define "url-of" -}}
{{- $name := first .}}
{{- $ctx := last .}}
{{- if eq $name "" -}}
{{- $ctx.Values.inf.k8s.dns -}}
{{- else -}}
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
{{- end -}}
{{- end -}}
{{- define "pathBase" -}}
{{- if .Values.inf.k8s.suffix -}}
{{- $suffix := include "suffix-name" . -}}
{{- printf "%s-%s" .Values.pathBase $suffix -}}
{{- else -}}
{{- .Values.pathBase -}}
{{- end -}}
{{- end -}}
{{- define "fqdn-image" -}}
{{- if .Values.inf.registry -}}
{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
{{- else -}}
{{- .Values.image.repository -}}
{{- end -}}
{{- end -}}

View File

@ -1,110 +0,0 @@
{{- $name := include "apigwms.fullname" . -}}
{{- $cfgname := printf "%s-%s" "cfg" $name -}}
{{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
apiVersion: apps/v1beta2
kind: Deployment
metadata:
name: {{ template "apigwms.fullname" . }}
labels:
ufo: {{ $cfgname}}
app: {{ template "apigwms.name" . }}
chart: {{ template "apigwms.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: {{ template "apigwms.name" . }}
release: {{ .Release.Name }}
template:
metadata:
labels:
app: {{ template "apigwms.name" . }}
release: {{ .Release.Name }}
{{ if .Values.inf.mesh.enabled -}}
annotations:
linkerd.io/inject: enabled
{{- end }}
spec:
{{ if .Values.inf.registry -}}
imagePullSecrets:
- name: {{ .Values.inf.registry.secretName }}
{{- end }}
volumes:
- name: config
configMap:
name: {{ $envoycfgname }}
items:
- key: envoy.yaml
path: envoy.yaml
containers:
- name: {{ .Chart.Name }}
{{ if .Values.probes -}}
{{- if .Values.probes.liveness -}}
livenessProbe:
httpGet:
port: {{ .Values.probes.liveness.port }}
path: {{ .Values.probes.liveness.path }}
initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
{{- end -}}
{{- end -}}
{{- if .Values.probes -}}
{{- if .Values.probes.readiness }}
readinessProbe:
httpGet:
port: {{ .Values.probes.readiness.port }}
path: {{ .Values.probes.readiness.path }}
initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
{{- end -}}
{{- end }}
image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
imagePullPolicy: IfNotPresent
volumeMounts:
- name: config
mountPath: {{ .Values.envoy.configPath }}
env:
- name: PATH_BASE
value: {{ include "pathBase" . }}
- name: k8sname
value: {{ .Values.clusterName }}
{{- if .Values.env.values -}}
{{- range .Values.env.values }}
- name: {{ .name }}
value: {{ .value | quote }}
{{- end -}}
{{- end -}}
{{- if .Values.env.configmap -}}
{{- range .Values.env.configmap }}
- name: {{ .name }}
valueFrom:
configMapKeyRef:
name: {{ $cfgname }}
key: {{ .key }}
{{- end -}}
{{- end }}
ports:
- name: http
containerPort: 80
protocol: TCP
- name: admin
containerPort: 8001
protocol: TCP
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}

View File

@ -1,14 +0,0 @@
{{- $name := include "apigwms.fullname" . -}}
apiVersion: v1
kind: ConfigMap
metadata:
name: "envoy-{{ $name }}"
labels:
app: {{ template "apigwms.name" . }}
chart: {{ template "apigwms.chart" .}}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
{{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 }}

View File

@ -1,47 +0,0 @@
{{- if .Values.ingress.enabled -}}
{{- $ingressPath := include "pathBase" . -}}
{{- $serviceName := .Values.app.svc.mobileshoppingapigw -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ template "apigwms.fullname" . }}
labels:
app: {{ template "apigwms.name" . }}
chart: {{ template "apigwms.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- with .Values.ingress.annotations }}
annotations:
{{ toYaml . | indent 4 }}
{{- end }}
{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
cert-manager.io/issuer: {{ .Values.inf.tls.issuer }}
{{- end }}
{{- if .Values.inf.mesh.enabled }}
{{- with .Values.ingress.mesh.annotations }}
{{ toYaml . | indent 4 }}
{{- end }}
{{- end }}
spec:
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
- host: {{ . }}
http:
paths:
- path: {{ $ingressPath }}
backend:
serviceName: {{ $serviceName }}
servicePort: http
{{- end }}
{{- end }}

View File

@ -1,23 +0,0 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.app.svc.mobileshoppingapigw }}
labels:
app: {{ template "apigwms.name" . }}
chart: {{ template "apigwms.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
ports:
- port: {{ .Values.service.port }}
targetPort: http
protocol: TCP
name: http
- port: {{ .Values.service.adminPort }}
targetPort: admin
protocol: TCP
name: admin
selector:
app: {{ template "apigwms.name" . }}
release: {{ .Release.Name }}

View File

@ -1,45 +0,0 @@
replicaCount: 1
clusterName: eshop-aks
pathBase: /mobileshoppingapigw
image:
repository: envoyproxy/envoy
tag: v1.11.1
service:
type: ClusterIP
port: 80
adminPort: 8001
ingress:
enabled: true
annotations:
nginx.ingress.kubernetes.io/rewrite-target: "/"
ingress.kubernetes.io/rewrite-target: "/"
tls: []
resources: {}
nodeSelector: {}
tolerations: []
affinity: {}
env: {}
envoy:
configPath: /etc/envoy
probes:
liveness:
path: /ready
initialDelaySeconds: 5
periodSeconds: 15
port: 8001
readiness:
path: /ready
initialDelaySeconds: 5
periodSeconds: 60
port: 8001

View File

@ -1,21 +0,0 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj

View File

@ -1,5 +0,0 @@
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: apigwws
version: 0.1.0

View File

@ -1,139 +0,0 @@
admin:
access_log_path: "/dev/null"
address:
socket_address:
address: 0.0.0.0
port_value: 8001
static_resources:
listeners:
- address:
socket_address:
address: 0.0.0.0
port_value: 80
filter_chains:
- filters:
- name: envoy.http_connection_manager
config:
codec_type: auto
stat_prefix: ingress_http
route_config:
name: eshop_backend_route
virtual_hosts:
- name: eshop_backend
domains:
- "*"
routes:
- name: "c-short"
match:
prefix: "/c/"
route:
auto_host_rewrite: true
prefix_rewrite: "/catalog-api/"
cluster: catalog
- name: "c-long"
match:
prefix: "/catalog-api/"
route:
auto_host_rewrite: true
cluster: catalog
- name: "o-short"
match:
prefix: "/o/"
route:
auto_host_rewrite: true
prefix_rewrite: "/ordering-api/"
cluster: ordering
- name: "o-long"
match:
prefix: "/ordering-api/"
route:
auto_host_rewrite: true
cluster: ordering
- name: "h-long"
match:
prefix: "/hub/notificationhub"
route:
auto_host_rewrite: true
cluster: signalr-hub
timeout: 300s
- name: "b-short"
match:
prefix: "/b/"
route:
auto_host_rewrite: true
prefix_rewrite: "/basket-api/"
cluster: basket
- name: "b-long"
match:
prefix: "/basket-api/"
route:
auto_host_rewrite: true
cluster: basket
- name: "agg"
match:
prefix: "/"
route:
auto_host_rewrite: true
prefix_rewrite: "/"
cluster: shoppingagg
http_filters:
- name: envoy.router
access_log:
- name: envoy.file_access_log
filter:
not_health_check_filter: {}
config:
json_format:
time: "%START_TIME%"
protocol: "%PROTOCOL%"
duration: "%DURATION%"
request_method: "%REQ(:METHOD)%"
request_host: "%REQ(HOST)%"
path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
response_flags: "%RESPONSE_FLAGS%"
route_name: "%ROUTE_NAME%"
upstream_host: "%UPSTREAM_HOST%"
upstream_cluster: "%UPSTREAM_CLUSTER%"
upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
path: "/tmp/access.log"
clusters:
- name: shoppingagg
connect_timeout: 0.25s
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
address: webshoppingagg
port_value: 80
- name: catalog
connect_timeout: 0.25s
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
address: catalog-api
port_value: 80
- name: basket
connect_timeout: 0.25s
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
address: basket-api
port_value: 80
- name: ordering
connect_timeout: 0.25s
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
address: ordering-api
port_value: 80
- name: signalr-hub
connect_timeout: 0.25s
type: strict_dns
lb_policy: round_robin
hosts:
- socket_address:
address: ordering-signalrhub
port_value: 80

View File

@ -1,2 +0,0 @@
eShop API Gateway for Web Shopping services installed
-----------------------------------------------------

View File

@ -1,32 +0,0 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "apigwws.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "apigwws.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "apigwws.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

View File

@ -1,52 +0,0 @@
{{- define "suffix-name" -}}
{{- if .Values.app.name -}}
{{- .Values.app.name -}}
{{- else -}}
{{- .Release.Name -}}
{{- end -}}
{{- end -}}
{{- define "sql-name" -}}
{{- if .Values.inf.sql.host -}}
{{- .Values.inf.sql.host -}}
{{- else -}}
{{- printf "%s" "sql-data" -}}
{{- end -}}
{{- end -}}
{{- define "mongo-name" -}}
{{- if .Values.inf.mongo.host -}}
{{- .Values.inf.mongo.host -}}
{{- else -}}
{{- printf "%s" "nosql-data" -}}
{{- end -}}
{{- end -}}
{{- define "url-of" -}}
{{- $name := first .}}
{{- $ctx := last .}}
{{- if eq $name "" -}}
{{- $ctx.Values.inf.k8s.dns -}}
{{- else -}}
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
{{- end -}}
{{- end -}}
{{- define "pathBase" -}}
{{- if .Values.inf.k8s.suffix -}}
{{- $suffix := include "suffix-name" . -}}
{{- printf "%s-%s" .Values.pathBase $suffix -}}
{{- else -}}
{{- .Values.pathBase -}}
{{- end -}}
{{- end -}}
{{- define "fqdn-image" -}}
{{- if .Values.inf.registry -}}
{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
{{- else -}}
{{- .Values.image.repository -}}
{{- end -}}
{{- end -}}

View File

@ -1,109 +0,0 @@
{{- $name := include "apigwws.fullname" . -}}
{{- $cfgname := printf "%s-%s" "cfg" $name -}}
{{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
apiVersion: apps/v1beta2
kind: Deployment
metadata:
name: {{ template "apigwws.fullname" . }}
labels:
app: {{ template "apigwws.name" . }}
chart: {{ template "apigwws.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: {{ template "apigwws.name" . }}
release: {{ .Release.Name }}
template:
metadata:
labels:
app: {{ template "apigwws.name" . }}
release: {{ .Release.Name }}
{{ if .Values.inf.mesh.enabled -}}
annotations:
linkerd.io/inject: enabled
{{- end }}
spec:
{{ if .Values.inf.registry -}}
imagePullSecrets:
- name: {{ .Values.inf.registry.secretName }}
{{- end }}
volumes:
- name: config
configMap:
name: {{ $envoycfgname }}
items:
- key: envoy.yaml
path: envoy.yaml
containers:
- name: {{ .Chart.Name }}
{{ if .Values.probes -}}
{{- if .Values.probes.liveness -}}
livenessProbe:
httpGet:
port: {{ .Values.probes.liveness.port }}
path: {{ .Values.probes.liveness.path }}
initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
{{- end -}}
{{- end -}}
{{- if .Values.probes -}}
{{- if .Values.probes.readiness }}
readinessProbe:
httpGet:
port: {{ .Values.probes.readiness.port }}
path: {{ .Values.probes.readiness.path }}
initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
{{- end -}}
{{- end }}
image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
volumeMounts:
- name: config
mountPath: {{ .Values.envoy.configPath }}
env:
- name: PATH_BASE
value: {{ include "pathBase" . }}
- name: k8sname
value: {{ .Values.clusterName }}
{{- if .Values.env.values -}}
{{- range .Values.env.values }}
- name: {{ .name }}
value: {{ .value | quote }}
{{- end -}}
{{- end -}}
{{- if .Values.env.configmap -}}
{{- range .Values.env.configmap }}
- name: {{ .name }}
valueFrom:
configMapKeyRef:
name: {{ $cfgname }}
key: {{ .key }}
{{- end -}}
{{- end }}
ports:
- name: http
containerPort: 80
protocol: TCP
- name: admin
containerPort: 8001
protocol: TCP
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}

View File

@ -1,14 +0,0 @@
{{- $name := include "apigwws.fullname" . -}}
apiVersion: v1
kind: ConfigMap
metadata:
name: "envoy-{{ $name }}"
labels:
app: {{ template "apigwws.name" . }}
chart: {{ template "apigwws.chart" .}}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
{{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 }}

View File

@ -1,46 +0,0 @@
{{- if .Values.ingress.enabled -}}
{{- $ingressPath := include "pathBase" . -}}
{{- $serviceName := .Values.app.svc.webshoppingapigw -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ template "apigwws.fullname" . }}
labels:
app: {{ template "apigwws.name" . }}
chart: {{ template "apigwws.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- with .Values.ingress.annotations }}
annotations:
{{ toYaml . | indent 4 }}
{{- end }}
{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
cert-manager.io/issuer: {{ .Values.inf.tls.issuer }}
{{- end }}
{{- if .Values.inf.mesh.enabled }}
{{- with .Values.ingress.mesh.annotations }}
{{ toYaml . | indent 4 }}
{{- end }}
{{- end }}
spec:
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
- host: {{ . }}
http:
paths:
- path: {{ $ingressPath }}
backend:
serviceName: {{ $serviceName }}
servicePort: http
{{- end }}
{{- end }}

View File

@ -1,23 +0,0 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.app.svc.webshoppingapigw }}
labels:
app: {{ template "apigwws.name" . }}
chart: {{ template "apigwws.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
ports:
- port: {{ .Values.service.port }}
targetPort: http
protocol: TCP
name: http
- port: {{ .Values.service.adminPort }}
targetPort: admin
protocol: TCP
name: admin
selector:
app: {{ template "apigwws.name" . }}
release: {{ .Release.Name }}

View File

@ -1,46 +0,0 @@
replicaCount: 1
clusterName: eshop-aks
pathBase: /webshoppingapigw
image:
repository: envoyproxy/envoy
tag: v1.11.1
service:
type: ClusterIP
port: 80
adminPort: 8001
ingress:
enabled: true
annotations:
nginx.ingress.kubernetes.io/rewrite-target: "/"
ingress.kubernetes.io/rewrite-target: "/"
tls: []
resources: {}
nodeSelector: {}
tolerations: []
affinity: {}
# env defines the environment variables that will be declared in the pod
env: {}
envoy:
configPath: /etc/envoy
probes:
liveness:
path: /ready
initialDelaySeconds: 5
periodSeconds: 15
port: 8001
readiness:
path: /ready
initialDelaySeconds: 5
periodSeconds: 60
port: 8001

View File

@ -1,38 +0,0 @@
# This helm values file defines app-based settings
# Charts use those values, so this file **MUST** be included in all chart releases
app: # app global settings
name: "my-eshop" # Override for custom app name
ingress: # ingress related settings
entries:
basket: basket-api # ingress entry for basket api
catalog: catalog-api # ingress entry for catalog api
ordering: ordering-api # ingress entry for ordering api
identity: identity # ingress entry for identity api
mvc: webmvc # ingress entry for web mvc
spa: "" # ingress entry for web spa
status: webstatus # ingress entry for web status
webshoppingapigw: webshoppingapigw # ingress entry for web shopping Agw
mobileshoppingapigw: mobileshoppingapigw # ingress entry for mobile shopping Agw
webshoppingagg: webshoppingagg # ingress entry for web shopping aggregator
mobileshoppingagg: mobileshoppingagg # ingress entry for mobile shopping aggregator
payment: payment-api # ingress entry for payment api
webhooks: webhooks-api # ingress entry for webhooks api
webhooksweb: webhooks-web # ingress entry for webhooks web demo client
svc:
basket: basket-api # service name for basket api
catalog: catalog-api # service name for catalog api
ordering: ordering-api # service name for ordering api
orderingbackgroundtasks: ordering-backgroundtasks # service name for orderingbackgroundtasks
orderingsignalrhub: ordering-signalrhub # service name for orderingsignalrhub
identity: identity-api # service name for identity api
mvc: webmvc # service name for web mvc
spa: webspa # service name for web spa
status: webstatus # service name for web status
webshoppingapigw: webshoppingapigw # service name for web shopping Agw
mobileshoppingapigw: mobileshoppingapigw # service name for mobile shopping Agw
webshoppingagg: webshoppingagg # service name for web shopping aggregator
mobileshoppingagg: mobileshoppingagg # service name for mobile shopping aggregator
payment: payment-api # service name for payment api
webhooks: webhooks-api # service name for webhooks api
webhooksweb: webhooks-client # service name for webhooks web

View File

@ -1,21 +0,0 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj

View File

@ -1,5 +0,0 @@
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: basket-api
version: 0.1.0

View File

@ -1,8 +0,0 @@
eShop Basket API installed.
--------------------------
This API is not directly exposed outside cluster. If need to access it use:
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "basket-api.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl port-forward $POD_NAME 8080:80

View File

@ -1,32 +0,0 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "basket-api.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "basket-api.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "basket-api.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

View File

@ -1,52 +0,0 @@
{{- define "suffix-name" -}}
{{- if .Values.app.name -}}
{{- .Values.app.name -}}
{{- else -}}
{{- .Release.Name -}}
{{- end -}}
{{- end -}}
{{- define "sql-name" -}}
{{- if .Values.inf.sql.host -}}
{{- .Values.inf.sql.host -}}
{{- else -}}
{{- printf "%s" "sql-data" -}}
{{- end -}}
{{- end -}}
{{- define "mongo-name" -}}
{{- if .Values.inf.mongo.host -}}
{{- .Values.inf.mongo.host -}}
{{- else -}}
{{- printf "%s" "nosql-data" -}}
{{- end -}}
{{- end -}}
{{- define "url-of" -}}
{{- $name := first .}}
{{- $ctx := last .}}
{{- if eq $name "" -}}
{{- $ctx.Values.inf.k8s.dns -}}
{{- else -}}
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
{{- end -}}
{{- end -}}
{{- define "pathBase" -}}
{{- if .Values.inf.k8s.suffix -}}
{{- $suffix := include "suffix-name" . -}}
{{- printf "%s-%s" .Values.pathBase $suffix -}}
{{- else -}}
{{- .Values.pathBase -}}
{{- end -}}
{{- end -}}
{{- define "fqdn-image" -}}
{{- if .Values.inf.registry -}}
{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
{{- else -}}
{{- .Values.image.repository -}}
{{- end -}}
{{- end -}}

View File

@ -1,17 +0,0 @@
{{- $name := include "basket-api.fullname" . -}}
apiVersion: v1
kind: ConfigMap
metadata:
name: "cfg-{{ $name }}"
labels:
app: {{ template "basket-api.name" . }}
chart: {{ template "basket-api.chart" .}}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
basket__ConnectionString: {{ .Values.inf.redis.basket.constr }}
urls__IdentityUrl: http://{{ .Values.app.svc.identity }}
all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"

View File

@ -1,99 +0,0 @@
{{- $name := include "basket-api.fullname" . -}}
{{- $cfgname := printf "%s-%s" "cfg" $name -}}
apiVersion: apps/v1beta2
kind: Deployment
metadata:
name: {{ template "basket-api.fullname" . }}
labels:
ufo: {{ $cfgname}}
app: {{ template "basket-api.name" . }}
chart: {{ template "basket-api.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: {{ template "basket-api.name" . }}
release: {{ .Release.Name }}
template:
metadata:
labels:
app: {{ template "basket-api.name" . }}
release: {{ .Release.Name }}
{{ if .Values.inf.mesh.enabled -}}
annotations:
linkerd.io/inject: enabled
{{- end }}
spec:
{{ if .Values.inf.registry -}}
imagePullSecrets:
- name: {{ .Values.inf.registry.secretName }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
{{ if .Values.probes -}}
{{- if .Values.probes.liveness -}}
livenessProbe:
httpGet:
port: {{ .Values.probes.liveness.port }}
path: {{ .Values.probes.liveness.path }}
initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
{{- end -}}
{{- end -}}
{{- if .Values.probes -}}
{{- if .Values.probes.readiness }}
readinessProbe:
httpGet:
port: {{ .Values.probes.readiness.port }}
path: {{ .Values.probes.readiness.path }}
initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
{{- end -}}
{{- end }}
image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: PATH_BASE
value: {{ include "pathBase" . }}
- name: k8sname
value: {{ .Values.clusterName }}
{{- if .Values.env.values -}}
{{- range .Values.env.values }}
- name: {{ .name }}
value: {{ .value | quote }}
{{- end -}}
{{- end -}}
{{- if .Values.env.configmap -}}
{{- range .Values.env.configmap }}
- name: {{ .name }}
valueFrom:
configMapKeyRef:
name: {{ $cfgname }}
key: {{ .key }}
{{- end -}}
{{- end }}
ports:
- name: http
containerPort: 80
protocol: TCP
- name: grpc
containerPort: 81
protocol: TCP
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}

View File

@ -1,23 +0,0 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.app.svc.basket }}
labels:
app: {{ template "basket-api.name" . }}
chart: {{ template "basket-api.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
ports:
- port: {{ .Values.service.port }}
targetPort: http
protocol: TCP
name: http
- port: {{ .Values.service.grpcPort }}
targetPort: grpc
protocol: TCP
name: grpc
selector:
app: {{ template "basket-api.name" . }}
release: {{ .Release.Name }}

View File

@ -1,61 +0,0 @@
replicaCount: 1
clusterName: eshop-aks
pathBase: /basket-api
image:
repository: eshop/basket.api
tag: latest
pullPolicy: IfNotPresent
service:
type: ClusterIP
port: 80
grpcPort: 81
resources: {}
nodeSelector: {}
tolerations: []
affinity: {}
# env defines the environment variables that will be declared in the pod
env:
urls:
# configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
configmap:
- name: ConnectionString
key: basket__ConnectionString
- name: EventBusConnection
key: all__EventBusConnection
- name: ApplicationInsights__InstrumentationKey
key: all__InstrumentationKey
- name: AzureServiceBusEnabled
key: all__UseAzureServiceBus
- name: IdentityUrl
key: urls__IdentityUrl
# values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
values:
- name: OrchestratorType
value: 'K8S'
- name: PORT
value: "80"
- name: GRPC_PORT
value: "81"
probes:
liveness:
path: /liveness
initialDelaySeconds: 10
periodSeconds: 15
port: 80
readiness:
path: /hc
timeoutSeconds: 5
initialDelaySeconds: 90
periodSeconds: 60
port: 80
ingress:
enabled: false

View File

@ -1,21 +0,0 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj

View File

@ -1,5 +0,0 @@
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: basket-data
version: 0.1.0

View File

@ -1,8 +0,0 @@
eShop Redis for keystore data installed
----------------------------------------
Redis is not directly exposed outside cluster. If need to access it from outside use:
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "basket-data.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl port-forward $POD_NAME 8080:80

View File

@ -1,32 +0,0 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "basket-data.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "basket-data.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "basket-data.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

View File

@ -1,43 +0,0 @@
apiVersion: apps/v1beta2
kind: Deployment
metadata:
name: {{ template "basket-data.fullname" . }}
labels:
app: {{ template "basket-data.name" . }}
chart: {{ template "basket-data.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: {{ template "basket-data.name" . }}
release: {{ .Release.Name }}
template:
metadata:
labels:
app: {{ template "basket-data.name" . }}
release: {{ .Release.Name }}
spec:
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: http
containerPort: 6379
protocol: TCP
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}

View File

@ -1,19 +0,0 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.inf.redis.basket.svc }}
labels:
app: {{ template "basket-data.name" . }}
chart: {{ template "basket-data.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
ports:
- port: {{ .Values.service.port }}
targetPort: http
protocol: TCP
name: http
selector:
app: {{ template "basket-data.name" . }}
release: {{ .Release.Name }}

View File

@ -1,19 +0,0 @@
replicaCount: 1
image:
repository: redis
tag: 4.0.10
pullPolicy: IfNotPresent
service:
type: ClusterIP
port: 6379
resources: {}
nodeSelector: {}
tolerations: []
affinity: {}

View File

@ -1,21 +0,0 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj

View File

@ -1,5 +0,0 @@
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: catalog-api
version: 0.1.0

View File

@ -1,9 +0,0 @@
eShop Catalog API installed.
----------------------------
This API is not directly exposed outside cluster. If need to access it use:
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "catalog-api.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl port-forward $POD_NAME 8080:80

View File

@ -1,32 +0,0 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "catalog-api.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "catalog-api.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "catalog-api.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

View File

@ -1,60 +0,0 @@
{{- define "suffix-name" -}}
{{- if .Values.app.name -}}
{{- .Values.app.name -}}
{{- else -}}
{{- .Release.Name -}}
{{- end -}}
{{- end -}}
{{- define "sql-name" -}}
{{- if .Values.inf.sql.host -}}
{{- .Values.inf.sql.host -}}
{{- else -}}
{{- printf "%s" "sql-data" -}}
{{- end -}}
{{- end -}}
{{- define "mongo-name" -}}
{{- if .Values.inf.mongo.host -}}
{{- .Values.inf.mongo.host -}}
{{- else -}}
{{- printf "%s" "nosql-data" -}}
{{- end -}}
{{- end -}}
{{- define "url-of" -}}
{{- $name := first .}}
{{- $ctx := last .}}
{{- if eq $name "" -}}
{{- $ctx.Values.inf.k8s.dns -}}
{{- else -}}
{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}} {{/*Value is just <dns>/<name> */}}
{{- end -}}
{{- end -}}
{{- define "pathBase" -}}
{{- if .Values.inf.k8s.suffix -}}
{{- $suffix := include "suffix-name" . -}}
{{- printf "%s-%s" .Values.pathBase $suffix -}}
{{- else -}}
{{- .Values.pathBase -}}
{{- end -}}
{{- end -}}
{{- define "fqdn-image" -}}
{{- if .Values.inf.registry -}}
{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
{{- else -}}
{{- .Values.image.repository -}}
{{- end -}}
{{- end -}}
{{- define "protocol" -}}
{{- if .Values.inf.tls.enabled -}}
{{- printf "%s" "https" -}}
{{- else -}}
{{- printf "%s" "http" -}}
{{- end -}}
{{- end -}}

View File

@ -1,21 +0,0 @@
{{- $name := include "catalog-api.fullname" . -}}
{{- $sqlsrv := include "sql-name" . -}}
{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
{{- $protocol := include "protocol" . -}}
apiVersion: v1
kind: ConfigMap
metadata:
name: "cfg-{{ $name }}"
labels:
app: {{ template "catalog-api.name" . }}
chart: {{ template "catalog-api.chart" .}}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
catalog__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.catalog.db }};User Id={{ .Values.inf.sql.common.user }};Password={{ .Values.inf.sql.common.pwd }};
catalog__PicBaseUrl: {{ $protocol }}://{{ $webshoppingapigw }}/c/api/v1/catalog/items/[0]/pic/
catalog__AzureStorageEnabled: "{{ .Values.inf.misc.useAzureStorage }}"
all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"

View File

@ -1,99 +0,0 @@
{{- $name := include "catalog-api.fullname" . -}}
{{- $cfgname := printf "%s-%s" "cfg" $name -}}
apiVersion: apps/v1beta2
kind: Deployment
metadata:
name: {{ template "catalog-api.fullname" . }}
labels:
ufo: {{ $cfgname}}
app: {{ template "catalog-api.name" . }}
chart: {{ template "catalog-api.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: {{ template "catalog-api.name" . }}
release: {{ .Release.Name }}
template:
metadata:
labels:
app: {{ template "catalog-api.name" . }}
release: {{ .Release.Name }}
{{ if .Values.inf.mesh.enabled -}}
annotations:
linkerd.io/inject: enabled
{{- end }}
spec:
{{ if .Values.inf.registry -}}
imagePullSecrets:
- name: {{ .Values.inf.registry.secretName }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
{{ if .Values.probes -}}
{{- if .Values.probes.liveness -}}
livenessProbe:
httpGet:
port: {{ .Values.probes.liveness.port }}
path: {{ .Values.probes.liveness.path }}
initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
{{- end -}}
{{- end -}}
{{- if .Values.probes -}}
{{- if .Values.probes.readiness }}
readinessProbe:
httpGet:
port: {{ .Values.probes.readiness.port }}
path: {{ .Values.probes.readiness.path }}
initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
{{- end -}}
{{- end }}
image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: PATH_BASE
value: {{ include "pathBase" . }}
- name: k8sname
value: {{ .Values.clusterName }}
{{- if .Values.env.values -}}
{{- range .Values.env.values }}
- name: {{ .name }}
value: {{ .value | quote }}
{{- end -}}
{{- end -}}
{{- if .Values.env.configmap -}}
{{- range .Values.env.configmap }}
- name: {{ .name }}
valueFrom:
configMapKeyRef:
name: {{ $cfgname }}
key: {{ .key }}
{{- end -}}
{{- end }}
ports:
- name: http
containerPort: 80
protocol: TCP
- name: grpc
containerPort: 81
protocol: TCP
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}

View File

@ -1,23 +0,0 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.app.svc.catalog }}
labels:
app: {{ template "catalog-api.name" . }}
chart: {{ template "catalog-api.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
ports:
- port: {{ .Values.service.port }}
targetPort: http
protocol: TCP
name: http
- port: {{ .Values.service.grpcPort }}
targetPort: grpc
protocol: TCP
name: grpc
selector:
app: {{ template "catalog-api.name" . }}
release: {{ .Release.Name }}

View File

@ -1,63 +0,0 @@
replicaCount: 1
clusterName: eshop-aks
pathBase: /catalog-api
image:
repository: eshop/catalog.api
tag: latest
pullPolicy: IfNotPresent
service:
type: ClusterIP
port: 80
grpcPort: 81
resources: {}
nodeSelector: {}
tolerations: []
affinity: {}
# env defines the environment variables that will be declared in the pod
env:
urls:
# configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
configmap:
- name: ConnectionString
key: catalog__ConnectionString
- name: PicBaseUrl
key: catalog__PicBaseUrl
- name: AzureStorageEnabled
key: catalog__AzureStorageEnabled
- name: ApplicationInsights__InstrumentationKey
key: all__InstrumentationKey
- name: EventBusConnection
key: all__EventBusConnection
- name: AzureServiceBusEnabled
key: all__UseAzureServiceBus
# values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
values:
- name: ASPNETCORE_ENVIRONMENT
value: Development
- name: OrchestratorType
value: 'K8S'
- name: PORT
value: "80"
- name: GRPC_PORT
value: "81"
probes:
liveness:
path: /liveness
initialDelaySeconds: 10
periodSeconds: 15
port: 80
readiness:
path: /hc
timeoutSeconds: 5
initialDelaySeconds: 90
periodSeconds: 60
port: 80

View File

@ -1,149 +0,0 @@
Param(
[parameter(Mandatory=$false)][string]$registry,
[parameter(Mandatory=$false)][string]$dockerUser,
[parameter(Mandatory=$false)][string]$dockerPassword,
[parameter(Mandatory=$false)][string]$externalDns,
[parameter(Mandatory=$false)][string]$appName="eshop",
[parameter(Mandatory=$false)][bool]$deployInfrastructure=$true,
[parameter(Mandatory=$false)][bool]$deployCharts=$true,
[parameter(Mandatory=$false)][bool]$clean=$true,
[parameter(Mandatory=$false)][string]$aksName="",
[parameter(Mandatory=$false)][string]$aksRg="",
[parameter(Mandatory=$false)][string]$imageTag="latest",
[parameter(Mandatory=$false)][bool]$useLocalk8s=$false,
[parameter(Mandatory=$false)][bool]$useMesh=$false,
[parameter(Mandatory=$false)][string][ValidateSet('Always','IfNotPresent','Never', IgnoreCase=$false)]$imagePullPolicy="Always",
[parameter(Mandatory=$false)][string][ValidateSet('prod','staging','none','custom', IgnoreCase=$false)]$sslSupport = "none",
[parameter(Mandatory=$false)][string]$tlsSecretName = "eshop-tls-custom",
[parameter(Mandatory=$false)][string]$chartsToDeploy="*",
[parameter(Mandatory=$false)][string]$ingressMeshAnnotationsFile="ingress_values_linkerd.yaml"
)
function Install-Chart {
Param([string]$chart,[string]$initialOptions, [bool]$customRegistry)
$options=$initialOptions
if ($sslEnabled) {
$options = "$options --set ingress.tls[0].secretName=$tlsSecretName --set ingress.tls[0].hosts={$dns}"
if ($sslSupport -ne "custom") {
$options = "$options --set inf.tls.issuer=$sslIssuer"
}
}
if ($customRegistry) {
$options = "$options --set inf.registry.server=$registry --set inf.registry.login=$dockerUser --set inf.registry.pwd=$dockerPassword --set inf.registry.secretName=eshop-docker-scret"
}
if ($chart -ne "eshop-common" -or $customRegistry) { # eshop-common is ignored when no secret must be deployed
$command = "install $options --name=$appName-$chart $chart"
Write-Host "Helm Command: helm $command" -ForegroundColor Gray
Invoke-Expression 'cmd /c "helm $command"'
}
}
$dns = $externalDns
$sslEnabled=$false
$sslIssuer=""
if ($sslSupport -eq "staging") {
$sslEnabled=$true
$tlsSecretName="eshop-letsencrypt-staging"
$sslIssuer="letsencrypt-staging"
}
elseif ($sslSupport -eq "prod") {
$sslEnabled=$true
$tlsSecretName="eshop-letsencrypt-prod"
$sslIssuer="letsencrypt-prod"
}
elseif ($sslSupport -eq "custom") {
$sslEnabled=$true
}
$ingressValuesFile="ingress_values.yaml"
if ($useLocalk8s -eq $true) {
$ingressValuesFile="ingress_values_dockerk8s.yaml"
$dns="localhost"
}
if ($externalDns -eq "aks") {
if ([string]::IsNullOrEmpty($aksName) -or [string]::IsNullOrEmpty($aksRg)) {
Write-Host "Error: When using -dns aks, MUST set -aksName and -aksRg too." -ForegroundColor Red
exit 1
}
Write-Host "Getting DNS of AKS of AKS $aksName (in resource group $aksRg)..." -ForegroundColor Green
$dns = $(az aks show -n $aksName -g $aksRg --query addonProfiles.httpApplicationRouting.config.HTTPApplicationRoutingZoneName)
if ([string]::IsNullOrEmpty($dns)) {
Write-Host "Error getting DNS of AKS $aksName (in resource group $aksRg). Please ensure AKS has httpRouting enabled AND Azure CLI is logged & in version 2.0.37 or higher" -ForegroundColor Red
exit 1
}
$dns = $dns -replace '[\"]'
Write-Host "DNS base found is $dns. Will use $appName.$dns for the app!" -ForegroundColor Green
$dns = "$appName.$dns"
}
# Initialization & check commands
if ([string]::IsNullOrEmpty($dns)) {
Write-Host "No DNS specified. Ingress resources will be bound to public ip" -ForegroundColor Yellow
if ($sslEnabled) {
Write-Host "Can't bound SSL to public IP. DNS is mandatory when using TLS" -ForegroundColor Red
exit 1
}
}
if ($useLocalk8s -and $sslEnabled) {
Write-Host "SSL can'be enabled on local K8s." -ForegroundColor Red
exit 1
}
if ($clean) {
Write-Host "Cleaning previous helm releases..." -ForegroundColor Green
helm delete --purge $(helm ls -q eshop)
Write-Host "Previous releases deleted" -ForegroundColor Green
}
$useCustomRegistry=$false
if (-not [string]::IsNullOrEmpty($registry)) {
$useCustomRegistry=$true
if ([string]::IsNullOrEmpty($dockerUser) -or [string]::IsNullOrEmpty($dockerPassword)) {
Write-Host "Error: Must use -dockerUser AND -dockerPassword if specifying custom registry" -ForegroundColor Red
exit 1
}
}
Write-Host "Begin eShopOnContainers installation using Helm" -ForegroundColor Green
$infras = ("sql-data", "nosql-data", "rabbitmq", "keystore-data", "basket-data")
$charts = ("eshop-common", "basket-api","catalog-api", "identity-api", "mobileshoppingagg","ordering-api","ordering-backgroundtasks","ordering-signalrhub", "payment-api", "webmvc", "webshoppingagg", "webspa", "webstatus", "webhooks-api", "webhooks-web")
$gateways = ("apigwmm", "apigwms", "apigwwm", "apigwws")
if ($deployInfrastructure) {
foreach ($infra in $infras) {
Write-Host "Installing infrastructure: $infra" -ForegroundColor Green
helm install --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set "ingress.hosts={$dns}" --name="$appName-$infra" $infra
}
}
else {
Write-Host "eShopOnContainers infrastructure (bbdd, redis, ...) charts aren't installed (-deployCharts is false)" -ForegroundColor Yellow
}
if ($deployCharts) {
foreach ($chart in $charts) {
if ($chartsToDeploy -eq "*" -or $chartsToDeploy.Contains($chart)) {
Write-Host "Installing: $chart" -ForegroundColor Green
Install-Chart $chart "-f app.yaml --values inf.yaml -f $ingressValuesFile -f $ingressMeshAnnotationsFile --set app.name=$appName --set inf.k8s.dns=$dns --set ingress.hosts={$dns} --set image.tag=$imageTag --set image.pullPolicy=$imagePullPolicy --set inf.tls.enabled=$sslEnabled --set inf.mesh.enabled=$useMesh --set inf.k8s.local=$useLocalk8s" $useCustomRegistry
}
}
foreach ($chart in $gateways) {
if ($chartsToDeploy -eq "*" -or $chartsToDeploy.Contains($chart)) {
Write-Host "Installing Api Gateway Chart: $chart" -ForegroundColor Green
Install-Chart $chart "-f app.yaml -f inf.yaml -f $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set image.pullPolicy=$imagePullPolicy --set inf.mesh.enabled=$useMesh --set ingress.hosts={$dns} --set inf.tls.enabled=$sslEnabled" $false
}
}
}
else {
Write-Host "eShopOnContainers non-infrastructure charts aren't installed (-deployCharts is false)" -ForegroundColor Yellow
}
Write-Host "helm charts installed." -ForegroundColor Green

View File

@ -1,21 +0,0 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj

View File

@ -1,5 +0,0 @@
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: eshop-common
version: 0.1.0

View File

@ -1,7 +0,0 @@
Common eShop resources installed:
{{- if .Values.inf.registry -}}
* Docker registry secret ({{ .Values.inf.registry.secretName }})
{{- end -}}
+++ Done +++

View File

@ -1,32 +0,0 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "eshop-common.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "eshop-common.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "eshop-common.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

View File

@ -1,3 +0,0 @@
{{- define "imagePullSecret" }}
{{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.inf.registry.server (printf "%s:%s" .Values.inf.registry.login .Values.inf.registry.pwd | b64enc) | b64enc }}
{{- end }}

View File

@ -1,9 +0,0 @@
{{- if .Values.inf.registry -}}
apiVersion: v1
kind: Secret
metadata:
name: {{ .Values.inf.registry.secretName }}
type: kubernetes.io/dockerconfigjson
data:
.dockerconfigjson: {{ template "imagePullSecret" . }}
{{- end -}}

Some files were not shown because too many files have changed in this diff Show More