ms_rest_azure2 1.0.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b2bd42f328de92678e9f6989359be8ee8837cc1d25c433e73872a6f2f31f4c9d
|
|
4
|
+
data.tar.gz: d5b1b973584f125500285d4169a4f78616f6147bf3120f98f3bc926c13657580
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 46bd618d8c9d74d59f949908b04a00ddf28cbd06cd1993023ff3ca9d4b5d71e7f23dded200ae9fbaa7b13399fbe833fd81f5a09571c557db11f1f2a97177343b
|
|
7
|
+
data.tar.gz: 3c350c34153bbde8e5e9d0c5e20eb51de924c98cd3dc2d5dce2aa27b3147bf16e28f4e8002b1e042b6ca27b1ab3b23ac79cff39c3122d00855250ab997d8eb8f
|
|
@@ -19,13 +19,13 @@ module MsRestAzure2
|
|
|
19
19
|
|
|
20
20
|
# @return [String] auth token.
|
|
21
21
|
attr_accessor :token
|
|
22
|
-
|
|
22
|
+
|
|
23
23
|
# @return [Time] the date when the current token expires.
|
|
24
24
|
attr_accessor :token_expires_on
|
|
25
|
-
|
|
25
|
+
|
|
26
26
|
# @return [Integer] the amount of time we refresh token before it expires.
|
|
27
27
|
attr_reader :expiration_threshold
|
|
28
|
-
|
|
28
|
+
|
|
29
29
|
# @return [String] the type of token.
|
|
30
30
|
attr_reader :token_type
|
|
31
31
|
|
|
@@ -42,7 +42,7 @@ module MsRestAzure2
|
|
|
42
42
|
|
|
43
43
|
@expiration_threshold = 5 * 60
|
|
44
44
|
end
|
|
45
|
-
|
|
45
|
+
|
|
46
46
|
#
|
|
47
47
|
# Gets an authentication header string using an access token from the Azure cli
|
|
48
48
|
# @param settings [ActiveDirectoryServiceSettings] active directory settings.
|
|
@@ -52,9 +52,9 @@ module MsRestAzure2
|
|
|
52
52
|
acquire_token if token_expired?
|
|
53
53
|
"#{token_type} #{token}"
|
|
54
54
|
end
|
|
55
|
-
|
|
55
|
+
|
|
56
56
|
private
|
|
57
|
-
|
|
57
|
+
|
|
58
58
|
#
|
|
59
59
|
# Checks whether token is about to expire.
|
|
60
60
|
#
|
|
@@ -78,14 +78,14 @@ module MsRestAzure2
|
|
|
78
78
|
|
|
79
79
|
return nil
|
|
80
80
|
end
|
|
81
|
-
|
|
81
|
+
|
|
82
82
|
#
|
|
83
83
|
# Acquires a new access token from teh azure CLI
|
|
84
84
|
#
|
|
85
85
|
# @return [String] The access token to the desired resource
|
|
86
86
|
def acquire_token()
|
|
87
|
-
response_body = JSON.load(
|
|
88
|
-
|
|
87
|
+
response_body = JSON.load(`#{cli_path} account get-access-token -o json --resource #{@settings.token_audience}`)
|
|
88
|
+
|
|
89
89
|
@token_expires_on = Time.parse(response_body['expiresOn'])
|
|
90
90
|
@token_type = response_body['tokenType']
|
|
91
91
|
@token = response_body['accessToken']
|
|
@@ -26,7 +26,7 @@ module MsRestAzure2
|
|
|
26
26
|
attr_accessor :client_id
|
|
27
27
|
|
|
28
28
|
# @return [String] object id for user assigned managed identity
|
|
29
|
-
attr_accessor :
|
|
29
|
+
attr_accessor :identity_object_id
|
|
30
30
|
|
|
31
31
|
# @return [String] ms_res id for user assigned managed identity
|
|
32
32
|
attr_accessor :msi_res_id
|
|
@@ -71,7 +71,7 @@ module MsRestAzure2
|
|
|
71
71
|
@settings = settings
|
|
72
72
|
if !msi_id.nil?
|
|
73
73
|
@client_id = msi_id[:client_id] unless msi_id[:client_id].nil?
|
|
74
|
-
@
|
|
74
|
+
@identity_object_id = msi_id[:object_id] unless msi_id[:object_id].nil?
|
|
75
75
|
@msi_res_id = msi_id[:msi_res_id] unless msi_id[:msi_res_id].nil?
|
|
76
76
|
end
|
|
77
77
|
|
|
@@ -101,7 +101,7 @@ module MsRestAzure2
|
|
|
101
101
|
def acquire_token_from_imds_with_retry
|
|
102
102
|
token_acquire_url = IMDS_TOKEN_ACQUIRE_URL.dup + "?" + append_header('resource', ERB::Util.url_encode(@settings.token_audience)) + '&' + append_header('api-version', '2018-02-01')
|
|
103
103
|
token_acquire_url = (token_acquire_url + '&' + append_header('client_id', ERB::Util.url_encode(@client_id))) unless @client_id.nil?
|
|
104
|
-
token_acquire_url = (token_acquire_url + '&' + append_header('object_id', ERB::Util.url_encode(@
|
|
104
|
+
token_acquire_url = (token_acquire_url + '&' + append_header('object_id', ERB::Util.url_encode(@identity_object_id))) unless @identity_object_id.nil?
|
|
105
105
|
token_acquire_url = (token_acquire_url + '&' + append_header('msi_res_id', ERB::Util.url_encode(@msi_res_id))) unless @msi_res_id.nil?
|
|
106
106
|
url = URI.parse(token_acquire_url)
|
|
107
107
|
|
|
@@ -180,7 +180,7 @@ module MsRestAzure2
|
|
|
180
180
|
request_body = REQUEST_BODY_PATTERN.dup
|
|
181
181
|
request_body['{resource_uri}'] = ERB::Util.url_encode(@settings.token_audience)
|
|
182
182
|
request_body = set_msi_id(request_body, 'client_id', @client_id) unless @client_id.nil?
|
|
183
|
-
request_body = set_msi_id(request_body, 'object_id', @
|
|
183
|
+
request_body = set_msi_id(request_body, 'object_id', @identity_object_id) unless @identity_object_id.nil?
|
|
184
184
|
request_body = set_msi_id(request_body, 'msi_res_id', @msi_res_id) unless @msi_res_id.nil?
|
|
185
185
|
|
|
186
186
|
response = connection.post do |request|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ms_rest_azure2
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.2.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Microsoft Corporation
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2025-12-16 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -52,6 +52,20 @@ dependencies:
|
|
|
52
52
|
- - "~>"
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
54
|
version: '3.3'
|
|
55
|
+
- !ruby/object:Gem::Dependency
|
|
56
|
+
name: ostruct
|
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
|
58
|
+
requirements:
|
|
59
|
+
- - ">="
|
|
60
|
+
- !ruby/object:Gem::Version
|
|
61
|
+
version: '0'
|
|
62
|
+
type: :development
|
|
63
|
+
prerelease: false
|
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
65
|
+
requirements:
|
|
66
|
+
- - ">="
|
|
67
|
+
- !ruby/object:Gem::Version
|
|
68
|
+
version: '0'
|
|
55
69
|
- !ruby/object:Gem::Dependency
|
|
56
70
|
name: concurrent-ruby
|
|
57
71
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -75,7 +89,7 @@ dependencies:
|
|
|
75
89
|
version: '0.9'
|
|
76
90
|
- - "<"
|
|
77
91
|
- !ruby/object:Gem::Version
|
|
78
|
-
version:
|
|
92
|
+
version: '3'
|
|
79
93
|
type: :runtime
|
|
80
94
|
prerelease: false
|
|
81
95
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -85,21 +99,35 @@ dependencies:
|
|
|
85
99
|
version: '0.9'
|
|
86
100
|
- - "<"
|
|
87
101
|
- !ruby/object:Gem::Version
|
|
88
|
-
version:
|
|
102
|
+
version: '3'
|
|
103
|
+
- !ruby/object:Gem::Dependency
|
|
104
|
+
name: faraday-retry
|
|
105
|
+
requirement: !ruby/object:Gem::Requirement
|
|
106
|
+
requirements:
|
|
107
|
+
- - "~>"
|
|
108
|
+
- !ruby/object:Gem::Version
|
|
109
|
+
version: '2.0'
|
|
110
|
+
type: :runtime
|
|
111
|
+
prerelease: false
|
|
112
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
113
|
+
requirements:
|
|
114
|
+
- - "~>"
|
|
115
|
+
- !ruby/object:Gem::Version
|
|
116
|
+
version: '2.0'
|
|
89
117
|
- !ruby/object:Gem::Dependency
|
|
90
|
-
name: faraday-
|
|
118
|
+
name: faraday-cookie_jar2
|
|
91
119
|
requirement: !ruby/object:Gem::Requirement
|
|
92
120
|
requirements:
|
|
93
121
|
- - "~>"
|
|
94
122
|
- !ruby/object:Gem::Version
|
|
95
|
-
version: 0.0
|
|
123
|
+
version: 0.1.0
|
|
96
124
|
type: :runtime
|
|
97
125
|
prerelease: false
|
|
98
126
|
version_requirements: !ruby/object:Gem::Requirement
|
|
99
127
|
requirements:
|
|
100
128
|
- - "~>"
|
|
101
129
|
- !ruby/object:Gem::Version
|
|
102
|
-
version: 0.0
|
|
130
|
+
version: 0.1.0
|
|
103
131
|
- !ruby/object:Gem::Dependency
|
|
104
132
|
name: ms_rest2
|
|
105
133
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -152,7 +180,7 @@ metadata:
|
|
|
152
180
|
changelog_uri: https://github.com/chef/azure-sdk-for-ruby/blob/master/runtime/ms_rest_azure/CHANGELOG.md
|
|
153
181
|
documentation_uri: https://azure.microsoft.com/en-us/develop/ruby/
|
|
154
182
|
homepage_uri: https://github.com/chef/azure-sdk-for-ruby
|
|
155
|
-
source_code_uri: https://github.com/chef/azure-sdk-for-ruby/tree/ms_rest_azure-v1.
|
|
183
|
+
source_code_uri: https://github.com/chef/azure-sdk-for-ruby/tree/ms_rest_azure-v1.2.0
|
|
156
184
|
post_install_message:
|
|
157
185
|
rdoc_options: []
|
|
158
186
|
require_paths:
|