Skip to content

Commit 702ac7c

Browse files
raman-mraman-m
authored
Merge branch 'develop' into master
2 parents 1c5fdcb + 433dfca commit 702ac7c

File tree

642 files changed

+13556
-14180
lines changed

Some content is hidden

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

642 files changed

+13556
-14180
lines changed

‎.circleci/config.yml

+19-12
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,43 @@
1-
version: 2.1
1+
version: 2.1
22
orbs:
3-
queue: eddiewebb/queue@1.5.0
3+
queue: eddiewebb/queue@2.2.1
44
jobs:
55
build:
66
docker:
7-
- image: mijitt0m/ocelot-build:0.0.1
7+
- image: mijitt0m/ocelot-build:0.0.9
88
steps:
99
- checkout
10-
- run: make build
10+
- run: dotnet tool restore && dotnet cake
1111
release:
1212
docker:
13-
- image: mijitt0m/ocelot-build:0.0.1
13+
- image: mijitt0m/ocelot-build:0.0.9
1414
steps:
1515
- checkout
16-
- run: make release
16+
- run: dotnet tool restore && dotnet cake --target=Release
1717
workflows:
1818
version: 2
19-
master:
20-
jobs:
19+
main:
20+
jobs:
2121
- queue/block_workflow:
2222
time: "20"
23-
only-on-branch: master
24-
- release:
23+
only-on-branch: main
24+
- release:
2525
requires:
2626
- queue/block_workflow
2727
filters:
2828
branches:
29-
only: master
29+
only: main
30+
develop:
31+
jobs:
32+
- build:
33+
filters:
34+
branches:
35+
only: develop
3036
pr:
3137
jobs:
3238
- build:
3339
filters:
3440
branches:
3541
ignore:
36-
- master
42+
- main
43+
- develop

‎.config/dotnet-tools.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"cake.tool": {
6+
"version": "3.0.0",
7+
"commands": [
8+
"dotnet-cake"
9+
]
10+
},
11+
"coveralls.net": {
12+
"version": "4.0.1",
13+
"commands": [
14+
"csmacnz.Coveralls"
15+
]
16+
}
17+
}
18+
}

‎.dockerignore

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
*/*/bin
2-
*/*/obj
1+
*/*/bin
2+
*/*/obj
3+
artifacts/
4+
TestResults/
5+
tools/

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ ClientBin/
183183
*.dbmdl
184184
*.dbproj.schemaview
185185
*.pfx
186-
!idsrv3test.pfx
186+
!mycert.pfx
187187
*.publishsettings
188188
node_modules/
189189
orleans.codegen.cs

‎Makefile

-23
This file was deleted.

‎Ocelot.sln

