repo stringlengths 5 53 | pr_number int32 1 321k | task_type stringclasses 2
values | issue_text stringlengths 0 81.2k | pr_title stringlengths 1 319 | pr_body stringlengths 0 105k | base_sha stringlengths 40 40 | head_sha stringlengths 40 40 | gold_diff stringlengths 0 202M | changed_files listlengths 0 100 | review_threads listlengths 0 100 | test_patch stringlengths 0 23.4M | merged bool 1
class |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
ThoughtWorksInc/Binding.scala | 454 | issue_to_patch | Update sbt to 1.7.1 | Updates [org.scala-sbt:sbt](https://github.com/sbt/sbt) from 1.6.2 to 1.7.1.
I'll automatically update this PR to resolve conflicts as long as you don't change it yourself.
If you'd like to skip this version, you can just close this PR. If you have any feedback, just mention me in the comments below.
Configure Scal... | b823866890cd7dacfda93eaff52c0e5501a42671 | f5f47158ea95abf4df752a5623cb3692bceb7f83 | diff --git a/project/build.properties b/project/build.properties
index c8fcab54..22af2628 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,1 +1,1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1
| [
"project/build.properties"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 431 | issue_to_patch | Update sbt to 1.6.2 | Updates [org.scala-sbt:sbt](https://github.com/sbt/sbt) from 1.6.0 to 1.6.2.
[GitHub Release Notes](https://github.com/sbt/sbt/releases/tag/v1.6.2) - [Version Diff](https://github.com/sbt/sbt/compare/v1.6.0...v1.6.2)
I'll automatically update this PR to resolve conflicts as long as you don't change it yourself.
If yo... | c158fd83ba211fb3d7f32e932d61cd6c45ddf93f | e59a581d4736f7e73eb2dec59d69297001c04562 | diff --git a/project/build.properties b/project/build.properties
index 1e70b0c1..c8fcab54 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,1 +1,1 @@
-sbt.version=1.6.0
+sbt.version=1.6.2
| [
"project/build.properties"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 382 | issue_to_patch | Update sbt to 1.5.7 | Updates [org.scala-sbt:sbt](https://github.com/sbt/sbt) from 1.5.6 to 1.5.7.
[GitHub Release Notes](https://github.com/sbt/sbt/releases/tag/v1.5.7) - [Version Diff](https://github.com/sbt/sbt/compare/v1.5.6...v1.5.7)
I'll automatically update this PR to resolve conflicts as long as you don't change it yourself.
If yo... | b6fe2621208e5e86b96243821b8a16abbf108dd4 | 21eff76c0ba8cf1b502150fc2506ac788d65e2b7 | diff --git a/project/build.properties b/project/build.properties
index bb3a9b7d..baf5ff3e 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,1 +1,1 @@
-sbt.version=1.5.6
+sbt.version=1.5.7
| [
"project/build.properties"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 308 | issue_to_patch | Update sbt to 1.4.6 | Updates [org.scala-sbt:sbt](https://github.com/sbt/sbt) from 1.3.13 to 1.4.6.
[GitHub Release Notes](https://github.com/sbt/sbt/releases/tag/v1.4.6) - [Version Diff](https://github.com/sbt/sbt/compare/v1.3.13...v1.4.6)
I'll automatically update this PR to resolve conflicts as long as you don't change it yourself.
If ... | 5f6ea30477b936f83e731ab056fb508bfd53be6f | ef570edbb59d1337fa03e9ad06235a525416ae4d | diff --git a/project/build.properties b/project/build.properties
index 0837f7a1..d91c272d 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,1 +1,1 @@
-sbt.version=1.3.13
+sbt.version=1.4.6
| [
"project/build.properties"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 567 | issue_to_patch | Update .scalafmt.conf | a61dd0a2a5ace5d28edf13915377785d313a3291 | 1dc2223c763815ea2016bc5c030e932e93e338a5 | diff --git a/.scalafmt.conf b/.scalafmt.conf
index 79e8c60f..99bdb8e3 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,3 +1,3 @@
-runner.dialect = scala3
+runner.dialect = scala213source3
version = "3.7.5"
maxColumn = 80
| [
".scalafmt.conf"
] | [] | true | |||
ThoughtWorksInc/Binding.scala | 565 | issue_to_patch | Update sbt-best-practice to 8.4.0 in 12.x | ## About this PR
📦 Updates [com.thoughtworks.sbt-best-practice:sbt-best-practice](https://github.com/ThoughtWorksInc/sbt-best-practice) from `8.3.1` to `8.4.0`
📜 [GitHub Release Notes](https://github.com/ThoughtWorksInc/sbt-best-practice/releases/tag/v8.4.0) - [Version Diff](https://github.com/ThoughtWorksInc/sbt-be... | a61dd0a2a5ace5d28edf13915377785d313a3291 | b0a4bd4c0b089db95c21de7612d5a21057d7ee05 | diff --git a/project/sbt-best-practice.sbt b/project/sbt-best-practice.sbt
index ff7f572f..99f15cf6 100644
--- a/project/sbt-best-practice.sbt
+++ b/project/sbt-best-practice.sbt
@@ -1,3 +1,3 @@
addSbtPlugin(
- "com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.1"
+ "com.thoughtworks.sbt-best-practice... | [
"project/sbt-best-practice.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 559 | issue_to_patch | Update sbt-scalajs, scalajs-compiler, ... to 1.18.2 | ## About this PR
📦 Updates
* [org.scala-js:sbt-scalajs](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-compiler](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-library](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-library_2.13](https://github.com/scala-js/scala-js)
* [or... | 4200df43fe04968e567e3c6039165150c6147606 | 61a952dcc3d6e0f2cdd1cdda2ce32a99a498b16a | diff --git a/project/plugins.sbt b/project/plugins.sbt
index 3ea3a8b0..29ba9c25 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,6 @@
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
+addSbtPlugin("org.scala-js" % ... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 558 | issue_to_patch | Update scala-compiler, scala-library, ... to 2.13.16 | ## About this PR
📦 Updates
* [org.scala-lang:scala-compiler](https://github.com/scala/scala)
* [org.scala-lang:scala-library](https://github.com/scala/scala)
* [org.scala-lang:scala-reflect](https://github.com/scala/scala)
from `2.13.11` to `2.13.16`
📜 [GitHub Release Notes](https://github.com/scala/scala/release... | 4200df43fe04968e567e3c6039165150c6147606 | c3d22d303584089b6aaa8ea4f8fab224a373ad8e | diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index 561bb521..8a4f9460 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -18,7 +18,7 @@ jobs:
include:
- scala: 3.3.0
sbt-args: -J-XX:MaxRAMPercentage=90.0
- - scala: 2.13.11
+ ... | [
".github/workflows/scala.yml"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 560 | issue_to_patch | Update scala3-library, ... to 3.3.5 | ## About this PR
📦 Updates
* [org.scala-lang:scala3-library](https://github.com/scala/scala3)
* [org.scala-lang:scala3-library_sjs1](https://github.com/scala/scala3)
from `3.3.0` to `3.3.5`
📜 [GitHub Release Notes](https://github.com/scala/scala3/releases/tag/3.3.5) - [Version Diff](https://github.com/scala/scala... | 4200df43fe04968e567e3c6039165150c6147606 | f7ede90d780c41537aecc687aed29eb86b45bc49 | diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index 561bb521..7730f0fd 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
include:
- - scala: 3.3.0
+ - scala: 3.3.5
sbt... | [
".github/workflows/scala.yml"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 564 | issue_to_patch | upgrade sbt-example | 2ad90d3f7b556ee5bdcdaa8d434961951c63c04d | 809015e5001f10ced5004d40a54d3aa0918cb5a5 | diff --git a/project/plugins.sbt b/project/plugins.sbt
index ff53c45a..3ea3a8b0 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -3,3 +3,7 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("com.thoughtworks.... | [
"project/plugins.sbt"
] | [] | true | |||
ThoughtWorksInc/Binding.scala | 556 | issue_to_patch | Update scala-project-template | Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action | e095e536460e6475cae729c9420641011a6e9439 | 6640a145a2f7601209d95e249b7cff3c77d6e907 | diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index 6417a6ba..561bb521 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -32,6 +32,7 @@ jobs:
with:
java-version: "11"
distribution: temurin
+ - uses: sbt/setup-sbt@v1
- name: ... | [
".github/workflows/scala.yml",
"project/sbt-best-practice.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 545 | issue_to_patch | Update scalatest to 3.2.19 | ## About this PR
📦 Updates [org.scalatest:scalatest](https://github.com/scalatest/scalatest) from `3.2.16` to `3.2.19`
## Usage
✅ **Please merge!**
I'll automatically update this PR to resolve conflicts as long as you don't change it yourself.
If you'd like to skip this version, you can just close this PR. If you h... | 6929c45e7c8ed279119abb4e0cbda2220a2bb4b9 | 05a0fcea5164b72ff64a424eb4a624d44aef72c0 | diff --git a/Binding/shared/build.sbt b/Binding/shared/build.sbt
index 4299e531..3470a032 100644
--- a/Binding/shared/build.sbt
+++ b/Binding/shared/build.sbt
@@ -10,7 +10,7 @@ libraryDependencies ++= {
}
}
-libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.16" % Test
+libraryDependencies += "org.scal... | [
"Binding/shared/build.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 514 | issue_to_patch | Update scala-project-template | Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action | 739fa702aebdc70bdbdedcaf338048fc5c50fab7 | 503bd682bea73a577ebac344d70a29f9f90bfe4d | diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml
index 982e6391..370eefe8 100644
--- a/.github/workflows/scala-project-template.yml
+++ b/.github/workflows/scala-project-template.yml
@@ -11,8 +11,6 @@ name: Update Scala project template
jobs:
update-scala-proj... | [
".github/workflows/scala-project-template.yml"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 542 | issue_to_patch | Update sbt-scalajs, scalajs-compiler, ... to 1.16.0 | ## About this PR
📦 Updates
* [org.scala-js:sbt-scalajs](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-compiler](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-library](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-library_2.13](https://github.com/scala-js/scala-js)
* [or... | 4398865ccbc123e822a9c8fe306e14fcbb391908 | 87dcfd3357c606f45a1c8a7050d25377c928a199 | diff --git a/project/plugins.sbt b/project/plugins.sbt
index b2d626d0..ff53c45a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
+addSbtPlugin("org.scala-js" % ... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 516 | issue_to_patch | Update sbt-scalajs-crossproject to 1.3.2 | ## About this PR
📦 Updates [org.portable-scala:sbt-scalajs-crossproject](https://github.com/portable-scala/sbt-crossproject) from `1.3.1` to `1.3.2`
📜 [GitHub Release Notes](https://github.com/portable-scala/sbt-crossproject/releases/tag/v1.3.2) - [Version Diff](https://github.com/portable-scala/sbt-crossproject/com... | 0bdc40baad7a619f6411b932d24274e19e569563 | f81161118b8d838de185a7809a9d0ab0b024843a | diff --git a/project/plugins.sbt b/project/plugins.sbt
index 4813c873..b2d626d0 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 501 | issue_to_patch | Update scalatest to 3.2.16 | ## About this PR
📦 Updates [org.scalatest:scalatest](https://github.com/scalatest/scalatest) from `3.2.15` to `3.2.16`
📜 [GitHub Release Notes](https://github.com/scalatest/scalatest/releases/tag/release-3.2.16) - [Version Diff](https://github.com/scalatest/scalatest/compare/release-3.2.15...release-3.2.16)
## Usag... | b20b56c5bdbc7890a629cc93cb30aacdf86b0915 | 61d494aeb93bd4d19e4170f3cac2e91b9216610a | diff --git a/Binding/shared/build.sbt b/Binding/shared/build.sbt
index eeb32fb4..4299e531 100644
--- a/Binding/shared/build.sbt
+++ b/Binding/shared/build.sbt
@@ -10,7 +10,7 @@ libraryDependencies ++= {
}
}
-libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.15" % Test
+libraryDependencies += "org.scal... | [
"Binding/shared/build.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 512 | issue_to_patch | Update template | Update template | b749d9dce7466a1c9f1910183604b829f869af70 | 1428211e5b0b60dff45f3c71716920ad5631b25b | diff --git a/.github/workflows/scala-project-template.yml b/.github/workflows/scala-project-template.yml
new file mode 100644
index 00000000..982e6391
--- /dev/null
+++ b/.github/workflows/scala-project-template.yml
@@ -0,0 +1,31 @@
+on:
+ push:
+ branches-ignore:
+ - "update/**"
+ schedule:
+ - cron: "0 0... | [
".github/workflows/scala-project-template.yml",
".gitpod.yml",
".scalafmt.conf",
"project/build.properties",
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 476 | issue_to_patch | Remove common plugins | 984bfee2258b81af63251c7be966c65bfe4620bc | d2e8dc1fe2e0ad9181faa1b59536c2fde44db0b5 | diff --git a/project/plugins.sbt b/project/plugins.sbt
index 2904f03c..8d96ab62 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -4,10 +4,6 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.1.1")
-addSbtPlugin(
- "com... | [
"project/plugins.sbt",
"project/sbt-best-practice.sbt"
] | [] | true | |||
ThoughtWorksInc/Binding.scala | 508 | issue_to_patch | Remove common dependencies | 502d8e95a0f2780e119098d4a51abfc7145770fa | 0ede0ac0fd269937e86799e851bde54117a924f7 | diff --git a/project/plugins.sbt b/project/plugins.sbt
index 2904f03c..4813c873 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -3,17 +3,3 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("com.thoughtworks... | [
"project/plugins.sbt"
] | [] | true | |||
ThoughtWorksInc/Binding.scala | 509 | issue_to_patch | Revert "Remove common dependencies" | Reverts ThoughtWorksInc/Binding.scala#508 | 3877949833cb95c933c891316c66f60176b26061 | 5a6bd46e44eb406198d5607e2ca172687f4c51bc | diff --git a/project/plugins.sbt b/project/plugins.sbt
index 4813c873..2904f03c 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -3,3 +3,17 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("com.thoughtworks... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 503 | issue_to_patch | Update scala3-library, ... to 3.3.0 | ## About this PR
📦 Updates
* [org.scala-lang:scala3-library](https://github.com/lampepfl/dotty)
* [org.scala-lang:scala3-library_sjs1](https://github.com/lampepfl/dotty)
from `3.2.2` to `3.3.0`
📜 [GitHub Release Notes](https://github.com/lampepfl/dotty/releases/tag/3.3.0) - [Version Diff](https://github.com/lampe... | b20b56c5bdbc7890a629cc93cb30aacdf86b0915 | 10799f1a0f7ce2be18b9b28f4a996438a7f19e76 | diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index d6c30326..5622200d 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
include:
- - scala: 3.2.2
+ - scala: 3.3.0
sbt... | [
".github/workflows/scala.yml"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 504 | issue_to_patch | Update scalafmt-core to 3.7.4 | ## About this PR
📦 Updates [org.scalameta:scalafmt-core](https://github.com/scalameta/scalafmt) from `3.7.3` to `3.7.4`
📜 [GitHub Release Notes](https://github.com/scalameta/scalafmt/releases/tag/v3.7.4) - [Version Diff](https://github.com/scalameta/scalafmt/compare/v3.7.3...v3.7.4)
## Usage
✅ **Please merge!**
I'... | b20b56c5bdbc7890a629cc93cb30aacdf86b0915 | b2f267198e437740435af5967c59d5b24bdc5672 | diff --git a/.scalafmt.conf b/.scalafmt.conf
index 8625e5be..e9c517b7 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,3 +1,3 @@
runner.dialect = scala3
-version = "3.7.3"
+version = "3.7.4"
maxColumn = 120
| [
".scalafmt.conf"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 505 | issue_to_patch | Update scala-compiler, scala-library, ... to 2.13.11 | ## About this PR
📦 Updates
* [org.scala-lang:scala-compiler](https://github.com/scala/scala)
* [org.scala-lang:scala-library](https://github.com/scala/scala)
* [org.scala-lang:scala-reflect](https://github.com/scala/scala)
from `2.13.10` to `2.13.11`
📜 [GitHub Release Notes](https://github.com/scala/scala/release... | b20b56c5bdbc7890a629cc93cb30aacdf86b0915 | 7d412452590a30094c4065f097a12f954ebb535f | diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index d6c30326..b03266b0 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -18,7 +18,7 @@ jobs:
include:
- scala: 3.2.2
sbt-args: -J-XX:MaxRAMPercentage=90.0
- - scala: 2.13.10
+ ... | [
".github/workflows/scala.yml"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 507 | issue_to_patch | Update template | 14d1b0e4904fa04db7549106a60d9a9f7ae1a381 | 253912a420d99e519ac799340ff2fd74a5e24b63 | diff --git a/project/sbt-best-practice.sbt b/project/sbt-best-practice.sbt
new file mode 100644
index 00000000..4813c873
--- /dev/null
+++ b/project/sbt-best-practice.sbt
@@ -0,0 +1,5 @@
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")... | [
"project/sbt-best-practice.sbt",
"secret.sbt"
] | [] | true | |||
ThoughtWorksInc/Binding.scala | 506 | issue_to_patch | Update sbt-scalajs, scalajs-compiler, ... to 1.13.2 | ## About this PR
📦 Updates
* [org.scala-js:sbt-scalajs](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-compiler](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-library](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-library_2.13](https://github.com/scala-js/scala-js)
* [or... | b20b56c5bdbc7890a629cc93cb30aacdf86b0915 | e8a357246dbe1ae0e2b87c6e6299b58535bcc300 | diff --git a/project/plugins.sbt b/project/plugins.sbt
index 77038a48..2904f03c 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,6 @@
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
+addSbtPlugin("org.scala-js" % ... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 496 | issue_to_patch | Update sbt-scalajs-crossproject to 1.3.1 | ## About this PR
📦 Updates [org.portable-scala:sbt-scalajs-crossproject](https://github.com/portable-scala/sbt-crossproject) from `1.2.0` to `1.3.1`
📜 [GitHub Release Notes](https://github.com/portable-scala/sbt-crossproject/releases/tag/v1.3.1) - [Version Diff](https://github.com/portable-scala/sbt-crossproject/com... | 21c86d8a245e12d7a3fe3bae69012acc039457b0 | 26401f75b193f1b41427550a8560211d53ed2ef8 | diff --git a/project/plugins.sbt b/project/plugins.sbt
index e0ab3907..0907344d 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
addSbtPlugin... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 495 | issue_to_patch | Update sbt-scalajs, scalajs-compiler, ... to 1.13.1 | ## About this PR
📦 Updates
* [org.scala-js:sbt-scalajs](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-compiler](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-library](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-library_2.13](https://github.com/scala-js/scala-js)
* [or... | 21c86d8a245e12d7a3fe3bae69012acc039457b0 | 38bd05ab0174c1ed8b5cdfdd3b66f2b96332b691 | diff --git a/project/plugins.sbt b/project/plugins.sbt
index e0ab3907..8a9ea236 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,6 @@
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0")
+addSbtPlugin("org.scala-js" % ... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 493 | issue_to_patch | Update scalafmt-core to 3.7.3 | ## About this PR
📦 Updates [org.scalameta:scalafmt-core](https://github.com/scalameta/scalafmt) from `3.7.1` to `3.7.3`
📜 [GitHub Release Notes](https://github.com/scalameta/scalafmt/releases/tag/v3.7.3) - [Version Diff](https://github.com/scalameta/scalafmt/compare/v3.7.1...v3.7.3)
## Usage
✅ **Please merge!**
I'... | 21c86d8a245e12d7a3fe3bae69012acc039457b0 | 2b66572ee6e83bb3420fc18038287dcbf8cdd347 | diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 608162dd..66a7aaaa 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -3,3 +3,6 @@ fb6cfb8aea15a1b339e3ed69e1e96acd7df4cae6
# Scala Steward: Reformat with scalafmt 3.7.0
9348974a79cbfbc260d1840a589b7c842dd56a7b
+
+# Scala Steward: R... | [
".git-blame-ignore-revs",
".scalafmt.conf",
"Binding/shared/build.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 491 | issue_to_patch | Update sbt-sonatype to 3.9.18 | Updates [org.xerial.sbt:sbt-sonatype](https://github.com/xerial/sbt-sonatype) from 3.9.17 to 3.9.18.
[GitHub Release Notes](https://github.com/xerial/sbt-sonatype/releases/tag/v3.9.18) - [Release Notes](https://github.com/xerial/sbt-sonatype/blob/master/ReleaseNotes.md) - [Version Diff](https://github.com/xerial/sbt-so... | 21c86d8a245e12d7a3fe3bae69012acc039457b0 | 18f68e7d3060ec33ab878d9de77352ea6f9584bb | diff --git a/project/plugins.sbt b/project/plugins.sbt
index e0ab3907..be97abba 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -8,7 +8,7 @@ addSbtPlugin(
"com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.5"
)
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.17")
+addSbtPlugin(... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 488 | issue_to_patch | Update sbt-best-practice to 8.3.0 | Updates [com.thoughtworks.sbt-best-practice:sbt-best-practice](https://github.com/ThoughtWorksInc/sbt-best-practice) from 8.2.5 to 8.3.0.
[GitHub Release Notes](https://github.com/ThoughtWorksInc/sbt-best-practice/releases/tag/v8.3.0) - [Version Diff](https://github.com/ThoughtWorksInc/sbt-best-practice/compare/v8.2.5.... | 30636c3dabefca340626ac9aec023c8c2556d3b0 | 1a02d80bfec06a0f6f085c3a81fcae701ca7582d | diff --git a/project/plugins.sbt b/project/plugins.sbt
index e0ab3907..c305b199 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -5,7 +5,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0")
addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.1.1")
addSbtPlugin(
- "com.th... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 487 | issue_to_patch | Update scala3-library, ... to 3.2.2 | Updates
* [org.scala-lang:scala3-library](https://github.com/lampepfl/dotty)
* [org.scala-lang:scala3-library_sjs1](https://github.com/lampepfl/dotty)
from 3.2.1 to 3.2.2.
[GitHub Release Notes](https://github.com/lampepfl/dotty/releases/tag/3.2.2) - [Version Diff](https://github.com/lampepfl/dotty/compare/3.2.1...3... | 30636c3dabefca340626ac9aec023c8c2556d3b0 | f007945d443a030935403cb975ff7c4b4064145b | diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index d429917c..d6c30326 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
include:
- - scala: 3.2.1
+ - scala: 3.2.2
sbt... | [
".github/workflows/scala.yml"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 485 | issue_to_patch | Update sbt-sonatype to 3.9.17 | Updates [org.xerial.sbt:sbt-sonatype](https://github.com/xerial/sbt-sonatype) from 3.9.16 to 3.9.17.
[GitHub Release Notes](https://github.com/xerial/sbt-sonatype/releases/tag/v3.9.17) - [Release Notes](https://github.com/xerial/sbt-sonatype/blob/master/ReleaseNotes.md) - [Version Diff](https://github.com/xerial/sbt-so... | fc2106d2cf63502d798d4911b5a1f3aa3248771a | a89c3bf6d8e217d663fdb6bcc586efc0f860414f | diff --git a/project/plugins.sbt b/project/plugins.sbt
index 6eb2c7a3..e0ab3907 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -8,7 +8,7 @@ addSbtPlugin(
"com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.5"
)
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.16")
+addSbtPlugin(... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 484 | issue_to_patch | Update sbt-scalajs, scalajs-compiler, ... to 1.13.0 in 12.x | Updates
* [org.scala-js:sbt-scalajs](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-compiler](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-library](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-library_2.13](https://github.com/scala-js/scala-js)
* [org.scala-js:scalajs-t... | 3aa50bc01d890bd3ad198bda1038219a792a8490 | 81e41e758ff13db761ec45febf801ac553473d86 | diff --git a/project/plugins.sbt b/project/plugins.sbt
index 5db6eb63..6eb2c7a3 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,6 @@
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0")
+addSbtPlugin("org.scala-js" % ... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 483 | issue_to_patch | Update template | b2112bc6adbde2f2bd590434ba33e61d7ec9e2dd | 02d191ad841e5269d11e1e97f604f3d0a89b350e | diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index f86db14b..608162dd 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,2 +1,5 @@
+# Scala Steward: Reformat with scalafmt 3.1.2
+fb6cfb8aea15a1b339e3ed69e1e96acd7df4cae6
+
# Scala Steward: Reformat with scalafmt 3.7.0
9348974a79cbfb... | [
".git-blame-ignore-revs",
".github/workflows/scala-steward.yml",
".github/workflows/scala.yml",
"project/plugins.sbt",
"secret.sbt"
] | [] | true | |||
ThoughtWorksInc/Binding.scala | 482 | issue_to_patch | Update Dsl.scala to 2.0.0 | 7d5a1204d8ee2c3e116badd80dbf33e76eb21978 | 523863c7e867ed15583719d5cced9a03ed69dfc1 | diff --git a/Binding/shared/build.sbt b/Binding/shared/build.sbt
index 45fabbd8..070ca6c8 100644
--- a/Binding/shared/build.sbt
+++ b/Binding/shared/build.sbt
@@ -30,7 +30,7 @@ libraryDependencies ++= {
libraryDependencies ++= {
if (scalaBinaryVersion.value == "3") {
- Some("com.thoughtworks.dsl" %%% "macros-r... | [
"Binding/shared/build.sbt"
] | [] | true | |||
ThoughtWorksInc/Binding.scala | 481 | issue_to_patch | Update scalafmt-core to 3.7.1 | Updates [org.scalameta:scalafmt-core](https://github.com/scalameta/scalafmt) from 3.7.0 to 3.7.1.
[GitHub Release Notes](https://github.com/scalameta/scalafmt/releases/tag/v3.7.1) - [Version Diff](https://github.com/scalameta/scalafmt/compare/v3.7.0...v3.7.1)
I'll automatically update this PR to resolve conflicts as ... | c25b3725e3694b349d8c9cd7f5cb88c44ac1fbe3 | 2f12d4175ff5d1ae6496716dd4eff6cafae0e5d1 | diff --git a/.scalafmt.conf b/.scalafmt.conf
index 739381e3..2b2a7179 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,3 +1,3 @@
runner.dialect = scala3
-version = "3.7.0"
+version = "3.7.1"
maxColumn = 120
| [
".scalafmt.conf"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 478 | issue_to_patch | Update scalafmt-core to 3.7.0 | Updates [org.scalameta:scalafmt-core](https://github.com/scalameta/scalafmt) from 3.6.1 to 3.7.0.
[GitHub Release Notes](https://github.com/scalameta/scalafmt/releases/tag/v3.7.0) - [Version Diff](https://github.com/scalameta/scalafmt/compare/v3.6.1...v3.7.0)
I'll automatically update this PR to resolve conflicts as ... | 53fd3428240f9eb1a237ff7f5d373308bc801503 | 8cb7a49ad2c1cc068e0a4fa33bff3b21a95030c7 | diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 00000000..f86db14b
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.7.0
+9348974a79cbfbc260d1840a589b7c842dd56a7b
diff --git a/.scalafmt.conf b/.scalafmt.conf
index d6ee065b..7393... | [
".git-blame-ignore-revs",
".scalafmt.conf",
"Binding/shared/src/main/scala/com/thoughtworks/binding/Binding.scala"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 479 | issue_to_patch | Typo and update that github support the `sbt` code snippet. | Typo:
The sbt config is not tag to scala snippet. | 53fd3428240f9eb1a237ff7f5d373308bc801503 | a3a2d01ff771ef5a1076c32fd82252fdd4f43a18 | diff --git a/README.md b/README.md
index 13ccd674..ca2f8e82 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ See http://www.scala-js.org/tutorial/basic/ for information about how to setup s
### Step 1: Add html.scala dependencies into your `build.sbt`:
-``` scala
+``` sbt
// Enable macro annotations by se... | [
"README.md"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 470 | issue_to_patch | Update macros-reset to 2.0.0-M2+335-7cefa5ea | Updates [com.thoughtworks.dsl:macros-reset](https://github.com/ThoughtWorksInc/Dsl.scala) from 2.0.0-M2+334-530935fc to 2.0.0-M2+335-7cefa5ea.
I'll automatically update this PR to resolve conflicts as long as you don't change it yourself.
If you'd like to skip this version, you can just close this PR. If you have an... | f15746dd9525aa750b717e222e444aa9dcb9bc41 | 68759af069676063d401fec4555f438f326175ce | diff --git a/Binding/shared/build.sbt b/Binding/shared/build.sbt
index 7ca00014..45fabbd8 100644
--- a/Binding/shared/build.sbt
+++ b/Binding/shared/build.sbt
@@ -30,7 +30,7 @@ libraryDependencies ++= {
libraryDependencies ++= {
if (scalaBinaryVersion.value == "3") {
- Some("com.thoughtworks.dsl" %%% "macros-r... | [
"Binding/shared/build.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 471 | issue_to_patch | Update sbt-example to 9.2.1 | Updates [com.thoughtworks.example:sbt-example](https://github.com/ThoughtWorksInc/sbt-example) from 9.2.0 to 9.2.1.
[GitHub Release Notes](https://github.com/ThoughtWorksInc/sbt-example/releases/tag/v9.2.1) - [Version Diff](https://github.com/ThoughtWorksInc/sbt-example/compare/v9.2.0...v9.2.1)
I'll automatically upd... | f15746dd9525aa750b717e222e444aa9dcb9bc41 | a15c85747e679cbafa5fd00337ef75fdd7b25c22 | diff --git a/project/plugins.sbt b/project/plugins.sbt
index b7441c90..9666fe01 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -14,4 +14,4 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2")
-addSbtPlugin("com.thoughtworks.exampl... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 472 | issue_to_patch | Update sbt-best-practice to 8.2.4 | Updates [com.thoughtworks.sbt-best-practice:sbt-best-practice](https://github.com/ThoughtWorksInc/sbt-best-practice) from 8.2.2 to 8.2.4.
[GitHub Release Notes](https://github.com/ThoughtWorksInc/sbt-best-practice/releases/tag/v8.2.4) - [Version Diff](https://github.com/ThoughtWorksInc/sbt-best-practice/compare/v8.2.2.... | f15746dd9525aa750b717e222e444aa9dcb9bc41 | 5181710a484b7ed0ef3d403f505f67948d1b1f59 | diff --git a/project/plugins.sbt b/project/plugins.sbt
index b7441c90..ca3fb13a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -4,7 +4,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0")
addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.1.1")
-addSbtPlugin("com.thou... | [
"project/plugins.sbt"
] | [] | true | ||
ThoughtWorksInc/Binding.scala | 474 | issue_to_patch | Add back BindingInstances for backward compatibility purpose | f15746dd9525aa750b717e222e444aa9dcb9bc41 | d6453106bac0f3e4a465c21b3b91b8f3e7c0f5c4 | diff --git a/Binding/shared/src/main/scala-2/com/thoughtworks/binding/Binding2Or3.scala b/Binding/shared/src/main/scala-2/com/thoughtworks/binding/Binding2Or3.scala
index d5738880..b50e5322 100644
--- a/Binding/shared/src/main/scala-2/com/thoughtworks/binding/Binding2Or3.scala
+++ b/Binding/shared/src/main/scala-2/com/... | [
"Binding/shared/src/main/scala-2/com/thoughtworks/binding/Binding2Or3.scala",
"Binding/shared/src/main/scala-3/com/thoughtworks/binding/Binding2Or3.scala",
"Binding/shared/src/main/scala/com/thoughtworks/binding/Binding.scala"
] | [] | true | |||
ThoughtWorksInc/Binding.scala | 469 | issue_to_patch | Update Scala version | 71da8513a0c273e54630373bf9a82f467547915c | ad3ccdac280ed265744e8b1ca98dacd0c7faa67c | diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index b10c679c..01d6c820 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -11,14 +11,12 @@ jobs:
strategy:
fail-fast: false
matrix:
- scala:
- - 2.13.4
- - 3.2.1
- sbt-a... | [
".github/workflows/scala.yml"
] | [] | true | |||
ThreeMammals/Ocelot | 2,402 | issue_to_patch | Ref SDK 10.0.301 (Runtime 10.0.9) to release `Ocelot` v25 beta 4 and `Ocelot.Testing` v25 beta 10+ | A new [Ocelot.Testing](https://www.nuget.org/packages/Ocelot.Testing) v25 (beta 10) package release is required together with the new Ocelot v25 (beta 4).
## Proposed Changes
- Upgraded to SDK 10.0.301 aka Runtime 10.0.9 released June 9, 2026❗
## Predecessors
- Beta 3 👉 #2389 👉 https://github.com/ThreeMammals... | 6353f8ba3c0802119bb804a356a272e1c0827bd1 | 026c625cef31268ac1924e347a50d09666505fb7 | diff --git a/samples/Basic/packages.lock.json b/samples/Basic/packages.lock.json
index 6e4d2419e..de0a043b3 100644
--- a/samples/Basic/packages.lock.json
+++ b/samples/Basic/packages.lock.json
@@ -14,23 +14,23 @@
},
"Microsoft.AspNetCore.JsonPatch": {
"type": "Transitive",
- "resolved": "1... | [
"samples/Basic/packages.lock.json",
"samples/Configuration/packages.lock.json",
"samples/Eureka/DownstreamService/Ocelot.Samples.Eureka.DownstreamService.csproj",
"samples/Eureka/DownstreamService/packages.lock.json",
"samples/GraphQL/packages.lock.json",
"samples/Kubernetes/ApiGateway/packages.lock.json"... | [] | diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
index 5bdffb2dd..b4baf409f 100644
--- a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
+++ b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
@@ -41,32 +41,32 @@
<Ite... | true | |
ThreeMammals/Ocelot | 2,399 | issue_to_patch | Harden the `Kube` provider, repository `FileConfigurationPoller`, and infrastructure `InMemoryBus`, and stabilize their tests |
## Proposed Changes
- Fixed exception logging issues in the CI build
- Updated workflows with removal of the exit code workaround. Now testing process returns 0 exit code (success)
- Wrote unit tests for the `Kube` provider
## Predecessors
- #2394
- commit https://github.com/ThreeMammals/Ocelot/commi... | 0bd72fd3f326b434d27eb17aac70d5a25e84d7c1 | add053e32ef1afe9d69ec8be3c1ca86bcf6f8c8b | diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index 08f361b2a..946d06bf7 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -52,24 +52,7 @@ jobs:
- name: Build
run: dotnet build --no-restore ./Ocelot.slnx --framework ${{ matrix.framework }}.0 ... | [
".github/workflows/develop.yml",
".github/workflows/pr.yml",
"src/Ocelot.Provider.Kubernetes/Kube.cs",
"src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs",
"src/Ocelot/Infrastructure/InMemoryBus.cs",
"test/Ocelot.UnitTests/Configuration/Repository/FileConfigurationPollerTests.cs",
"test/Oce... | [
{
"comment": "`new Thread(async () => await Process())` creates an `async void` entrypoint for the dedicated thread. Any exception thrown inside `Process()` can become an unhandled exception (process-terminating) and cannot be observed/joined. Prefer a synchronous thread entry that blocks on the task (e.g., `Pr... | diff --git a/test/Ocelot.UnitTests/Configuration/Repository/FileConfigurationPollerTests.cs b/test/Ocelot.UnitTests/Configuration/Repository/FileConfigurationPollerTests.cs
index 7efb384f4..bdcd3d91d 100644
--- a/test/Ocelot.UnitTests/Configuration/Repository/FileConfigurationPollerTests.cs
+++ b/test/Ocelot.UnitTests/... | true | |
ThreeMammals/Ocelot | 2,399 | comment_to_fix | Harden the `Kube` provider, repository `FileConfigurationPoller`, and infrastructure `InMemoryBus`, and stabilize their tests | `new Thread(async () => await Process())` creates an `async void` entrypoint for the dedicated thread. Any exception thrown inside `Process()` can become an unhandled exception (process-terminating) and cannot be observed/joined. Prefer a synchronous thread entry that blocks on the task (e.g., `Process().GetAwaiter().G... | 0bd72fd3f326b434d27eb17aac70d5a25e84d7c1 | add053e32ef1afe9d69ec8be3c1ca86bcf6f8c8b | diff --git a/src/Ocelot/Infrastructure/InMemoryBus.cs b/src/Ocelot/Infrastructure/InMemoryBus.cs
index 3f6eef510..836dfb407 100644
--- a/src/Ocelot/Infrastructure/InMemoryBus.cs
+++ b/src/Ocelot/Infrastructure/InMemoryBus.cs
@@ -10,7 +10,10 @@ public InMemoryBus()
{
_queue = new BlockingCollection<Delayed... | [
"src/Ocelot/Infrastructure/InMemoryBus.cs"
] | [
{
"comment": "`new Thread(async () => await Process())` creates an `async void` entrypoint for the dedicated thread. Any exception thrown inside `Process()` can become an unhandled exception (process-terminating) and cannot be observed/joined. Prefer a synchronous thread entry that blocks on the task (e.g., `Pr... | true | ||
ThreeMammals/Ocelot | 2,399 | comment_to_fix | Harden the `Kube` provider, repository `FileConfigurationPoller`, and infrastructure `InMemoryBus`, and stabilize their tests | Disposing a `System.Threading.Timer` does not guarantee any in-flight callback has completed, and the comment about “release the background thread” is misleading (callbacks run on the ThreadPool). Also, if the poller retains a reference to the disposed timer (e.g., a field), later operations may hit `ObjectDisposedExce... | 0bd72fd3f326b434d27eb17aac70d5a25e84d7c1 | add053e32ef1afe9d69ec8be3c1ca86bcf6f8c8b | diff --git a/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs b/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs
index 2f37165b9..db97e9778 100644
--- a/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs
+++ b/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs
@@ -65,... | [
"src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs"
] | [
{
"comment": "Disposing a `System.Threading.Timer` does not guarantee any in-flight callback has completed, and the comment about “release the background thread” is misleading (callbacks run on the ThreadPool). Also, if the poller retains a reference to the disposed timer (e.g., a field), later operations may h... | true | ||
ThreeMammals/Ocelot | 2,399 | comment_to_fix | Harden the `Kube` provider, repository `FileConfigurationPoller`, and infrastructure `InMemoryBus`, and stabilize their tests | The test name suggests it is validating `BuildServices`, but the body calls `provider.GetAsync()` and asserts `BuildServices` is not called. Renaming the test to reflect the public behavior under test (e.g., `GetAsync_Should_return_empty_when_disposed`) would reduce confusion and make failures easier to interpret. | 0bd72fd3f326b434d27eb17aac70d5a25e84d7c1 | add053e32ef1afe9d69ec8be3c1ca86bcf6f8c8b | diff --git a/test/Ocelot.UnitTests/Kubernetes/KubeTests.cs b/test/Ocelot.UnitTests/Kubernetes/KubeTests.cs
new file mode 100644
index 000000000..03c8cef4e
--- /dev/null
+++ b/test/Ocelot.UnitTests/Kubernetes/KubeTests.cs
@@ -0,0 +1,273 @@
+using KubeClient;
+using KubeClient.Models;
+using Ocelot.Logging;
+using Ocelot... | [
"test/Ocelot.UnitTests/Kubernetes/KubeTests.cs"
] | [
{
"comment": "The test name suggests it is validating `BuildServices`, but the body calls `provider.GetAsync()` and asserts `BuildServices` is not called. Renaming the test to reflect the public behavior under test (e.g., `GetAsync_Should_return_empty_when_disposed`) would reduce confusion and make failures eas... | true | ||
ThreeMammals/Ocelot | 1,154 | issue_to_patch | Specify Scheme of ServiceProviderConfiguration
## New Feature
Add ability to specify Scheme of ServiceProviderConfiguration, for use in the ConsulClientFactory.
## Actual Behavior / Motivation for New Feature
In the ConsulClientFactory class, the scheme of the Consul server address is hard-coded to "http". In our... | Add ability to specify scheme of ServiceProviderConfiguration | Add ability to specify scheme of `ServiceProviderConfiguration`, for use in the `ConsulClientFactory`
Recreation of #960 after request from @TomPallister.
## Closes #959
- #959
In the `ConsulClientFactory` class, the scheme of the Consul server address is hard-coded to `http`. In our environment, Consul is ... | 347ea7280cfd8939bd7e4eb828aa669dd8f2db2b | 20fd3e01ba5eb166992df52caadf6049c9280b64 | diff --git a/src/Ocelot.Provider.Consul/ConsulClientFactory.cs b/src/Ocelot.Provider.Consul/ConsulClientFactory.cs
index f3f0e54f6..94055df79 100644
--- a/src/Ocelot.Provider.Consul/ConsulClientFactory.cs
+++ b/src/Ocelot.Provider.Consul/ConsulClientFactory.cs
@@ -9,7 +9,7 @@ public IConsulClient Get(ConsulRegistryConf... | [
"src/Ocelot.Provider.Consul/ConsulClientFactory.cs",
"src/Ocelot.Provider.Consul/ConsulFileConfigurationRepository.cs",
"src/Ocelot.Provider.Consul/ConsulProviderFactory.cs",
"src/Ocelot.Provider.Consul/ConsulRegistryConfiguration.cs",
"src/Ocelot/Configuration/Builder/ServiceProviderConfigurationBuilder.cs... | [] | diff --git a/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs b/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
index c08d5eb5a..74359480f 100644
--- a/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
+++ b/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
@@ -24,6 +24,7 @@ public void should_throw_... | true |
ThreeMammals/Ocelot | 197 | issue_to_patch | ReRoutes bug?
http://localhost:8362/api/user/info?id=1 is ok
http://localhost:3164/api/user/info?id=1 is ok
http://localhost:8330/api/product/info?id=1 is ok
http://localhost:3164/api/product/info?id=1 is 404
is my configuration.json
{
"ReRoutes": [
//{
// "DownstreamPathTemplate": "/{product}",
... | passing test for issue | ## Closes #194
- #194 | 852f11c423cf0373aad0330df1e1fe500efdac60 | 381b73503da8186c43a681917939239b49bcaf14 | [
"test/Ocelot.AcceptanceTests/TwoDownstreamServicesTests.cs"
] | [] | diff --git a/test/Ocelot.AcceptanceTests/TwoDownstreamServicesTests.cs b/test/Ocelot.AcceptanceTests/TwoDownstreamServicesTests.cs
new file mode 100644
index 000000000..e1efa9546
--- /dev/null
+++ b/test/Ocelot.AcceptanceTests/TwoDownstreamServicesTests.cs
@@ -0,0 +1,230 @@
+using System;
+using System.Collections.Gene... | true | |
ThreeMammals/Ocelot | 196 | issue_to_patch | ReRoutes bug?
http://localhost:8362/api/user/info?id=1 is ok
http://localhost:3164/api/user/info?id=1 is ok
http://localhost:8330/api/product/info?id=1 is ok
http://localhost:3164/api/product/info?id=1 is 404
is my configuration.json
{
"ReRoutes": [
//{
// "DownstreamPathTemplate": "/{product}",
... | Feature/fix #194 | ## Fixes #194
- #194
| b909b34591b966183081abe2de036011a2e15cfa | c638edef63a1444215f7c6083ba737ae7919ac51 | diff --git a/src/Ocelot/Configuration/Validator/ReRouteFluentValidator.cs b/src/Ocelot/Configuration/Validator/ReRouteFluentValidator.cs
index b386890fc..e8088dab1 100644
--- a/src/Ocelot/Configuration/Validator/ReRouteFluentValidator.cs
+++ b/src/Ocelot/Configuration/Validator/ReRouteFluentValidator.cs
@@ -19,6 +19,14... | [
"src/Ocelot/Configuration/Validator/ReRouteFluentValidator.cs",
"test/Ocelot.UnitTests/Configuration/ConfigurationFluentValidationTests.cs"
] | [] | diff --git a/test/Ocelot.UnitTests/Configuration/ConfigurationFluentValidationTests.cs b/test/Ocelot.UnitTests/Configuration/ConfigurationFluentValidationTests.cs
index 90475a276..ea476ca8a 100644
--- a/test/Ocelot.UnitTests/Configuration/ConfigurationFluentValidationTests.cs
+++ b/test/Ocelot.UnitTests/Configuration/C... | true |
ThreeMammals/Ocelot | 195 | issue_to_patch | ocelot + consul load balancing recovery service api problem
I use ocelot + consul service discovery, when the same service api configuration two consul server node, the load balancing can work normally, when a service exits, ocelot can no longer request the correct exit service api, but when this service is back to no... | Fixing if service dropped out then `LeastConnection` would not pick it up again | ## Fixes #181
- #181
| 6a20baeb971ed7cdfefad55da669dffd359571b5 | 365cdc05b31f204860bf14ba1ef0789df31b1bdf | diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs b/src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs
index 0e136b4a8..0afec16b8 100644
--- a/src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs
+++ b/src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs
@@ -123,7 +123,7 @@ private Res... | [
"src/Ocelot/LoadBalancer/LoadBalancers/LeastConnection.cs",
"test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs",
"test/Ocelot.UnitTests/LoadBalancer/LeastConnectionTests.cs"
] | [] | diff --git a/test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs b/test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs
index 2c7b6b568..d6e9d862e 100644
--- a/test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs
+++ b/test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs
@@ -32,6 +32,74 @@ public ServiceDiscoveryTests... | true |
ThreeMammals/Ocelot | 307 | issue_to_patch | Support Consul ACL token
consul server is enbled acl.
how did set consulclient configuration token field? | Consul ACL tokens | ## Closes #295
- #295
## New Feature
Added support for consul ACL token.
## Proposed Changes
- Can add token to service provider config in configuration.json
- This is passed to consul when making requests
- Also updated a bunch of NuGet packages
| d7ef956935634ce54d1e14a6e6ece7bd1ca6beca | 741145d8e4c3265463cbd135de3e0d079093fd8d | diff --git a/docs/features/servicediscovery.rst b/docs/features/servicediscovery.rst
index f8cadd2e8..3add60f18 100644
--- a/docs/features/servicediscovery.rst
+++ b/docs/features/servicediscovery.rst
@@ -38,3 +38,18 @@ and LeastConnection algorithm you can use. If no load balancer is specified Ocel
}
When th... | [
"docs/features/servicediscovery.rst",
"src/Ocelot/Configuration/Builder/ServiceProviderConfigurationBuilder.cs",
"src/Ocelot/Configuration/Creator/ServiceProviderConfigurationCreator.cs",
"src/Ocelot/Configuration/File/FileServiceDiscoveryProvider.cs",
"src/Ocelot/Configuration/Repository/ConsulFileConfigur... | [] | diff --git a/test/Ocelot.AcceptanceTests/ButterflyTracingTests.cs b/test/Ocelot.AcceptanceTests/ButterflyTracingTests.cs
index d634e6178..10cb79291 100644
--- a/test/Ocelot.AcceptanceTests/ButterflyTracingTests.cs
+++ b/test/Ocelot.AcceptanceTests/ButterflyTracingTests.cs
@@ -104,7 +104,7 @@ public void should_forward_... | true |
ThreeMammals/Ocelot | 28 | issue_to_patch | Ocelot Added service discovery
I need to add a combination of Consul (https://www.consul.io/)to Ocelot service discovery functions, Ocelot via the specific services that are currently available from Consul services and then call the service, I'm trying to implement this functionality, mainly DownstreamTemplate is dyn... | Feature/servicediscovery | ## Closes #17
- #17
Still need to get the consul acceptance test passing but creating pull request so i can tag fixes #17 | 84f01433b5ed2bc5f71753f5a90236d43cdeca40 | 86a197e22db7bb3c47cdc2a7432924a2e98bf7d2 | diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 000000000..a038c8775
Binary files /dev/null and b/.DS_Store differ
diff --git a/Ocelot.sln b/Ocelot.sln
index 2f8fd206e..6c0006b0a 100644
--- a/Ocelot.sln
+++ b/Ocelot.sln
@@ -9,19 +9,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items"... | [
".DS_Store",
"Ocelot.sln",
"README.md",
"appveyor.yml",
"build.cake",
"build.sh",
"configuration-explanation.txt",
"src/Ocelot/Configuration/Builder/ReRouteBuilder.cs",
"src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs",
"src/Ocelot/Configuration/Creator/IOcelotConfigurationCreat... | [] | diff --git a/test/.DS_Store b/test/.DS_Store
new file mode 100644
index 000000000..e73160dc2
Binary files /dev/null and b/test/.DS_Store differ
diff --git a/test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs b/test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs
new file mode 100644
index 000000000..ef7e0dd7f
--- /de... | true |
ThreeMammals/Ocelot | 1,025 | issue_to_patch | Ocelot is not working with .NET Core 3
## Expected Behavior
the following method extension
```
public static IOcelotBuilder AddOcelot(this IServiceCollection services);
public static IOcelotBuilder AddOcelot(this IServiceCollection services, IConfiguration configuration);
```
add the Ocelot Gateway to the As... | update .net core 3.0 RTM | ## Fixes #1001
- #1001
Fix https://github.com/ThreeMammals/Ocelot/issues/1001 and update .net core 3.0 RTM
| c8a2144a4bcc11d3bc0b90510117a2bb3ea5654f | 0cfdb61dbb45c58f77adf7471192d760c05be294 | diff --git a/.travis.yml b/.travis.yml
index bd3ea077f..813fa5714 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,12 @@ sudo: required
dist: bionic
# OS X 10.12
-osx_image: xcode9.2
+osx_image: xcode9.4
mono:
- - 5.10.0
+ - 6.0.0
-dotnet: 2.2.105
+dotnet: 3.0.100
before_install:
- git fetch --un... | [
".travis.yml",
"appveyor.yml",
"build.cake",
"src/Ocelot.Administration/Ocelot.Administration.csproj",
"src/Ocelot.Administration/OcelotBuilderExtensions.cs",
"src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj",
"src/Ocelot.Provider.Consul/ConsulFileConfigurationRepository.cs",
"src/Ocelo... | [
{
"comment": "The value of osx_image should update to `xcode9.4` or above.",
"path": ".travis.yml",
"hunk": "@@ -11,9 +11,9 @@ dist: bionic\n osx_image: xcode9.2",
"resolving_sha": "0cfdb61dbb45c58f77adf7471192d760c05be294",
"resolving_diff": "diff --git a/.travis.yml b/.travis.yml\nindex bd3ea0... | diff --git a/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs b/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs
index ae7d6b0ac..e72aab335 100644
--- a/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs
+++ b/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs
@@ -5,6 +5,7 @@ namespace O... | true |
ThreeMammals/Ocelot | 538 | issue_to_patch | Break dependencies out into their own packages
## New Feature
[x] Butterfly
[x] CacheManager
[x] Consul
[x] Pivotal.Discovery.ClientCore
[x] IdentityServer
[x] Polly
[x] Rafty (this will need updating again after IdentityServer as it depends on identity server)
[x] ServiceFabric (if i bring in libs, not sur... | #529 Removed Consul deps and introduced delegate to find service discovery provider | ## Closes #529
- #529
| afe322693e041dfa009fbdb27427afe15e07e6f5 | 1d29bbcb892ee119db061950c61a45325e310e72 | diff --git a/src/Ocelot/Configuration/Repository/ConsulFileConfigurationRepository.cs b/src/Ocelot/Configuration/Repository/ConsulFileConfigurationRepository.cs
deleted file mode 100644
index d8a352a7f..000000000
--- a/src/Ocelot/Configuration/Repository/ConsulFileConfigurationRepository.cs
+++ /dev/null
@@ -1,97 +0,0 ... | [
"src/Ocelot/Configuration/Repository/ConsulFileConfigurationRepository.cs",
"src/Ocelot/DependencyInjection/IOcelotBuilder.cs",
"src/Ocelot/DependencyInjection/OcelotBuilder.cs",
"src/Ocelot/Infrastructure/Consul/ConsulClientFactory.cs",
"src/Ocelot/Infrastructure/Consul/IConsulClientFactory.cs",
"src/Oce... | [] | diff --git a/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs b/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs
deleted file mode 100644
index e44f7496d..000000000
--- a/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-using System;
-using System.Collections.... | true |
ThreeMammals/Ocelot | 85 | issue_to_patch | added a new implementation that stores the ocelot config in consul kv… | … store, had to change some major things and add cache settings as default | ab9c8e30b210dad997b38c13ef77794016244eaf | c3cd181b90fb5d5353b886073b3b7c66c12c6bab | diff --git a/src/Ocelot/Cache/IOcelotCache.cs b/src/Ocelot/Cache/IOcelotCache.cs
index 1ceb220c0..9ac26d8f5 100644
--- a/src/Ocelot/Cache/IOcelotCache.cs
+++ b/src/Ocelot/Cache/IOcelotCache.cs
@@ -5,6 +5,7 @@ namespace Ocelot.Cache
public interface IOcelotCache<T>
{
void Add(string key, T value, Time... | [
"src/Ocelot/Cache/IOcelotCache.cs",
"src/Ocelot/Cache/OcelotCacheManagerCache.cs",
"src/Ocelot/Configuration/Creator/RateLimitOptionsCreator.cs",
"src/Ocelot/Configuration/Provider/IOcelotConfigurationProvider.cs",
"src/Ocelot/Configuration/Provider/OcelotConfigurationProvider.cs",
"src/Ocelot/Configurati... | [] | diff --git a/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs b/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs
new file mode 100644
index 000000000..b2dfdc805
--- /dev/null
+++ b/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs
@@ -0,0 +1,171 @@
+using System;
+using System.Collections.Gen... | true | |
ThreeMammals/Ocelot | 153 | issue_to_patch | HttpResponse can't be deserialized when cached in Redis
This feels like a platform specific issue, I'm running Ocelot in a docker container from the `microsoft/aspnetcore:2.0` image which is a Debian implementation, but haven't tested it directly on Windows.
The issue happens when using a `CacheHandler` with Json Ser... | Implement mapping of HttpResponseMessage to CachedResponse to fix #152 | ## Closes #152
- #152
I have created a test that exposes the deserialization problem from issue #152 where HttpResponse cannot be deserialized from cache.
I used the `InMemoryJsonHandle` from the pull request https://github.com/TomPallister/Ocelot/pull/151 in order to do this.
I opened the pull request on de... | 6289992faab8a4138e0beb0876da9b73c0987f08 | f2fafa04dd3ede09ea0c54d5633d9c6070e50c72 | diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..beb5aacf4
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = crlf
+insert_final_newline = true
+
+[*.cs]
+indent_style = space
+indent_size = 4
diff --git a/src/Ocelot/Cache/CachedResponse.cs b/src/Ocelot/... | [
".editorconfig",
"src/Ocelot/Cache/CachedResponse.cs",
"src/Ocelot/Cache/Middleware/OutputCacheMiddleware.cs",
"src/Ocelot/Configuration/ReRoute.cs",
"src/Ocelot/Controllers/OutputCacheController.cs",
"src/Ocelot/DependencyInjection/OcelotBuilder.cs",
"test/Ocelot.AcceptanceTests/Caching/InMemoryJsonHan... | [
{
"comment": "Can we have private setters here please, the project only has public setters for the file configuration stuff because microsofts framework for config cant support private setters. ",
"path": "src/Ocelot/Cache/CachedResponse.cs",
"hunk": "@@ -0,0 +1,21 @@\n+using System.Collections.Generic... | diff --git a/test/Ocelot.AcceptanceTests/Caching/InMemoryJsonHandle.cs b/test/Ocelot.AcceptanceTests/Caching/InMemoryJsonHandle.cs
new file mode 100644
index 000000000..4ab61427c
--- /dev/null
+++ b/test/Ocelot.AcceptanceTests/Caching/InMemoryJsonHandle.cs
@@ -0,0 +1,137 @@
+using CacheManager.Core;
+using CacheManage... | true |
ThreeMammals/Ocelot | 2,394 | issue_to_patch | Harden `FileConfigurationPoller` against timer reentrancy and callback thread leaks, and stabilize `TimeoutDelegatingHandler` timeout test | ## Proposed Changes
- `FileConfigurationPollerTests` → [Should_return_early_on_timer_tick_when_polling_is_already_in_progress](https://github.com/search?q=repo%3AThreeMammals%2FOcelot%20Should_return_early_on_timer_tick_when_polling_is_already_in_progress%20&type=code) flaky test
- `TimeoutDelegatingHandlerT... | e4022a7d80d2e05f020fc8c1fb50f5dde72256d4 | 7f47c2fb6175b9f28c9dc3e91b7cb042b6f8c651 | diff --git a/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs b/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs
index 4d56b439a..2f37165b9 100644
--- a/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs
+++ b/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs
@@ -22,... | [
"src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs",
"test/Ocelot.AcceptanceTests/packages.lock.json",
"test/Ocelot.Benchmarks/packages.lock.json",
"test/Ocelot.ManualTest/packages.lock.json",
"test/Ocelot.UnitTests/Configuration/Repository/FileConfigurationPollerTests.cs",
"test/Ocelot.UnitT... | [
{
"comment": "The timer-dispose completion wait is capped at 2 seconds and the result is ignored. If a callback is still running after this wait, `StopAsync`/`Dispose` can return while `Poll()` continues executing, potentially touching dependencies during shutdown. Consider waiting until the handle is signaled ... | diff --git a/test/Ocelot.AcceptanceTests/packages.lock.json b/test/Ocelot.AcceptanceTests/packages.lock.json
index 1fbac185e..231af2e3d 100644
--- a/test/Ocelot.AcceptanceTests/packages.lock.json
+++ b/test/Ocelot.AcceptanceTests/packages.lock.json
@@ -260,7 +260,10 @@
"Microsoft.ApplicationInsights": {
... | true | |
ThreeMammals/Ocelot | 2,394 | comment_to_fix | Harden `FileConfigurationPoller` against timer reentrancy and callback thread leaks, and stabilize `TimeoutDelegatingHandler` timeout test | The timer-dispose completion wait is capped at 2 seconds and the result is ignored. If a callback is still running after this wait, `StopAsync`/`Dispose` can return while `Poll()` continues executing, potentially touching dependencies during shutdown. Consider waiting until the handle is signaled (or at least checking ... | e4022a7d80d2e05f020fc8c1fb50f5dde72256d4 | 7f47c2fb6175b9f28c9dc3e91b7cb042b6f8c651 | diff --git a/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs b/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs
index 4d56b439a..2f37165b9 100644
--- a/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs
+++ b/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs
@@ -22,... | [
"src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs"
] | [
{
"comment": "The timer-dispose completion wait is capped at 2 seconds and the result is ignored. If a callback is still running after this wait, `StopAsync`/`Dispose` can return while `Poll()` continues executing, potentially touching dependencies during shutdown. Consider waiting until the handle is signaled ... | true | ||
ThreeMammals/Ocelot | 2,394 | comment_to_fix | Harden `FileConfigurationPoller` against timer reentrancy and callback thread leaks, and stabilize `TimeoutDelegatingHandler` timeout test | `StopAsync` now blocks synchronously (via `DisposeTimer`) and no longer observes the provided `cancellationToken`. Since `IHostedService.StopAsync` is expected to honor cancellation and avoid prolonged synchronous blocking, consider making the stop/dispose path cancellable (e.g., awaiting completion with the token) or ... | e4022a7d80d2e05f020fc8c1fb50f5dde72256d4 | 7f47c2fb6175b9f28c9dc3e91b7cb042b6f8c651 | diff --git a/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs b/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs
index 4d56b439a..2f37165b9 100644
--- a/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs
+++ b/src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs
@@ -22,... | [
"src/Ocelot/Configuration/Repository/FileConfigurationPoller.cs"
] | [
{
"comment": "`StopAsync` now blocks synchronously (via `DisposeTimer`) and no longer observes the provided `cancellationToken`. Since `IHostedService.StopAsync` is expected to honor cancellation and avoid prolonged synchronous blocking, consider making the stop/dispose path cancellable (e.g., awaiting completi... | true | ||
ThreeMammals/Ocelot | 2,394 | comment_to_fix | Harden `FileConfigurationPoller` against timer reentrancy and callback thread leaks, and stabilize `TimeoutDelegatingHandler` timeout test | The return value from `releaseFirstPoll.Wait(TimeSpan.FromSeconds(2))` is ignored. If this times out, the first poll will proceed without actually being held long enough to validate the overlapping-tick behavior, which can make the test pass without asserting the intended scenario. Consider asserting that the wait succ... | e4022a7d80d2e05f020fc8c1fb50f5dde72256d4 | 7f47c2fb6175b9f28c9dc3e91b7cb042b6f8c651 | diff --git a/test/Ocelot.UnitTests/Configuration/Repository/FileConfigurationPollerTests.cs b/test/Ocelot.UnitTests/Configuration/Repository/FileConfigurationPollerTests.cs
index 6adb83ed7..7efb384f4 100644
--- a/test/Ocelot.UnitTests/Configuration/Repository/FileConfigurationPollerTests.cs
+++ b/test/Ocelot.UnitTests/... | [
"test/Ocelot.UnitTests/Configuration/Repository/FileConfigurationPollerTests.cs"
] | [
{
"comment": "The return value from `releaseFirstPoll.Wait(TimeSpan.FromSeconds(2))` is ignored. If this times out, the first poll will proceed without actually being held long enough to validate the overlapping-tick behavior, which can make the test pass without asserting the intended scenario. Consider assert... | true | ||
ThreeMammals/Ocelot | 2,387 | issue_to_patch | Add configurable WebSocket buffer size per route
## Expected Behavior / New Feature
Each route should support an optional `WebSocketBufferSize` configuration property
that overrides the default receive/send buffer size used in `WebSocketsProxyMiddleware`.
## Actual Behavior / Motivation for New Feature
The buffer s... | #2386 Overridable WebSocket buffer size via virtual property and custom middleware injection | ## Closes #2386
- #2386
## Changes
- `DefaultWebSocketBufferSize` changed from `private const int` to `protected virtual int` property in `WebSocketsProxyMiddleware`, allowing subclasses to override the buffer size
- `WebSocketsProxyMiddleware` property added to `OcelotPipelineConfiguration` — follows the same ... | e324bba0efad29d37478658f7261f23dcae9d9ac | 4344da1cd5fed811f70156781cee79c2c842ef49 | diff --git a/Ocelot.Samples.slnx b/Ocelot.Samples.slnx
index ad15b2d94..442af2c2d 100644
--- a/Ocelot.Samples.slnx
+++ b/Ocelot.Samples.slnx
@@ -13,6 +13,7 @@
<Project Path="samples/ServiceFabric/ApiGateway/Ocelot.Samples.ServiceFabric.ApiGateway.csproj" />
<Project Path="samples/ServiceFabric/DownstreamService/O... | [
"Ocelot.Samples.slnx",
"docs/features/middlewareinjection.rst",
"docs/features/websockets.rst",
"samples/WebSocket/MyWebSocketsProxyMiddleware.cs",
"samples/WebSocket/Ocelot.Samples.WebSocket.csproj",
"samples/WebSocket/Program.cs",
"samples/WebSocket/Properties/launchSettings.json",
"samples/WebSocke... | [
{
"comment": "This works just fine, but I need to rethink this design once again in the 2nd round.\nSeems we might have other pipeline options, or we could have another version of the `Use` method that injects the type of custom middleware. The problem is how we inject the middleware. I'll explain it to you in ... | diff --git a/test/Ocelot.AcceptanceTests/ServiceDiscovery/PollKubeIntegrationTests.cs b/test/Ocelot.AcceptanceTests/ServiceDiscovery/PollKubeIntegrationTests.cs
index ed03e2d1a..2232d175d 100644
--- a/test/Ocelot.AcceptanceTests/ServiceDiscovery/PollKubeIntegrationTests.cs
+++ b/test/Ocelot.AcceptanceTests/ServiceDisco... | true |
ThreeMammals/Ocelot | 2,387 | comment_to_fix | #2386 Overridable WebSocket buffer size via virtual property and custom middleware injection | This works just fine, but I need to rethink this design once again in the 2nd round.
Seems we might have other pipeline options, or we could have another version of the `Use` method that injects the type of custom middleware. The problem is how we inject the middleware. I'll explain it to you in the next issue... | e324bba0efad29d37478658f7261f23dcae9d9ac | 4344da1cd5fed811f70156781cee79c2c842ef49 | diff --git a/src/Ocelot/Middleware/OcelotPipelineExtensions.cs b/src/Ocelot/Middleware/OcelotPipelineExtensions.cs
index 7eda7fd7e..ae14ce3b9 100644
--- a/src/Ocelot/Middleware/OcelotPipelineExtensions.cs
+++ b/src/Ocelot/Middleware/OcelotPipelineExtensions.cs
@@ -33,17 +33,9 @@ public static RequestDelegate BuildOcelo... | [
"src/Ocelot/Middleware/OcelotPipelineExtensions.cs"
] | [
{
"comment": "This works just fine, but I need to rethink this design once again in the 2nd round.\nSeems we might have other pipeline options, or we could have another version of the `Use` method that injects the type of custom middleware. The problem is how we inject the middleware. I'll explain it to you in ... | true | ||
ThreeMammals/Ocelot | 2,387 | comment_to_fix | #2386 Overridable WebSocket buffer size via virtual property and custom middleware injection | What happens if we comment out the `app.UseWebSockets()` method at line 39? 😆
Seriously, it is a question of valid app setup. Since we recommend a user and require them to enable WS functionality in the [WebSockets docs](https://ocelot.readthedocs.io/en/latest/features/websockets.html#configuration), maybe it is time... | e324bba0efad29d37478658f7261f23dcae9d9ac | 4344da1cd5fed811f70156781cee79c2c842ef49 | diff --git a/samples/WebSocket/Program.cs b/samples/WebSocket/Program.cs
new file mode 100644
index 000000000..825bed8be
--- /dev/null
+++ b/samples/WebSocket/Program.cs
@@ -0,0 +1,63 @@
+using Ocelot.DependencyInjection;
+using Ocelot.Logging;
+using Ocelot.Middleware;
+using Ocelot.Samples.WebSocket;
+using Ocelot.We... | [
"samples/WebSocket/Program.cs"
] | [
{
"comment": "What happens if we comment out the `app.UseWebSockets()` method at line 39? 😆\n\nSeriously, it is a question of valid app setup. Since we recommend a user and require them to enable WS functionality in the [WebSockets docs](https://ocelot.readthedocs.io/en/latest/features/websockets.html#configur... | true | ||
ThreeMammals/Ocelot | 2,387 | comment_to_fix | #2386 Overridable WebSocket buffer size via virtual property and custom middleware injection | And here is the real issue of flawed design.
This method acts as a factory method. We call the service provider, propagate services, create an instance of middleware, and call the middleware correctly.
Adapting the `next` argument by converting it to a `RequestDelegate` is an indicator of flawed design.
We should not c... | e324bba0efad29d37478658f7261f23dcae9d9ac | 4344da1cd5fed811f70156781cee79c2c842ef49 | diff --git a/samples/WebSocket/Program.cs b/samples/WebSocket/Program.cs
new file mode 100644
index 000000000..825bed8be
--- /dev/null
+++ b/samples/WebSocket/Program.cs
@@ -0,0 +1,63 @@
+using Ocelot.DependencyInjection;
+using Ocelot.Logging;
+using Ocelot.Middleware;
+using Ocelot.Samples.WebSocket;
+using Ocelot.We... | [
"samples/WebSocket/Program.cs"
] | [
{
"comment": "And here is the real issue of flawed design.\nThis method acts as a factory method. We call the service provider, propagate services, create an instance of middleware, and call the middleware correctly.\nAdapting the `next` argument by converting it to a `RequestDelegate` is an indicator of flawed... | true | ||
ThreeMammals/Ocelot | 2,387 | comment_to_fix | #2386 Overridable WebSocket buffer size via virtual property and custom middleware injection | duplicate force call of `UseWebSockets()` due to version after commit https://github.com/ThreeMammals/Ocelot/pull/2387/commits/977ecd6ea0f3957e7f2cea4c96c742c400f8179b | e324bba0efad29d37478658f7261f23dcae9d9ac | 4344da1cd5fed811f70156781cee79c2c842ef49 | diff --git a/testing/Steps/WebSocketsSteps.cs b/testing/Steps/WebSocketsSteps.cs
index e1b2ba1c7..7898aaecd 100644
--- a/testing/Steps/WebSocketsSteps.cs
+++ b/testing/Steps/WebSocketsSteps.cs
@@ -242,8 +242,20 @@ void ConfigureWebHost(IWebHostBuilder b) => b
WithWebSockets, null, ConfigureWebHost, null, n... | [
"testing/Steps/WebSocketsSteps.cs"
] | [
{
"comment": "duplicate force call of `UseWebSockets()` due to version after commit https://github.com/ThreeMammals/Ocelot/pull/2387/commits/977ecd6ea0f3957e7f2cea4c96c742c400f8179b",
"path": "testing/Steps/WebSocketsSteps.cs",
"hunk": "@@ -242,6 +242,18 @@ void ConfigureWebHost(IWebHostBuilder b) => b\... | true | ||
ThreeMammals/Ocelot | 2,387 | comment_to_fix | #2386 Overridable WebSocket buffer size via virtual property and custom middleware injection | This is injecting via a custom middleware factory controlling all aspects of instance creation.
Need a second test for injection via a middleware type defined in `pipelineConfig` (could be a unit test). This acceptance test can be converted to a `[Theory]`. | e324bba0efad29d37478658f7261f23dcae9d9ac | 4344da1cd5fed811f70156781cee79c2c842ef49 | diff --git a/test/Ocelot.AcceptanceTests/WebSockets/WebSocketsFactoryTests.cs b/test/Ocelot.AcceptanceTests/WebSockets/WebSocketsFactoryTests.cs
index 73fa5c41c..47c678c16 100644
--- a/test/Ocelot.AcceptanceTests/WebSockets/WebSocketsFactoryTests.cs
+++ b/test/Ocelot.AcceptanceTests/WebSockets/WebSocketsFactoryTests.cs... | [
"test/Ocelot.AcceptanceTests/WebSockets/WebSocketsFactoryTests.cs"
] | [
{
"comment": "This is injecting via a custom middleware factory controlling all aspects of instance creation.\nNeed a second test for injection via a middleware type defined in `pipelineConfig` (could be a unit test). This acceptance test can be converted to a `[Theory]`.",
"path": "test/Ocelot.AcceptanceTe... | true | ||
ThreeMammals/Ocelot | 416 | issue_to_patch | RPC docking APi gateway
Excuse me. We have a requirement that requires RPC to also connect to the APi gateway. Is there a corresponding document? | Expand other branch pipes | ## Closes #415
- #415
| 19ea93d10ee637ede45c2f91c6df55c65d0dd53e | 133c1c327e2de1f40f430bd78be9bdccb1c925e5 | diff --git a/src/Ocelot/Configuration/Builder/QoSOptionsBuilder.cs b/src/Ocelot/Configuration/Builder/QoSOptionsBuilder.cs
index 69660d83c..e1b86d1a2 100644
--- a/src/Ocelot/Configuration/Builder/QoSOptionsBuilder.cs
+++ b/src/Ocelot/Configuration/Builder/QoSOptionsBuilder.cs
@@ -6,7 +6,7 @@ public class QoSOptionsBuil... | [
"src/Ocelot/Configuration/Builder/QoSOptionsBuilder.cs",
"src/Ocelot/DependencyInjection/IOcelotBuilder.cs",
"src/Ocelot/DependencyInjection/OcelotBuilder.cs",
"src/Ocelot/Errors/Middleware/ExceptionHandlerMiddleware.cs",
"src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs",
"src/Ocelot/Middleware/Ocelot... | [
{
"comment": "Why do we need to do this? People can already edit these outside of Ocelot builder if they want to.",
"path": "src/Ocelot/DependencyInjection/OcelotBuilder.cs",
"hunk": "@@ -55,6 +55,10 @@ public class OcelotBuilder : IOcelotBuilder\n private readonly IServiceCollection _services;\... | diff --git a/test/Ocelot.UnitTests/Middleware/OcelotPipelineExtensionsTests.cs b/test/Ocelot.UnitTests/Middleware/OcelotPipelineExtensionsTests.cs
index 74f6c7879..fd6fd8bfe 100644
--- a/test/Ocelot.UnitTests/Middleware/OcelotPipelineExtensionsTests.cs
+++ b/test/Ocelot.UnitTests/Middleware/OcelotPipelineExtensionsTest... | true |
ThreeMammals/Ocelot | 2,392 | issue_to_patch | Migrate to `Microsoft.Testing.Platform` framework & xUnit v3 for acceptance testing | It seems [TestStack.BDDfy](https://www.nuget.org/packages/TestStack.BDDfy/) is not compatible with [xUnit v3](https://www.nuget.org/packages/xunit.v3/), and the overall user experience is unsatisfactory:
- Impossible to reuse the [xUnit v3](https://xunit.net/docs/getting-started/v3/getting-started) cancellation toke... | a5efd3cc913883de017c9afaf9637402ce965606 | fff72d954e1eb87017310bed5895d8964a83b9e8 | diff --git a/src/Ocelot/DependencyInjection/OcelotBuilder.cs b/src/Ocelot/DependencyInjection/OcelotBuilder.cs
index 84d6a7ccc..2b4eb275b 100644
--- a/src/Ocelot/DependencyInjection/OcelotBuilder.cs
+++ b/src/Ocelot/DependencyInjection/OcelotBuilder.cs
@@ -33,7 +33,6 @@
using Ocelot.Requester;
using Ocelot.Responder;... | [
"src/Ocelot/DependencyInjection/OcelotBuilder.cs",
"src/Ocelot/Middleware/OcelotPipelineExtensions.cs",
"src/Ocelot/Middleware/UnauthenticatedError.cs",
"src/Ocelot/Security/IPSecurityPolicy.cs",
"src/Ocelot/Security/SecurityMiddleware.cs",
"test/Ocelot.AcceptanceTests/Administration/AdministrationSteps.c... | [] | diff --git a/test/Ocelot.AcceptanceTests/Administration/AdministrationSteps.cs b/test/Ocelot.AcceptanceTests/Administration/AdministrationSteps.cs
index 1a5408007..2020583ea 100644
--- a/test/Ocelot.AcceptanceTests/Administration/AdministrationSteps.cs
+++ b/test/Ocelot.AcceptanceTests/Administration/AdministrationStep... | true | |
ThreeMammals/Ocelot | 61 | issue_to_patch | Feature/thread safe | Added an integration test because I wanted to make sure end to end use of headers was thread safe.
The tests created 300 requests pretty much instantly and smashes ocelot and the downstream api with them.
Cranked this up way above 300 but takes ages to run if it becomes annoying. | 5690d173104dd0b316203bdc71bb1763ce2635d0 | f44357518517878a02e01ff4584906ef17ba978d | diff --git a/configuration.json b/configuration.json
index 3f39532c6..6c4e9ae75 100755
--- a/configuration.json
+++ b/configuration.json
@@ -1,1 +1,1 @@
-{"ReRoutes":[],"GlobalConfiguration":{"RequestIdKey":null,"ServiceDiscoveryProvider":{"Provider":null,"Host":null,"Port":0},"AdministrationPath":"/administration"}}
\... | [
"configuration.json",
"test/Ocelot.IntegrationTests/AdministrationTests.cs",
"test/Ocelot.IntegrationTests/ThreadSafeHeadersTests.cs",
"test/Ocelot.IntegrationTests/configuration.json"
] | [] | diff --git a/test/Ocelot.IntegrationTests/AdministrationTests.cs b/test/Ocelot.IntegrationTests/AdministrationTests.cs
index 210c7ac5f..2f78e795e 100644
--- a/test/Ocelot.IntegrationTests/AdministrationTests.cs
+++ b/test/Ocelot.IntegrationTests/AdministrationTests.cs
@@ -13,6 +13,7 @@
using TestStack.BDDfy;
using Xu... | true | |
ThreeMammals/Ocelot | 734 | issue_to_patch | Feat/monorepo | Fixes / New Feature #
In order to help hand over build and deployment process im going back to a mono repo for all Ocelot packages.
## Proposed Changes
- [x] Main Ocelot project to have no non ms deps
- [x] All non ms deps to be in specific project
- [x] Build script to support all projects
- [x] All projec... | 35253025c7d7e6ef51b649dbdac32e7810557ebf | c010bedc19e99b97b24701e5265069705f150a21 | diff --git a/Ocelot.sln b/Ocelot.sln
index d20e939e6..f4b3aef35 100644
--- a/Ocelot.sln
+++ b/Ocelot.sln
@@ -1,90 +1,139 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-... | [
"Ocelot.sln",
"README.md",
"build.cake",
"build.ps1",
"docs/building/releaseprocess.rst",
"docs/features/administration.rst",
"docs/features/caching.rst",
"docs/features/configuration.rst",
"docs/features/delegatinghandlers.rst",
"docs/features/headerstransformation.rst",
"docs/features/raft.rst... | [] | diff --git a/test/Ocelot.AcceptanceTests/ButterflyTracingTests.cs b/test/Ocelot.AcceptanceTests/ButterflyTracingTests.cs
new file mode 100644
index 000000000..ea18131ce
--- /dev/null
+++ b/test/Ocelot.AcceptanceTests/ButterflyTracingTests.cs
@@ -0,0 +1,259 @@
+namespace Ocelot.AcceptanceTests
+{
+ using System;
+ ... | true | |
ThreeMammals/Ocelot | 2,389 | issue_to_patch | Ref SDK 10.0.300 (Runtime 10.0.8) to release `Ocelot` v25 beta 3 and `Ocelot.Testing` v25 beta 8+ | A new [Ocelot.Testing](https://www.nuget.org/packages/Ocelot.Testing) v25 (beta 8) package release is required together with the new Ocelot v25 (beta 3).
## Proposed Changes
- Prepared to release `Ocelot.Testing` v25.0.0-beta.8 package
- **Bumped all packages to the latest versions, including .NET SDK 10.0.203 (Ru... | 5db7db87c94850b69a528d3f2b3404f64dc6a9e1 | 96fedc3f11ff30c5ceba76feab38b8fe4808a8ea | diff --git a/.github/steps/prepare-coveralls.sh b/.github/steps/prepare-coveralls.sh
index faa38d361..2e85074fb 100644
--- a/.github/steps/prepare-coveralls.sh
+++ b/.github/steps/prepare-coveralls.sh
@@ -1,13 +1,33 @@
#!/bin/bash
-# Prepare Coveralls
+# Prepare Coveralls, with 2 optional arguments
echo "::group::Lis... | [
".github/steps/prepare-coveralls.sh",
".github/workflows/develop.yml",
".github/workflows/pr.yml",
"Ocelot.Samples.slnx",
"global.json",
"samples/Basic/Ocelot.Samples.Basic.csproj",
"samples/Basic/packages.lock.json",
"samples/Configuration/Ocelot.Samples.Configuration.csproj",
"samples/Configuratio... | [] | diff --git a/test/Ocelot.AcceptanceTests/LoadBalancer/LoadBalancerTests.cs b/test/Ocelot.AcceptanceTests/LoadBalancer/LoadBalancerTests.cs
index b0ec0fdd2..72c9cd834 100644
--- a/test/Ocelot.AcceptanceTests/LoadBalancer/LoadBalancerTests.cs
+++ b/test/Ocelot.AcceptanceTests/LoadBalancer/LoadBalancerTests.cs
@@ -7,6 +7,... | true | |
ThreeMammals/Ocelot | 506 | issue_to_patch | Using Admin Api update configuration successfully,but the json file not changed.when I restart the Ocelot service,the configuration was restored.
## Expected Behavior / New Feature
Using Admin Api update configuration successfully,but the json file not changed.when I restart the Ocelot service,the configuration was r... | Feature/fix #463 | ## Fixes #463
- #463
## Proposed Changes
- only save to disk on startup when using Admin API
- when we save to disk save to `ocelot.json` and `ocelot.{environment}.json`
| 9f4448378a13b9336b0ac59756587be5a26c174b | bd1f32952acb9c70ba58499bdc39eb399696c98d | diff --git a/.gitignore b/.gitignore
index 476938f00..d1d0ee7d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
*.user
*.userosscache
*.sln.docstates
-
+.DS_Store
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
diff --git a/docs/features/administration.rst b/docs/features/administ... | [
".gitignore",
"docs/features/administration.rst",
"src/Ocelot/Configuration/Repository/DiskFileConfigurationRepository.cs",
"src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs",
"test/Ocelot.AcceptanceTests/StartupTests.cs",
"test/Ocelot.AcceptanceTests/Steps.cs",
"test/Ocelot.IntegrationTests/Administ... | [] | diff --git a/test/Ocelot.AcceptanceTests/StartupTests.cs b/test/Ocelot.AcceptanceTests/StartupTests.cs
new file mode 100644
index 000000000..e0dbe0ac2
--- /dev/null
+++ b/test/Ocelot.AcceptanceTests/StartupTests.cs
@@ -0,0 +1,100 @@
+namespace Ocelot.AcceptanceTests
+{
+ using System;
+ using System.Collections.... | true |
ThreeMammals/Ocelot | 325 | issue_to_patch | Downstream skip SSL/certificate validation per configuration
## Expected Behavior / New Feature
Using ocelot in a development/test environment without valid certificates / self signed certificates failes with:
System.Net.Http.CurlException: Peer certificate cannot be authenticated with given CA certificates
## Actual... | #309 allow users to ignore ssl warnings, not sure this is advisable | ## Closes #309
- #309
## Proposed Changes
- Allows users to set `DangerousAcceptAnyServerCertificateValidator` in ReRoute config and this will ignore SSL errors, false by default.
| 4f061f2b741e5de2fe2f22236be89cd7531f1df1 | c22367722cd7fa10e87e687fbf9658a557aec222 | diff --git a/docs/features/configuration.rst b/docs/features/configuration.rst
index 4c96eade6..343d7cbe9 100644
--- a/docs/features/configuration.rst
+++ b/docs/features/configuration.rst
@@ -64,7 +64,8 @@ Here is an example ReRoute configuration, You don't need to set all of these thi
"UseCookieConta... | [
"docs/features/configuration.rst",
"src/Ocelot/Configuration/Builder/DownstreamReRouteBuilder.cs",
"src/Ocelot/Configuration/Creator/FileInternalConfigurationCreator.cs",
"src/Ocelot/Configuration/DownstreamReRoute.cs",
"src/Ocelot/Configuration/File/FileReRoute.cs",
"src/Ocelot/Requester/HttpClientBuilde... | [] | diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
index 1824df0d6..9edbfd745 100644
--- a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
+++ b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
@@ -21,6 +21,9 @@
<Non... | true |
ThreeMammals/Ocelot | 450 | issue_to_patch | #Http Status 303 See Other
## Expected Behavior / New Feature
304 Not Modified
## Actual Behavior / Motivation for New Feautre
303 See Other
## Steps to Reproduce the Problem
1.
1.
1.
## Specifications
- Version: 7.0.6
- Platform: Linux
- Subsystem: Nodejs | test to show returning 304 works | ## Fixes #440
- #440
test to show returning 304 works
| 85efcf0787f9100b1f112701287bf74381f94686 | 836f6bc3cb48d81c77962b55e7f9c7be673e4e1f | diff --git a/src/Ocelot/Headers/Middleware/HttpHeadersTransformationMiddleware.cs b/src/Ocelot/Headers/Middleware/HttpHeadersTransformationMiddleware.cs
index a870cc0f6..bead85c5e 100644
--- a/src/Ocelot/Headers/Middleware/HttpHeadersTransformationMiddleware.cs
+++ b/src/Ocelot/Headers/Middleware/HttpHeadersTransformat... | [
"src/Ocelot/Headers/Middleware/HttpHeadersTransformationMiddleware.cs",
"test/Ocelot.AcceptanceTests/ResponseCodeTests.cs",
"test/Ocelot.ManualTest/ocelot.json"
] | [] | diff --git a/test/Ocelot.AcceptanceTests/ResponseCodeTests.cs b/test/Ocelot.AcceptanceTests/ResponseCodeTests.cs
new file mode 100644
index 000000000..e4a361e44
--- /dev/null
+++ b/test/Ocelot.AcceptanceTests/ResponseCodeTests.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+usin... | true |
ThreeMammals/Ocelot | 618 | issue_to_patch | HttpResponseMessage.ReasonPhrase isn't proxied
## Expected Behavior
ReasonPhrase received from downstream should be propagated back to the client.
## Actual Behavior
ReasonPhase is ignored, and a new one i created by HttpResponseMessage according to the Http status code.
## Specifications
- Version: 11.0.... | Feature/proxy reason phrase | ## Fixes #599
- #599
## Proposed Changes
- proxy reason phrase
- don't proxy it for aggregates..
| 0b9ff92549cb8db520f55117f19bfdfa7027eef5 | 655f97d9e8966313e5b1e5986f8c6dbb643a5974 | diff --git a/src/Ocelot/Cache/CachedResponse.cs b/src/Ocelot/Cache/CachedResponse.cs
index e4360e0d2..538a4c356 100644
--- a/src/Ocelot/Cache/CachedResponse.cs
+++ b/src/Ocelot/Cache/CachedResponse.cs
@@ -1,30 +1,33 @@
-using System.Collections.Generic;
-using System.Net;
-
-namespace Ocelot.Cache
-{
- public ... | [
"src/Ocelot/Cache/CachedResponse.cs",
"src/Ocelot/Cache/Middleware/OutputCacheMiddleware.cs",
"src/Ocelot/Middleware/DownstreamResponse.cs",
"src/Ocelot/Middleware/Multiplexer/SimpleJsonResponseAggregator.cs",
"src/Ocelot/Responder/HttpContextResponder.cs",
"test/Ocelot.AcceptanceTests/AggregateTests.cs",... | [] | diff --git a/test/Ocelot.AcceptanceTests/AggregateTests.cs b/test/Ocelot.AcceptanceTests/AggregateTests.cs
index 7f3bc9021..a98fd3ef3 100644
--- a/test/Ocelot.AcceptanceTests/AggregateTests.cs
+++ b/test/Ocelot.AcceptanceTests/AggregateTests.cs
@@ -559,7 +559,7 @@ public async Task<DownstreamResponse> Aggregate(List<Do... | true |
ThreeMammals/Ocelot | 267 | issue_to_patch | Content-Encoding headers are not preserved
## Content-Encoding headers are not preserved
## Actual Behavior
Downstream requests from Ocelot do not contain Content-Encoding headers even if upstream requests do. This causes rerouted gzip-encoded requests to fail.
## Analysis
Headers are mapped in [`RequestMapper... | Map content specific headers properly | ## Fixes #263
- #263
## Proposed Changes
- map all content specific headers to downstream request content property, make sure we dont map them to request specific headers, added a gzip encoding acceptance test
| db05935b89477b1c824da8ab127d28a66d96e8e9 | df0e3da2f83ffa457988c0f4985bd82b1cf1c5aa | diff --git a/src/Ocelot/Request/Mapper/RequestMapper.cs b/src/Ocelot/Request/Mapper/RequestMapper.cs
index 9af0d08e3..ee04a5519 100644
--- a/src/Ocelot/Request/Mapper/RequestMapper.cs
+++ b/src/Ocelot/Request/Mapper/RequestMapper.cs
@@ -47,11 +47,28 @@ private async Task<HttpContent> MapContent(HttpRequest request)
... | [
"src/Ocelot/Request/Mapper/RequestMapper.cs",
"test/Ocelot.AcceptanceTests/GzipTests.cs",
"test/Ocelot.AcceptanceTests/Steps.cs",
"test/Ocelot.UnitTests/Request/Mapper/RequestMapperTests.cs"
] | [] | diff --git a/test/Ocelot.AcceptanceTests/GzipTests.cs b/test/Ocelot.AcceptanceTests/GzipTests.cs
new file mode 100644
index 000000000..9c04314ca
--- /dev/null
+++ b/test/Ocelot.AcceptanceTests/GzipTests.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compress... | true |
ThreeMammals/Ocelot | 584 | issue_to_patch | Ocelot should not startup if user specifies use service discovery but has not registered service discovery provider delegate and we need to handle mapping from delegates to string in config better
## Expected Behavior
ocelot should fail to start and tell the user why
also maybe get rid of UseServiceDiscovery on Re... | Feature/should not start if specified using service discovery but no provider registered | ## Fixes #580
- #580
| 1ea59f12b325adba96ee43a5e7b46d770d95bd83 | 6e7b4a2f514737a9e83f9489ccc39d92e2c89264 | diff --git a/docs/features/configuration.rst b/docs/features/configuration.rst
index bad1e6c53..4790afc56 100644
--- a/docs/features/configuration.rst
+++ b/docs/features/configuration.rst
@@ -64,7 +64,6 @@ Here is an example ReRoute configuration, You don't need to set all of these thi
"UseCookieConta... | [
"docs/features/configuration.rst",
"docs/features/loadbalancer.rst",
"docs/features/routing.rst",
"docs/features/servicediscovery.rst",
"docs/features/servicefabric.rst",
"samples/OcelotEureka/ApiGateway/ocelot.json",
"samples/OcelotServiceFabric/src/OcelotApplicationApiGateway/ocelot.json",
"src/Ocel... | [] | diff --git a/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs b/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
index 35029a134..5ba30fa31 100644
--- a/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
+++ b/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
@@ -15,6 +15,79 @@ public CannotStartOcelot... | true |
ThreeMammals/Ocelot | 578 | issue_to_patch | Ocelot with Eureka Middleware Error
## Expected Behavior / New Feature
HttpStatus 500, Unable to Handle Request
I checked output log it said
```
Ocelot.Errors.Middleware.ExceptionHandlerMiddleware:Debug: requestId: 0HLG7TAMB8J5G:00000002, previousRequestId: no previous request id, message: error calling midd... | #568 worked out how to check if QoS handler present and kill Ocelot if options specified but no handler, need to refactor this into fluent validation style | ## Fixes #568
- #568
| 8db5570840691e6db3b32d67207f97b432686273 | fc423d7b0c8c86ad7785cbb9fe29b25356b6370a | diff --git a/src/Ocelot/Configuration/Validator/ConfigurationValidationResult.cs b/src/Ocelot/Configuration/Validator/ConfigurationValidationResult.cs
index 7e06cb6b7..aa21cd263 100644
--- a/src/Ocelot/Configuration/Validator/ConfigurationValidationResult.cs
+++ b/src/Ocelot/Configuration/Validator/ConfigurationValidat... | [
"src/Ocelot/Configuration/Validator/ConfigurationValidationResult.cs",
"src/Ocelot/Configuration/Validator/FileConfigurationFluentValidator.cs",
"src/Ocelot/Configuration/Validator/FileGlobalConfigurationFluentValidator.cs",
"src/Ocelot/Configuration/Validator/FileQoSOptionsFluentValidator.cs",
"src/Ocelot/... | [] | diff --git a/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs b/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
index 5ecedd1a6..35029a134 100644
--- a/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
+++ b/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
@@ -1,53 +1,148 @@
-namespace Ocelot.Accept... | true |
ThreeMammals/Ocelot | 160 | issue_to_patch | file configuration error validate error message always empty in exception message
error message create in here,
https://github.com/TomPallister/Ocelot/blob/d3774820137c00fea50b6d01fff8f4089f6df305/src/Ocelot/Configuration/Validator/FileConfigurationValidator.cs#L33
you send the error result to the OkResponse objec... | Feature/fix #156 | ## Fixes #156
- #156
Now writes out the error messages... still a bit crap but is better for now. | 6289992faab8a4138e0beb0876da9b73c0987f08 | bcbcf756640ffcc144ce44a0f077011409dd25fd | diff --git a/src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs b/src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs
index 3aba7c208..f8e2d506e 100644
--- a/src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs
+++ b/src/Ocelot/Configuration/Creator/FileOcelotConfigurationCr... | [
"src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs",
"src/Ocelot/Configuration/Creator/IOcelotConfigurationCreator.cs",
"src/Ocelot/Errors/Error.cs",
"src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs",
"test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs",
"test/Ocelot.UnitTests/Conf... | [] | diff --git a/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs b/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
new file mode 100644
index 000000000..25a9565cc
--- /dev/null
+++ b/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
@@ -0,0 +1,58 @@
+
+using System;
+using System.Collections.Generic;
+using... | true |
ThreeMammals/Ocelot | 310 | issue_to_patch | New Feature - Advanced Request Aggregation
First of all thanks for the effort you guys put in the awesome project!
## New Feature: Advanced Request Aggregation
A more advanced version of the Request Aggregation Feature to allow smarter composition of multiple request and or subsequent request.
## Motivation fo... | #298 initial hacking around better aggregation | ## Closes #298
- #298
## Proposed Changes
- Users can add `IDefinedAggregator` to handle aggregation of downstream responses giving complete control of aggregation.
| 982eebfc74217a5fef34321c97f91cd1afaa9bed | d47f4b70eabcb7315a5ea7faff114f7a315eaaf1 | diff --git a/docs/features/requestaggregation.rst b/docs/features/requestaggregation.rst
index b359eb726..c3c7ad131 100644
--- a/docs/features/requestaggregation.rst
+++ b/docs/features/requestaggregation.rst
@@ -5,12 +5,114 @@ Ocelot allow's you to specify Aggregate ReRoutes that compose multiple normal Re
a client t... | [
"docs/features/requestaggregation.rst",
"src/Ocelot/Cache/Middleware/OutputCacheMiddleware.cs",
"src/Ocelot/Configuration/Builder/ReRouteBuilder.cs",
"src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs",
"src/Ocelot/Configuration/File/FileAggregateReRoute.cs",
"src/Ocelot/Configuration/ReR... | [] | diff --git a/test/Ocelot.AcceptanceTests/AggregateTests.cs b/test/Ocelot.AcceptanceTests/AggregateTests.cs
index 3944adfca..8e0e5dfd5 100644
--- a/test/Ocelot.AcceptanceTests/AggregateTests.cs
+++ b/test/Ocelot.AcceptanceTests/AggregateTests.cs
@@ -1,11 +1,17 @@
using System;
using System.Collections.Generic;
usin... | true |
ThreeMammals/Ocelot | 570 | issue_to_patch | Query params aren't proxied correctly (Service Fabric)
## Expected Behavior
Query params should be proxied correctly.
## Actual Behavior
When using Service Fabric, an incoming request to `https://example.com/a?b=c` ends up being sent to `https://localhost:19081/a??b=c&cmd=instance`. I suspect the duplicated `??` ... | #555 added some tests for this issue but struggling to replicate | ## Fixes #555
- #555
| 00a600064deea0877058d04e6189d7e0278c99a5 | 5903ac4a07db4a8a80fa4a690adc8c24b4e64448 | diff --git a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValueFinder.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValueFinder.cs
index 6f4fec00d..bb59fac4c 100644
--- a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValueFinder.cs
+++ b/src/Oce... | [
"src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValueFinder.cs",
"src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs",
"test/Ocelot.AcceptanceTests/ServiceFabricTests.cs",
"test/Ocelot.UnitTests/DownstreamUrlCreator/DownstreamUrlCreatorMiddlewareTests.cs",
"te... | [] | diff --git a/test/Ocelot.AcceptanceTests/ServiceFabricTests.cs b/test/Ocelot.AcceptanceTests/ServiceFabricTests.cs
index e4c2abc40..19268f0d5 100644
--- a/test/Ocelot.AcceptanceTests/ServiceFabricTests.cs
+++ b/test/Ocelot.AcceptanceTests/ServiceFabricTests.cs
@@ -20,6 +20,43 @@ public ServiceFabricTests()
... | true |
ThreeMammals/Ocelot | 2,170 | issue_to_patch | Issue with IP Blocking and Allowing in global configuration
I configured IP blocking and allowing in Ocelot using SecurityOptions, but it's not working.
```
{
"GlobalConfiguration": {
"BaseUrl": "http://localhost:5000",
"SecurityOptions": {
"IPBlockedList": ["192.168.0.23"]
}
}
}
... | #2165 Global configuration `SecurityOptions` | ## Closes #2165
- #2165
## Proposed Changes
As the issue #2165 reports, the `SecurityOptions` are missing in `GlobalConfiguration`.
This pull request adds the ability to configure Allowed and Blocked IPs globally: the global configuration will be applied for every route unless an existing `SecurityOptions` ... | 41fc9bd5b183f6e5e6a710f46400f32a58113347 | a06a4674fb0986e6cbf7f9b8a1fb4fe1401f144c | diff --git a/src/Ocelot/Configuration/Creator/ISecurityOptionsCreator.cs b/src/Ocelot/Configuration/Creator/ISecurityOptionsCreator.cs
index 5f5f727f3..f85acf510 100644
--- a/src/Ocelot/Configuration/Creator/ISecurityOptionsCreator.cs
+++ b/src/Ocelot/Configuration/Creator/ISecurityOptionsCreator.cs
@@ -1,9 +1,8 @@
u... | [
"src/Ocelot/Configuration/Creator/ISecurityOptionsCreator.cs",
"src/Ocelot/Configuration/Creator/RoutesCreator.cs",
"src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs",
"src/Ocelot/Configuration/File/FileGlobalConfiguration.cs",
"src/Ocelot/Configuration/File/FileSecurityOptions.cs",
"src/Ocelot/... | [
{
"comment": "```suggestion\r\n private static IReadOnlyCollection<string> SetIpAddressList(IList<string> ipValueList)\r\n{\r\n return ipValueList\r\n .Where(ipValue => IPAddressRange.TryParse(ipValue, out _))\r\n .SelectMany(ipValue => IPAddressRange.Parse(ipValue).Select(ip => ip.ToStri... | diff --git a/test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs b/test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs
new file mode 100644
index 000000000..7a33207b7
--- /dev/null
+++ b/test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs
@@ -0,0 +1,162 @@
+using Microsoft.AspNetCore.Http;
+... | true |
ThreeMammals/Ocelot | 2,170 | comment_to_fix | #2165 Global configuration `SecurityOptions` | ```suggestion
private static IReadOnlyCollection<string> SetIpAddressList(IList<string> ipValueList)
{
return ipValueList
.Where(ipValue => IPAddressRange.TryParse(ipValue, out _))
.SelectMany(ipValue => IPAddressRange.Parse(ipValue).Select(ip => ip.ToString()))
.ToArray();
}
... | 41fc9bd5b183f6e5e6a710f46400f32a58113347 | a06a4674fb0986e6cbf7f9b8a1fb4fe1401f144c | diff --git a/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs b/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs
index 3c4c93d80..8e53e963a 100644
--- a/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs
+++ b/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs
@@ -1,39 +1,28 @@
usi... | [
"src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs"
] | [
{
"comment": "```suggestion\r\n private static IReadOnlyCollection<string> SetIpAddressList(IList<string> ipValueList)\r\n{\r\n return ipValueList\r\n .Where(ipValue => IPAddressRange.TryParse(ipValue, out _))\r\n .SelectMany(ipValue => IPAddressRange.Parse(ipValue).Select(ip => ip.ToStri... | true | ||
ThreeMammals/Ocelot | 2,170 | comment_to_fix | #2165 Global configuration `SecurityOptions` | Probably not your fault, but i would avoid the nesting... | 41fc9bd5b183f6e5e6a710f46400f32a58113347 | a06a4674fb0986e6cbf7f9b8a1fb4fe1401f144c | diff --git a/src/Ocelot/Security/IPSecurity/IPSecurityPolicy.cs b/src/Ocelot/Security/IPSecurity/IPSecurityPolicy.cs
index e76044ecf..8437af39e 100644
--- a/src/Ocelot/Security/IPSecurity/IPSecurityPolicy.cs
+++ b/src/Ocelot/Security/IPSecurity/IPSecurityPolicy.cs
@@ -3,38 +3,40 @@
using Ocelot.Middleware;
using Ocel... | [
"src/Ocelot/Security/IPSecurity/IPSecurityPolicy.cs"
] | [
{
"comment": "Probably not your fault, but i would avoid the nesting...",
"path": "src/Ocelot/Security/IPSecurity/IPSecurityPolicy.cs",
"hunk": "@@ -27,7 +27,7 @@ public async Task<Response> Security(DownstreamRoute downstreamRoute, HttpContex\n \n if (securityOptions.IPAllowedList?.Count > ... | true | ||
ThreeMammals/Ocelot | 2,170 | comment_to_fix | #2165 Global configuration `SecurityOptions` | ```c#
public SecurityOptions Create(FileSecurityOptions securityOptions, FileGlobalConfiguration globalConfiguration) => Create(securityOptions.IsFullFilled() ? securityOptions : globalConfiguration.SecurityOptions);
```
might be simplified | 41fc9bd5b183f6e5e6a710f46400f32a58113347 | a06a4674fb0986e6cbf7f9b8a1fb4fe1401f144c | diff --git a/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs b/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs
index 3c4c93d80..8e53e963a 100644
--- a/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs
+++ b/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs
@@ -1,39 +1,28 @@
usi... | [
"src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs"
] | [
{
"comment": "```c#\r\npublic SecurityOptions Create(FileSecurityOptions securityOptions, FileGlobalConfiguration globalConfiguration) => Create(securityOptions.IsFullFilled() ? securityOptions : globalConfiguration.SecurityOptions);\r\n```\r\nmight be simplified",
"path": "src/Ocelot/Configuration/Creator/... | true | ||
ThreeMammals/Ocelot | 2,170 | comment_to_fix | #2165 Global configuration `SecurityOptions` | Method is private! You should you native types for performance reasons.
Why do you use abstract `IList<string>` type to pass the `List<string>` argument aka `FileSecurityOptions` lists?
```suggestion
private static string[] SetIpAddressList(List<string> ipValueList)
```
It is correct change if the method w... | 41fc9bd5b183f6e5e6a710f46400f32a58113347 | a06a4674fb0986e6cbf7f9b8a1fb4fe1401f144c | diff --git a/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs b/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs
index 3c4c93d80..8e53e963a 100644
--- a/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs
+++ b/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs
@@ -1,39 +1,28 @@
usi... | [
"src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs"
] | [
{
"comment": "Method is private! You should you native types for performance reasons.\r\nWhy do you use abstract `IList<string>` type to pass the `List<string>` argument aka `FileSecurityOptions` lists?\r\n```suggestion\r\n private static string[] SetIpAddressList(List<string> ipValueList)\r\n```\r\nIt i... | true | ||
ThreeMammals/Ocelot | 2,170 | comment_to_fix | #2165 Global configuration `SecurityOptions` | Double parsing issue❗ | 41fc9bd5b183f6e5e6a710f46400f32a58113347 | a06a4674fb0986e6cbf7f9b8a1fb4fe1401f144c | diff --git a/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs b/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs
index 3c4c93d80..8e53e963a 100644
--- a/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs
+++ b/src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs
@@ -1,39 +1,28 @@
usi... | [
"src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs"
] | [
{
"comment": "Double parsing issue❗ ",
"path": "src/Ocelot/Configuration/Creator/SecurityOptionsCreator.cs",
"hunk": "@@ -5,35 +5,26 @@ namespace Ocelot.Configuration.Creator\n {\n public class SecurityOptionsCreator : ISecurityOptionsCreator\n {\n- public SecurityOptions Create(FileSecur... | true | ||
ThreeMammals/Ocelot | 2,170 | comment_to_fix | #2165 Global configuration `SecurityOptions` | Should be file-scoped! | 41fc9bd5b183f6e5e6a710f46400f32a58113347 | a06a4674fb0986e6cbf7f9b8a1fb4fe1401f144c | diff --git a/test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs b/test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs
new file mode 100644
index 000000000..7a33207b7
--- /dev/null
+++ b/test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs
@@ -0,0 +1,162 @@
+using Microsoft.AspNetCore.Http;
+... | [
"test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs"
] | [
{
"comment": "Should be file-scoped!",
"path": "test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs",
"hunk": "@@ -0,0 +1,163 @@\n+using Microsoft.AspNetCore.Http;\n+using Ocelot.Configuration.File;\n+\n+namespace Ocelot.AcceptanceTests.Security",
"resolving_sha": "a06a4674fb0986e6cbf7f9b8... | true | ||
ThreeMammals/Ocelot | 2,170 | comment_to_fix | #2165 Global configuration `SecurityOptions` | No traits! | 41fc9bd5b183f6e5e6a710f46400f32a58113347 | a06a4674fb0986e6cbf7f9b8a1fb4fe1401f144c | diff --git a/test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs b/test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs
new file mode 100644
index 000000000..7a33207b7
--- /dev/null
+++ b/test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs
@@ -0,0 +1,162 @@
+using Microsoft.AspNetCore.Http;
+... | [
"test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs"
] | [
{
"comment": "No traits!",
"path": "test/Ocelot.AcceptanceTests/Security/SecurityOptionsTests.cs",
"hunk": "@@ -0,0 +1,163 @@\n+using Microsoft.AspNetCore.Http;\n+using Ocelot.Configuration.File;\n+\n+namespace Ocelot.AcceptanceTests.Security\n+{\n+ public sealed class SecurityOptionsTests: Steps\n+... | true | ||
ThreeMammals/Ocelot | 2,170 | comment_to_fix | #2165 Global configuration `SecurityOptions` | No traits! | 41fc9bd5b183f6e5e6a710f46400f32a58113347 | a06a4674fb0986e6cbf7f9b8a1fb4fe1401f144c | diff --git a/test/Ocelot.UnitTests/Configuration/SecurityOptionsCreatorTests.cs b/test/Ocelot.UnitTests/Configuration/SecurityOptionsCreatorTests.cs
index 81d9fd36d..2a223c78f 100644
--- a/test/Ocelot.UnitTests/Configuration/SecurityOptionsCreatorTests.cs
+++ b/test/Ocelot.UnitTests/Configuration/SecurityOptionsCreator... | [
"test/Ocelot.UnitTests/Configuration/SecurityOptionsCreatorTests.cs"
] | [
{
"comment": "No traits!",
"path": "test/Ocelot.UnitTests/Configuration/SecurityOptionsCreatorTests.cs",
"hunk": "@@ -31,20 +52,57 @@ public void should_create_security_config()\n \r\n var expected = new SecurityOptions(ipAllowedList, ipBlockedList);\r\n \r\n- this.Given(x => x.Gi... | true | ||
ThreeMammals/Ocelot | 2,170 | comment_to_fix | #2165 Global configuration `SecurityOptions` | We don't use BDDfy in unit tests! | 41fc9bd5b183f6e5e6a710f46400f32a58113347 | a06a4674fb0986e6cbf7f9b8a1fb4fe1401f144c | diff --git a/test/Ocelot.UnitTests/Configuration/SecurityOptionsCreatorTests.cs b/test/Ocelot.UnitTests/Configuration/SecurityOptionsCreatorTests.cs
index 81d9fd36d..2a223c78f 100644
--- a/test/Ocelot.UnitTests/Configuration/SecurityOptionsCreatorTests.cs
+++ b/test/Ocelot.UnitTests/Configuration/SecurityOptionsCreator... | [
"test/Ocelot.UnitTests/Configuration/SecurityOptionsCreatorTests.cs"
] | [
{
"comment": "We don't use BDDfy in unit tests!",
"path": "test/Ocelot.UnitTests/Configuration/SecurityOptionsCreatorTests.cs",
"hunk": "@@ -31,20 +52,57 @@ public void should_create_security_config()\n \r\n var expected = new SecurityOptions(ipAllowedList, ipBlockedList);\r\n \r\n- ... | true | ||
ThreeMammals/Ocelot | 2,170 | comment_to_fix | #2165 Global configuration `SecurityOptions` | No traits! BDDfy must be removed! | 41fc9bd5b183f6e5e6a710f46400f32a58113347 | a06a4674fb0986e6cbf7f9b8a1fb4fe1401f144c | diff --git a/test/Ocelot.UnitTests/Security/IPSecurityPolicyTests.cs b/test/Ocelot.UnitTests/Security/IPSecurityPolicyTests.cs
index 83d7bb73f..bd7b9cd3d 100644
--- a/test/Ocelot.UnitTests/Security/IPSecurityPolicyTests.cs
+++ b/test/Ocelot.UnitTests/Security/IPSecurityPolicyTests.cs
@@ -8,404 +8,391 @@
using Ocelot.R... | [
"test/Ocelot.UnitTests/Security/IPSecurityPolicyTests.cs"
] | [
{
"comment": "No traits! BDDfy must be removed!",
"path": "test/Ocelot.UnitTests/Security/IPSecurityPolicyTests.cs",
"hunk": "@@ -312,6 +314,17 @@ public void should_exludeAllowedFromBlocked_moreBlocked_clientIp_not_block()\n .BDDfy();\n }\n \n+ [Fact]\n+ public voi... | true | ||
ThreeMammals/Ocelot | 89 | issue_to_patch | Use final paths in the reroutes of configuration.json file. | The idea is the user not have to map all request when use Ocelot like a simple request redirector.
Imagine the following scenario:
1. An intranet with three web apis.
2. An internal gateway like unique enter point to internal requests.
3. An external gateway like unique enter point to external requests.
4. The... | 8d31b40c210cf6baec9ead27edc27f66404e6861 | 6510f173b9ec263dffa075b3b92374d977f5148a | diff --git a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValueFinder.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValueFinder.cs
index 249b153e9..0859f4c02 100644
--- a/src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValueFinder.cs
+++ b/src/Oce... | [
"src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValueFinder.cs",
"test/Ocelot.AcceptanceTests/RoutingTests.cs",
"test/Ocelot.UnitTests/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinderTests.cs"
] | [] | diff --git a/test/Ocelot.AcceptanceTests/RoutingTests.cs b/test/Ocelot.AcceptanceTests/RoutingTests.cs
index c1a6716c9..99c11877a 100644
--- a/test/Ocelot.AcceptanceTests/RoutingTests.cs
+++ b/test/Ocelot.AcceptanceTests/RoutingTests.cs
@@ -46,7 +46,6 @@ public void should_return_response_200_with_simple_url()
... | true | |
ThreeMammals/Ocelot | 1,972 | issue_to_patch | #1971 #928 Avoid content if original request has no content and avoid Transfer-Encoding: chunked if Content-Length is known | ## Follow-up to #1971
- #1971
With the changes in Ocelot [23.0](https://github.com/ThreeMammals/Ocelot/releases/tag/23.0.0) the `RequestMapper` sets the Property `Content` using the new `StreamHttpContent`. Because the **Content-Length** is not computed in `StreamHttpContent` the header **Transfer-Encoding**: chu... | 8845d1b98d2c3b0bd633ebd2b526b923687edd33 | 81e1ca9ca26eaed2e328fdeeea675858a2d78b73 | diff --git a/src/Ocelot/Request/Mapper/RequestMapper.cs b/src/Ocelot/Request/Mapper/RequestMapper.cs
index 8bdde02bb..883c42350 100644
--- a/src/Ocelot/Request/Mapper/RequestMapper.cs
+++ b/src/Ocelot/Request/Mapper/RequestMapper.cs
@@ -1,87 +1,91 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.E... | [
"src/Ocelot/Request/Mapper/RequestMapper.cs",
"src/Ocelot/Request/Mapper/StreamHttpContent.cs",
"test/Ocelot.AcceptanceTests/HttpTests.cs",
"test/Ocelot.AcceptanceTests/Request/RequestMapperTests.cs",
"test/Ocelot.AcceptanceTests/Request/StreamContentTests.cs",
"test/Ocelot.AcceptanceTests/ServiceHandler.... | [
{
"comment": "I would recommend using an existing content type instead. eg. ```ByteArrayContent```",
"path": "src/Ocelot/Request/Mapper/EmptyHttpContent.cs",
"hunk": "@@ -0,0 +1,15 @@\n+namespace Ocelot.Request.Mapper;\n+\n+public class EmptyHttpContent : HttpContent",
"resolving_sha": "81e1ca9ca26... | diff --git a/test/Ocelot.AcceptanceTests/HttpTests.cs b/test/Ocelot.AcceptanceTests/HttpTests.cs
index 532bd6276..778dcb155 100644
--- a/test/Ocelot.AcceptanceTests/HttpTests.cs
+++ b/test/Ocelot.AcceptanceTests/HttpTests.cs
@@ -1,6 +1,8 @@
+using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using M... | true | |
ThreeMammals/Ocelot | 1,972 | comment_to_fix | #1971 #928 Avoid content if original request has no content and avoid Transfer-Encoding: chunked if Content-Length is known | @alexreinert Herr Reinert,
Why do I see this strange diff which is fake for sure?
Line endings? What IDE do you use? Visual Studio, ReSharper, Visual Code or something else?
**You should not change line endings at all!** | 8845d1b98d2c3b0bd633ebd2b526b923687edd33 | 81e1ca9ca26eaed2e328fdeeea675858a2d78b73 | diff --git a/src/Ocelot/Request/Mapper/RequestMapper.cs b/src/Ocelot/Request/Mapper/RequestMapper.cs
index 8bdde02bb..883c42350 100644
--- a/src/Ocelot/Request/Mapper/RequestMapper.cs
+++ b/src/Ocelot/Request/Mapper/RequestMapper.cs
@@ -1,87 +1,91 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.E... | [
"src/Ocelot/Request/Mapper/RequestMapper.cs"
] | [
{
"comment": "@alexreinert Herr Reinert,\r\nWhy do I see this strange diff which is fake for sure?\r\nLine endings? What IDE do you use? Visual Studio, ReSharper, Visual Code or something else?\r\n**You should not change line endings at all!**",
"path": "src/Ocelot/Request/Mapper/RequestMapper.cs",
"hu... | true | ||
ThreeMammals/Ocelot | 1,972 | comment_to_fix | #1971 #928 Avoid content if original request has no content and avoid Transfer-Encoding: chunked if Content-Length is known | Note 3
No need to **await**! | 8845d1b98d2c3b0bd633ebd2b526b923687edd33 | 81e1ca9ca26eaed2e328fdeeea675858a2d78b73 | diff --git a/src/Ocelot/Request/Mapper/StreamHttpContent.cs b/src/Ocelot/Request/Mapper/StreamHttpContent.cs
index 0e8294db7..b18e1040e 100644
--- a/src/Ocelot/Request/Mapper/StreamHttpContent.cs
+++ b/src/Ocelot/Request/Mapper/StreamHttpContent.cs
@@ -8,25 +8,24 @@ public class StreamHttpContent : HttpContent
pri... | [
"src/Ocelot/Request/Mapper/StreamHttpContent.cs"
] | [
{
"comment": "Note 3\r\nNo need to **await**!",
"path": "src/Ocelot/Request/Mapper/StreamHttpContent.cs",
"hunk": "@@ -8,25 +8,24 @@ public class StreamHttpContent : HttpContent\n private const int DefaultBufferSize = 65536;\n public const long UnknownLength = -1;\n private readonly HttpCont... | true | ||
ThreeMammals/Ocelot | 1,972 | comment_to_fix | #1971 #928 Avoid content if original request has no content and avoid Transfer-Encoding: chunked if Content-Length is known | `await` can be removed! | 8845d1b98d2c3b0bd633ebd2b526b923687edd33 | 81e1ca9ca26eaed2e328fdeeea675858a2d78b73 | diff --git a/src/Ocelot/Request/Mapper/StreamHttpContent.cs b/src/Ocelot/Request/Mapper/StreamHttpContent.cs
index 0e8294db7..b18e1040e 100644
--- a/src/Ocelot/Request/Mapper/StreamHttpContent.cs
+++ b/src/Ocelot/Request/Mapper/StreamHttpContent.cs
@@ -8,25 +8,24 @@ public class StreamHttpContent : HttpContent
pri... | [
"src/Ocelot/Request/Mapper/StreamHttpContent.cs"
] | [
{
"comment": "`await` can be removed!",
"path": "src/Ocelot/Request/Mapper/StreamHttpContent.cs",
"hunk": "@@ -8,25 +8,24 @@ public class StreamHttpContent : HttpContent\n private const int DefaultBufferSize = 65536;\n public const long UnknownLength = -1;\n private readonly HttpContext _con... | true | ||
ThreeMammals/Ocelot | 1,972 | comment_to_fix | #1971 #928 Avoid content if original request has no content and avoid Transfer-Encoding: chunked if Content-Length is known | Seems we have another service handlers which have Kestrel options.
So we need to merge such helpers, otherwise this copied-pasted code will never end.
So, better to have delegate argument than passing a set of args! | 8845d1b98d2c3b0bd633ebd2b526b923687edd33 | 81e1ca9ca26eaed2e328fdeeea675858a2d78b73 | diff --git a/test/Ocelot.AcceptanceTests/ServiceHandler.cs b/test/Ocelot.AcceptanceTests/ServiceHandler.cs
index 9ba0d0fe4..c2e10a819 100644
--- a/test/Ocelot.AcceptanceTests/ServiceHandler.cs
+++ b/test/Ocelot.AcceptanceTests/ServiceHandler.cs
@@ -5,7 +5,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft... | [
"test/Ocelot.AcceptanceTests/ServiceHandler.cs"
] | [
{
"comment": "Seems we have another service handlers which have Kestrel options.\r\nSo we need to merge such helpers, otherwise this copied-pasted code will never end.\r\nSo, better to have delegate argument than passing a set of args! ",
"path": "test/Ocelot.AcceptanceTests/ServiceHandler.cs",
"hunk": ... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.