Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d333f3c

Browse files
ShourieGShourieG
authored
[azureblobstorage] - Make OAuth2 tests compatible with latest version of AzIdentity and AzureAD libraries (#47611)
Microsoft in their latest SDK updates to AzureAD and And AzIdentity, have made changes to how their OIDC endpoints are validated. With these changes, when using a custom source for the OIDC endpoints, the "issuer" must be validated against the "authority" (base url). With these changes when we try to inject a custom authority in the http transport, completely separate clients seem to be created internally by the SDK which bypass our custom transport and we are unable to mock the authentication process. Because of this, we are changing the mock authentication to occur on standard Microsoft endpoints which bypass the authority validation as a whole.
1 parent 02ea910 commit d333f3c

5 files changed

Lines changed: 138 additions & 156 deletions

File tree

‎CHANGELOG-developer.next.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ The list below covers the major changes between 7.0.0-rc2 and main only.
118118
- Fixed Fileebat GCP Pub/Sub input integration tests. {pull}45150[45150]
119119
- `mage BuildSystemTestBinary` now build Otel enabled binaries for Filebeat and Metricbeat {pull}45824[45824]
120120
- testing/environments/docker/cometd: update base img version {pull}45889[45889]
121+
- Made Filebeat azureblobstorage input OAuth2 tests compatible with latest version of Azidentity and AzureAD libraries. {pull}47611[47611]
121122

122123
==== Added
123124

‎NOTICE.txt‎

Lines changed: 63 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,11 +1742,11 @@ SOFTWARE.
17421742

17431743
--------------------------------------------------------------------------------
17441744
Dependency : github.com/Azure/azure-sdk-for-go/sdk/azcore
1745-
Version: v1.18.0
1745+
Version: v1.20.0
17461746
Licence type (autodetected): MIT
17471747
--------------------------------------------------------------------------------
17481748

1749-
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go/sdk/azcore@v1.18.0/LICENSE.txt:
1749+
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go/sdk/azcore@v1.20.0/LICENSE.txt:
17501750

17511751
MIT License
17521752

@@ -1773,11 +1773,11 @@ SOFTWARE
17731773

17741774
--------------------------------------------------------------------------------
17751775
Dependency : github.com/Azure/azure-sdk-for-go/sdk/azidentity
1776-
Version: v1.10.1
1776+
Version: v1.13.1
17771777
Licence type (autodetected): MIT
17781778
--------------------------------------------------------------------------------
17791779

1780-
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go/sdk/azidentity@v1.10.1/LICENSE.txt:
1780+
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go/sdk/azidentity@v1.13.1/LICENSE.txt:
17811781

17821782
MIT License
17831783

@@ -15990,11 +15990,11 @@ THE SOFTWARE.
1599015990

1599115991
--------------------------------------------------------------------------------
1599215992
Dependency : github.com/golang-jwt/jwt/v5
15993-
Version: v5.2.2
15993+
Version: v5.3.0
1599415994
Licence type (autodetected): MIT
1599515995
--------------------------------------------------------------------------------
1599615996

15997-
Contents of probable licence file $GOMODCACHE/github.com/golang-jwt/jwt/v5@v5.2.2/LICENSE:
15997+
Contents of probable licence file $GOMODCACHE/github.com/golang-jwt/jwt/v5@v5.3.0/LICENSE:
1599815998

1599915999
Copyright (c) 2012 Dave Grijalva
1600016000
Copyright (c) 2021 golang-jwt maintainers
@@ -28717,11 +28717,11 @@ THE SOFTWARE.
2871728717

2871828718
--------------------------------------------------------------------------------
2871928719
Dependency : golang.org/x/crypto
28720-
Version: v0.41.0
28720+
Version: v0.44.0
2872128721
Licence type (autodetected): BSD-3-Clause
2872228722
--------------------------------------------------------------------------------
2872328723

28724-
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.41.0/LICENSE:
28724+
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.44.0/LICENSE:
2872528725

2872628726
Copyright 2009 The Go Authors.
2872728727

@@ -28754,11 +28754,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2875428754

2875528755
--------------------------------------------------------------------------------
2875628756
Dependency : golang.org/x/mod
28757-
Version: v0.27.0
28757+
Version: v0.29.0
2875828758
Licence type (autodetected): BSD-3-Clause
2875928759
--------------------------------------------------------------------------------
2876028760

28761-
Contents of probable licence file $GOMODCACHE/golang.org/x/mod@v0.27.0/LICENSE:
28761+
Contents of probable licence file $GOMODCACHE/golang.org/x/mod@v0.29.0/LICENSE:
2876228762

2876328763
Copyright 2009 The Go Authors.
2876428764

@@ -28791,11 +28791,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2879128791

2879228792
--------------------------------------------------------------------------------
2879328793
Dependency : golang.org/x/net
28794-
Version: v0.43.0
28794+
Version: v0.47.0
2879528795
Licence type (autodetected): BSD-3-Clause
2879628796
--------------------------------------------------------------------------------
2879728797

28798-
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.43.0/LICENSE:
28798+
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.47.0/LICENSE:
2879928799

2880028800
Copyright 2009 The Go Authors.
2880128801

@@ -28865,11 +28865,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2886528865

2886628866
--------------------------------------------------------------------------------
2886728867
Dependency : golang.org/x/sync
28868-
Version: v0.17.0
28868+
Version: v0.18.0
2886928869
Licence type (autodetected): BSD-3-Clause
2887028870
--------------------------------------------------------------------------------
2887128871

28872-
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.17.0/LICENSE:
28872+
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.18.0/LICENSE:
2887328873

2887428874
Copyright 2009 The Go Authors.
2887528875

@@ -28902,11 +28902,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2890228902

2890328903
--------------------------------------------------------------------------------
2890428904
Dependency : golang.org/x/sys
28905-
Version: v0.36.0
28905+
Version: v0.38.0
2890628906
Licence type (autodetected): BSD-3-Clause
2890728907
--------------------------------------------------------------------------------
2890828908

28909-
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.36.0/LICENSE:
28909+
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.38.0/LICENSE:
2891028910

2891128911
Copyright 2009 The Go Authors.
2891228912

@@ -28939,11 +28939,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2893928939

2894028940
--------------------------------------------------------------------------------
2894128941
Dependency : golang.org/x/term
28942-
Version: v0.34.0
28942+
Version: v0.37.0
2894328943
Licence type (autodetected): BSD-3-Clause
2894428944
--------------------------------------------------------------------------------
2894528945

28946-
Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.34.0/LICENSE:
28946+
Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.37.0/LICENSE:
2894728947

2894828948
Copyright 2009 The Go Authors.
2894928949

@@ -28976,11 +28976,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2897628976

2897728977
--------------------------------------------------------------------------------
2897828978
Dependency : golang.org/x/text
28979-
Version: v0.29.0
28979+
Version: v0.31.0
2898028980
Licence type (autodetected): BSD-3-Clause
2898128981
--------------------------------------------------------------------------------
2898228982

28983-
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.29.0/LICENSE:
28983+
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.31.0/LICENSE:
2898428984

2898528985
Copyright 2009 The Go Authors.
2898628986

@@ -29050,11 +29050,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2905029050

2905129051
--------------------------------------------------------------------------------
2905229052
Dependency : golang.org/x/tools
29053-
Version: v0.36.0
29053+
Version: v0.38.0
2905429054
Licence type (autodetected): BSD-3-Clause
2905529055
--------------------------------------------------------------------------------
2905629056

29057-
Contents of probable licence file $GOMODCACHE/golang.org/x/tools@v0.36.0/LICENSE:
29057+
Contents of probable licence file $GOMODCACHE/golang.org/x/tools@v0.38.0/LICENSE:
2905829058

2905929059
Copyright 2009 The Go Authors.
2906029060

@@ -34442,11 +34442,11 @@ SOFTWARE
3444234442

3444334443
--------------------------------------------------------------------------------
3444434444
Dependency : github.com/Azure/azure-sdk-for-go/sdk/internal
34445-
Version: v1.11.1
34445+
Version: v1.11.2
3444634446
Licence type (autodetected): MIT
3444734447
--------------------------------------------------------------------------------
3444834448

34449-
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go/sdk/[email protected].1/LICENSE.txt:
34449+
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go/sdk/[email protected].2/LICENSE.txt:
3445034450

3445134451
MIT License
3445234452

@@ -36588,11 +36588,11 @@ Contents of probable licence file $GOMODCACHE/github.com/!azure!a!d/microsoft-au
3658836588

3658936589
--------------------------------------------------------------------------------
3659036590
Dependency : github.com/AzureAD/microsoft-authentication-library-for-go
36591-
Version: v1.4.2
36591+
Version: v1.6.0
3659236592
Licence type (autodetected): MIT
3659336593
--------------------------------------------------------------------------------
3659436594

36595-
Contents of probable licence file $GOMODCACHE/github.com/!azure!a!d/microsoft-authentication-library-for-go@v1.4.2/LICENSE:
36595+
Contents of probable licence file $GOMODCACHE/github.com/!azure!a!d/microsoft-authentication-library-for-go@v1.6.0/LICENSE:
3659636596

3659736597
MIT License
3659836598

@@ -44315,37 +44315,6 @@ THE SOFTWARE.
4431544315

4431644316

4431744317

44318-
--------------------------------------------------------------------------------
44319-
Dependency : github.com/dgryski/go-rendezvous
44320-
Version: v0.0.0-20200823014737-9f7001d12a5f
44321-
Licence type (autodetected): MIT
44322-
--------------------------------------------------------------------------------
44323-
44324-
Contents of probable licence file $GOMODCACHE/github.com/dgryski/[email protected]/LICENSE:
44325-
44326-
The MIT License (MIT)
44327-
44328-
Copyright (c) 2017-2020 Damian Gryski <[email protected]>
44329-
44330-
Permission is hereby granted, free of charge, to any person obtaining a copy
44331-
of this software and associated documentation files (the "Software"), to deal
44332-
in the Software without restriction, including without limitation the rights
44333-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
44334-
copies of the Software, and to permit persons to whom the Software is
44335-
furnished to do so, subject to the following conditions:
44336-
44337-
The above copyright notice and this permission notice shall be included in
44338-
all copies or substantial portions of the Software.
44339-
44340-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
44341-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
44342-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
44343-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
44344-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
44345-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
44346-
THE SOFTWARE.
44347-
44348-
4434944318
--------------------------------------------------------------------------------
4435044319
Dependency : github.com/dimchansky/utfbom
4435144320
Version: v1.1.0
@@ -63203,41 +63172,6 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected]
6320363172
limitations under the License.
6320463173

