Skip to content

Commit

Permalink
fix: allow retries and disable ssl to co-exist (#154)
Browse files Browse the repository at this point in the history
Previously, the "disable ssl" and "auto retries"
scenarios were mutually exclusive due to the way in
which the http client instances were managed.
The result was that you could not enable retries
and also disable ssl verification.

This commit fixes this problem by adding more precise
code to configure the "disable ssl" feature and
also reuses existing client instances where possible.
  • Loading branch information
padamstx authored Feb 1, 2022
1 parent d678136 commit b16fe8d
Show file tree
Hide file tree
Showing 7 changed files with 221 additions and 84 deletions.
96 changes: 68 additions & 28 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.sum|package-lock.json|^.secrets.baseline$",
"lines": null
},
"generated_at": "2021-12-10T20:12:59Z",
"generated_at": "2022-01-31T22:47:05Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -116,7 +116,7 @@
"hashed_secret": "bc2f74c22f98f7b6ffbc2f67453dbfa99bce9a32",
"is_secret": false,
"is_verified": false,
"line_number": 596,
"line_number": 603,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -126,47 +126,47 @@
"hashed_secret": "1f5e25be9b575e9f5d39c82dfd1d9f4d73f1975c",
"is_secret": false,
"is_verified": false,
"line_number": 1161,
"line_number": 1224,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "84ba4ce8a59ed2d6e90726d57cdc4a927d3672b2",
"is_secret": false,
"is_verified": false,
"line_number": 1398,
"line_number": 1461,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "62cdb7020ff920e5aa642c3d4066950dd1f01f4d",
"is_secret": false,
"is_verified": false,
"line_number": 1441,
"line_number": 1504,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "ec7ec9d8ff520250fd5ca955c6474c6d70022407",
"is_secret": false,
"is_verified": false,
"line_number": 1449,
"line_number": 1512,
"type": "JSON Web Token",
"verified_result": null
},
{
"hashed_secret": "40ce4379f5763c05b71c88f9a371809fdbce6a21",
"is_secret": false,
"is_verified": false,
"line_number": 1543,
"line_number": 1606,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "9addbf544119efa4a64223b649750a510f0d463f",
"is_secret": false,
"is_verified": false,
"line_number": 1569,
"line_number": 1632,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -261,6 +261,14 @@
"line_number": 78,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "333f0f8814d63e7268f80e1e65e7549137d2350c",
"is_secret": false,
"is_verified": false,
"line_number": 87,
"type": "Secret Keyword",
"verified_result": null
}
],
"v5/core/config_utils.go": [
Expand Down Expand Up @@ -330,15 +338,15 @@
"hashed_secret": "3c81615afb40d1889fc2e1fff551a8b59b4e80ce",
"is_secret": false,
"is_verified": false,
"line_number": 96,
"line_number": 97,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "8b142a91cfb6e617618ad437cedf74a6745f8926",
"is_secret": false,
"is_verified": false,
"line_number": 139,
"line_number": 140,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -348,23 +356,31 @@
"hashed_secret": "c8f0df25bade89c1873f5f01b85bcfb921443ac6",
"is_secret": false,
"is_verified": false,
"line_number": 39,
"line_number": 40,
"type": "JSON Web Token",
"verified_result": null
},
{
"hashed_secret": "f0048c1e535178d8ba9760fd4139c2554ac53d99",
"is_secret": false,
"is_verified": false,
"line_number": 222,
"line_number": 224,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "d16fe0356edbf4177de06fc6cb5122837d5cd203",
"is_secret": false,
"is_verified": false,
"line_number": 242,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "10ef99be8df801b05b5933e121e85385edf6b98a",
"is_secret": false,
"is_verified": false,
"line_number": 571,
"line_number": 613,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -432,39 +448,39 @@
"hashed_secret": "b94e9f3d7e001981b2dd49f2a70822a8ac8f3e68",
"is_secret": false,
"is_verified": false,
"line_number": 369,
"line_number": 372,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "10db2b8939e12fa3259bf89a63eab34ee3c281b2",
"is_secret": false,
"is_verified": false,
"line_number": 599,
"line_number": 602,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "84ba4ce8a59ed2d6e90726d57cdc4a927d3672b2",
"is_secret": false,
"is_verified": false,
"line_number": 642,
"line_number": 645,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "4080eeeaf54faf879b9e8d99c49a8503f7e855bb",
"is_secret": false,
"is_verified": false,
"line_number": 657,
"line_number": 660,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "32e8612d8ca77c7ea8374aa7918db8e5df9252ed",
"is_secret": false,
"is_verified": false,
"line_number": 776,
"line_number": 779,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -484,23 +500,23 @@
"hashed_secret": "7a5d27bcb7a1e98b6e1bfca4df223ed578a47283",
"is_secret": false,
"is_verified": false,
"line_number": 93,
"line_number": 94,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "c2df5d3d760ff42f33fb38e2534d4c1b7ddde3ab",
"is_secret": false,
"is_verified": false,
"line_number": 93,
"line_number": 94,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "8b142a91cfb6e617618ad437cedf74a6745f8926",
"is_secret": false,
"is_verified": false,
"line_number": 129,
"line_number": 130,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -534,39 +550,55 @@
"hashed_secret": "1f5e25be9b575e9f5d39c82dfd1d9f4d73f1975c",
"is_secret": false,
"is_verified": false,
"line_number": 194,
"line_number": 195,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "ffc168ba60490856fec503b911fab745e277370b",
"is_secret": false,
"is_verified": false,
"line_number": 209,
"line_number": 210,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "84de897bbaa1dac9c7e13b27ab2afc2a233a5e4e",
"is_secret": false,
"is_verified": false,
"line_number": 230,
"line_number": 231,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "e952fd77963a8d1e995a104cfee55565780dffed",
"is_secret": false,
"is_verified": false,
"line_number": 247,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "7480f0b7140317bd82ade3c7a9526408304d5a7f",
"is_secret": false,
"is_verified": false,
"line_number": 504,
"line_number": 515,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "6a0a3e8036180c23da91ede4f9d7bbfefd56e1a9",
"is_secret": false,
"is_verified": false,
"line_number": 1074,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "32e8612d8ca77c7ea8374aa7918db8e5df9252ed",
"is_secret": false,
"is_verified": false,
"line_number": 1064,
"line_number": 1096,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -624,11 +656,19 @@
"type": "JSON Web Token",
"verified_result": null
},
{
"hashed_secret": "8516a32b25a73aef393072725adad14498a3c3c9",
"is_secret": false,
"is_verified": false,
"line_number": 208,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "af83c79c5d4a8d171a2ca5aa132013f3020c518a",
"is_secret": false,
"is_verified": false,
"line_number": 801,
"line_number": 843,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -776,7 +816,7 @@
}
]
},
"version": "0.13.1+ibm.46.dss",
"version": "0.13.1+ibm.47.dss",
"word_list": {
"file": null,
"hash": null
Expand Down
Loading

0 comments on commit b16fe8d

Please sign in to comment.