+5-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29613.14
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32112.339
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5CFB79B7-C9DC-45A4-9A75-625D92471702}"
77
EndProject
@@ -44,15 +44,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Provider.Eureka", "s
4444
EndProject
4545
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Provider.Polly", "src\Ocelot.Provider.Polly\Ocelot.Provider.Polly.csproj", "{1F6E5DCF-8A2E-4E24-A25D-064362DE8D0E}"
4646
EndProject
47-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Provider.Rafty", "src\Ocelot.Provider.Rafty\Ocelot.Provider.Rafty.csproj", "{AC153C67-EF18-47E6-A230-F0D3CF5F0A98}"
48-
EndProject
4947
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Tracing.Butterfly", "src\Ocelot.Tracing.Butterfly\Ocelot.Tracing.Butterfly.csproj", "{6045E23D-669C-4F27-AF8E-8EEE6DB3557F}"
5048
EndProject
5149
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Provider.Kubernetes", "src\Ocelot.Provider.Kubernetes\Ocelot.Provider.Kubernetes.csproj", "{72C8E528-B4F5-45CE-8A06-CD3787364856}"
5250
EndProject
5351
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8FA0CBA0-0338-48EB-B37F-83CA5022237C}"
5452
EndProject
55-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OcelotBasic", "samples\OcelotBasic\OcelotBasic.csproj", "{ED0B3A09-112B-4BA4-82D6-11569BC7A99B}"
53+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Samples.OcelotBasic.ApiGateway", "samples\OcelotBasic\Ocelot.Samples.OcelotBasic.ApiGateway.csproj", "{ED0B3A09-112B-4BA4-82D6-11569BC7A99B}"
5654
EndProject
5755
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdministrationApi", "samples\AdministrationApi\AdministrationApi.csproj", "{B180F8AE-2F8F-44F9-9E5D-FE65B84B742E}"
5856
EndProject
@@ -66,9 +64,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DownstreamService", "sample
6664
EndProject
6765
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "k8s", "k8s", "{4B706988-4817-43A8-ABE1-32A67998C2C8}"
6866
EndProject
69-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiGateway", "samples\OcelotKube\ApiGateway\ApiGateway.csproj", "{8500055B-2C51-4CF1-A6EE-F05BB3E9BF16}"
67+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Samples.OcelotKube.ApiGateway", "samples\OcelotKube\ApiGateway\Ocelot.Samples.OcelotKube.ApiGateway.csproj", "{8500055B-2C51-4CF1-A6EE-F05BB3E9BF16}"
7068
EndProject
71-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DownstreamService", "samples\OcelotKube\DownstreamService\DownstreamService.csproj", "{7B319B8C-8155-4779-BD93-5ABD05CA2AB6}"
69+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ocelot.Samples.OcelotKube.DownstreamService", "samples\OcelotKube\DownstreamService\Ocelot.Samples.OcelotKube.DownstreamService.csproj", "{7B319B8C-8155-4779-BD93-5ABD05CA2AB6}"
7270
EndProject
7371
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "service-fabric", "service-fabric", "{B412628F-C325-47E1-A8D9-873DE04C8AF5}"
7472
EndProject
@@ -138,10 +136,6 @@ Global
138136
{1F6E5DCF-8A2E-4E24-A25D-064362DE8D0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
139137
{1F6E5DCF-8A2E-4E24-A25D-064362DE8D0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
140138
{1F6E5DCF-8A2E-4E24-A25D-064362DE8D0E}.Release|Any CPU.Build.0 = Release|Any CPU
141-
{AC153C67-EF18-47E6-A230-F0D3CF5F0A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142-
{AC153C67-EF18-47E6-A230-F0D3CF5F0A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
143-
{AC153C67-EF18-47E6-A230-F0D3CF5F0A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
144-
{AC153C67-EF18-47E6-A230-F0D3CF5F0A98}.Release|Any CPU.Build.0 = Release|Any CPU
145139
{6045E23D-669C-4F27-AF8E-8EEE6DB3557F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
146140
{6045E23D-669C-4F27-AF8E-8EEE6DB3557F}.Debug|Any CPU.Build.0 = Debug|Any CPU
147141
{6045E23D-669C-4F27-AF8E-8EEE6DB3557F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -210,7 +204,6 @@ Global
210204
{02F5AE4D-9C36-4E58-B7C6-012CBBDEFDE0} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
211205
{9BBD3586-145C-4FA0-91C5-9ED58287D753} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
212206
{1F6E5DCF-8A2E-4E24-A25D-064362DE8D0E} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
213-
{AC153C67-EF18-47E6-A230-F0D3CF5F0A98} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
214207
{6045E23D-669C-4F27-AF8E-8EEE6DB3557F} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
215208
{72C8E528-B4F5-45CE-8A06-CD3787364856} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
216209
{ED0B3A09-112B-4BA4-82D6-11569BC7A99B} = {ED066001-BAF7-4117-9884-DF591A56347D}

‎README.md

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
[<img src="https://threemammals.com/images/ocelot_logo.png">](https://threemammals.com/ocelot)
1+
![Ocelot Logo](/images/ocelot_logo.png)
22

3-
[![CircleCI](https://circleci.com/gh/ThreeMammals/Ocelot/tree/master.svg?style=svg)](https://circleci.com/gh/ThreeMammals/Ocelot/tree/master)
3+
[![CircleCI](https://circleci.com/gh/ThreeMammals/Ocelot/tree/main.svg?style=svg)](https://circleci.com/gh/ThreeMammals/Ocelot/tree/main)
44

5-
[![Coverage Status](https://coveralls.io/repos/github/ThreeMammals/Ocelot/badge.svg?branch=master)](https://coveralls.io/github/ThreeMammals/Ocelot?branch=master)
6-
7-
[Slack](https://threemammals.slack.com)
5+
[![Coverage Status](https://coveralls.io/repos/github/ThreeMammals/Ocelot/badge.svg)](https://coveralls.io/github/ThreeMammals/Ocelot)
86

97
# Ocelot
108

@@ -13,7 +11,7 @@ that need a unified point of entry into their system. However it will work with
1311

1412
In particular I want easy integration with IdentityServer reference and bearer tokens.
1513

16-
We have been unable to find this in my current workplacewithout having to write our own Javascript middlewares to handle the IdentityServer reference tokens. We would rather use the IdentityServer code that already existsto do this.
14+
We have been unable to find this in my current workplace without having to write our own Javascript middlewares to handle the IdentityServer reference tokens. We would rather use the IdentityServer code that already exists to do this.
1715

1816
Ocelot is a bunch of middlewares in a specific order.
1917

@@ -30,7 +28,7 @@ A quick list of Ocelot's capabilities for more information see the [documentatio
3028
* Kubernetes
3129
* WebSockets
3230
* Authentication
33-
* Authorisation
31+
* Authorization
3432
* Rate Limiting
3533
* Caching
3634
* Retry policies / QoS
@@ -43,7 +41,7 @@ A quick list of Ocelot's capabilities for more information see the [documentatio
4341

4442
## How to install
4543

46-
Ocelot is designed to work with ASP.NET Core only and it targets `netcoreapp3.1`.
44+
Ocelot is designed to work with ASP.NET and it targets `net7.0`.
4745

4846
Install Ocelot and it's dependencies using NuGet.
4947

@@ -81,4 +79,4 @@ If you think this project is worth supporting financially please make a contribu
8179

8280
## Things that are currently annoying me
8381

84-
[![](https://codescene.io/projects/697/status.svg) Get more details at **codescene.io**.](https://codescene.io/projects/697/jobs/latest-successful/results)
82+
[![](https://codescene.io/projects/697/status.svg) Get more details at **codescene.io**.](https://codescene.io/projects/697/jobs/latest-successful/results)

0 commit comments

Comments
 (0)