6320563174

63206-
--------------------------------------------------------------------------------
63207-
Dependency : github.com/redis/go-redis/v9
63208-
Version: v9.8.0
63209-
Licence type (autodetected): BSD-2-Clause
63210-
--------------------------------------------------------------------------------
63211-
63212-
Contents of probable licence file $GOMODCACHE/github.com/redis/go-redis/[email protected]/LICENSE:
63213-
63214-
Copyright (c) 2013 The github.com/redis/go-redis Authors.
63215-
All rights reserved.
63216-
63217-
Redistribution and use in source and binary forms, with or without
63218-
modification, are permitted provided that the following conditions are
63219-
met:
63220-
63221-
* Redistributions of source code must retain the above copyright
63222-
notice, this list of conditions and the following disclaimer.
63223-
* Redistributions in binary form must reproduce the above
63224-
copyright notice, this list of conditions and the following disclaimer
63225-
in the documentation and/or other materials provided with the
63226-
distribution.
63227-
63228-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
63229-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
63230-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
63231-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
63232-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
63233-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
63234-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
63235-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
63236-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
63237-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
63238-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
63239-
63240-
6324163175
--------------------------------------------------------------------------------
6324263176
Dependency : github.com/rogpeppe/go-internal
6324363177
Version: v1.14.1
@@ -80702,6 +80636,43 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
8070280636
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8070380637

8070480638

80639+
--------------------------------------------------------------------------------
80640+
Dependency : golang.org/x/telemetry
80641+
Version: v0.0.0-20251008203120-078029d740a8
80642+
Licence type (autodetected): BSD-3-Clause
80643+
--------------------------------------------------------------------------------
80644+
80645+
Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]/LICENSE:
80646+
80647+
Copyright 2009 The Go Authors.
80648+
80649+
Redistribution and use in source and binary forms, with or without
80650+
modification, are permitted provided that the following conditions are
80651+
met:
80652+
80653+
* Redistributions of source code must retain the above copyright
80654+
notice, this list of conditions and the following disclaimer.
80655+
* Redistributions in binary form must reproduce the above
80656+
copyright notice, this list of conditions and the following disclaimer
80657+
in the documentation and/or other materials provided with the
80658+
distribution.
80659+
* Neither the name of Google LLC nor the names of its
80660+
contributors may be used to endorse or promote products derived from
80661+
this software without specific prior written permission.
80662+
80663+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
80664+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
80665+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
80666+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
80667+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
80668+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
80669+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
80670+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
80671+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
80672+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
80673+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
80674+
80675+
8070580676
--------------------------------------------------------------------------------
8070680677
Dependency : golang.org/x/xerrors
8070780678
Version: v0.0.0-20240903120638-7835f813f4da

‎go.mod‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ require (
122122
go.etcd.io/bbolt v1.4.0
123123
go.uber.org/multierr v1.11.0 // indirect
124124
go.uber.org/zap v1.27.0
125-
golang.org/x/crypto v0.41.0
126-
golang.org/x/mod v0.27.0
127-
golang.org/x/net v0.43.0
125+
golang.org/x/crypto v0.44.0
126+
golang.org/x/mod v0.29.0
127+
golang.org/x/net v0.47.0
128128
golang.org/x/oauth2 v0.30.0
129-
golang.org/x/sync v0.17.0
130-
golang.org/x/sys v0.36.0
131-
golang.org/x/text v0.29.0
129+
golang.org/x/sync v0.18.0
130+
golang.org/x/sys v0.38.0
131+
golang.org/x/text v0.31.0
132132
golang.org/x/time v0.12.0
133-
golang.org/x/tools v0.36.0
133+
golang.org/x/tools v0.38.0
134134
google.golang.org/api v0.238.0
135135
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
136136
google.golang.org/grpc v1.75.1
@@ -149,8 +149,8 @@ require (
149149
cloud.google.com/go v0.121.0
150150
cloud.google.com/go/compute v1.37.0
151151
cloud.google.com/go/redis v1.18.2
152-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
153-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1
152+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0
153+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
154154
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.3.1
155155
github.com/Azure/azure-sdk-for-go/sdk/monitor/query/azmetrics v1.1.0
156156
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0
@@ -188,7 +188,7 @@ require (
188188
github.com/go-ole/go-ole v1.3.0
189189
github.com/go-resty/resty/v2 v2.16.5
190190
github.com/gofrs/uuid/v5 v5.3.2
191-
github.com/golang-jwt/jwt/v5 v5.2.2
191+
github.com/golang-jwt/jwt/v5 v5.3.0
192192
github.com/google/cel-go v0.25.0
193193
github.com/googleapis/gax-go/v2 v2.14.2
194194
github.com/gorilla/handlers v1.5.1
@@ -225,7 +225,7 @@ require (
225225
go.opentelemetry.io/collector/pdata v1.43.0
226226
go.opentelemetry.io/collector/receiver v1.43.0
227227
go.uber.org/mock v0.5.0
228-
golang.org/x/term v0.34.0
228+
golang.org/x/term v0.37.0
229229
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5
230230
gopkg.in/natefinch/lumberjack.v2 v2.2.1
231231
gopkg.in/yaml.v3 v3.0.1
@@ -270,7 +270,7 @@ require (
270270
filippo.io/edwards25519 v1.1.0 // indirect
271271
github.com/Azure/azure-amqp-common-go/v4 v4.2.0 // indirect
272272
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
273-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
273+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
274274
github.com/Azure/go-amqp v1.3.0 // indirect
275275
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
276276
github.com/Azure/go-autorest/autorest/adal v0.9.24 // indirect
@@ -279,7 +279,7 @@ require (
279279
github.com/Azure/go-autorest/logger v0.2.1 // indirect
280280
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
281281
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
282-
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
282+
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
283283
github.com/BurntSushi/toml v1.4.0 // indirect
284284
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
285285
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
@@ -491,6 +491,7 @@ require (
491491
go.yaml.in/yaml/v2 v2.4.2 // indirect
492492
go.yaml.in/yaml/v3 v3.0.4 // indirect
493493
golang.org/x/exp v0.0.0-20250811191247-51f88131bc50 // indirect
494+
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect
494495
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
495496
gonum.org/v1/gonum v0.16.0 // indirect
496497
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect

0 commit comments

Comments
 (0)