chore: address issues #1

Co-authored-by: Matthew Keezer <[email protected]>

Author: pyrooka

ibm_cloud_sdk_core/token_managers/vpc_instance_token_manager.py

@@ -80,11 +80,9 @@ def request_token(self) -> dict:
         url = self.url + '/instance_identity/v1/iam_token'
 
         if self.iam_profile_crn:
-            request_payload = {
-                'trusted_profile': '{{"crn": "{0}"}}'.format(self.iam_profile_crn)}
+            request_payload = {'trusted_profile': {'crn': self.iam_profile_crn}}
         if self.iam_profile_id:
-            request_payload = {
-                'trusted_profile': '{{"id": "{0}"}}'.format(self.iam_profile_id)}
+            request_payload = {'trusted_profile': {'id': self.iam_profile_id}}
 
         headers = {
             'Content-Type': 'application/json',
@@ -133,7 +131,6 @@ def retrieve_instance_identity_token(self) -> str:
         url = self.url + '/instance_identity/v1/token'
 
         headers = {
-            'version': self.METADATA_SERVICE_VERSION,
             'Content-type': 'application/json',
             'Accept': 'application/json',
             'Metadata-Flavor': 'ibm',
@@ -147,6 +144,7 @@ def retrieve_instance_identity_token(self) -> str:
             method='PUT',
             url=url,
             headers=headers,
+            params={'version': self.METADATA_SERVICE_VERSION},
             data=json.dumps(request_body))
         logging.debug('Returned from VPC \'create_access_token\' operation."')
 

test/test_vpc_instance_token_manager.py

@@ -76,10 +76,10 @@ def test_retrieve_instance_identity_token(caplog):
 
     ii_token = token_manager.retrieve_instance_identity_token()
     assert len(responses.calls) == 1
-    assert responses.calls[0].request.headers['version'] == '2021-09-20'
     assert responses.calls[0].request.headers['Content-Type'] == 'application/json'
     assert responses.calls[0].request.headers['Accept'] == 'application/json'
     assert responses.calls[0].request.headers['Metadata-Flavor'] == 'ibm'
+    assert responses.calls[0].request.params['version'] == '2021-09-20'
     assert responses.calls[0].request.body == '{"expires_in": 300}'
     assert ii_token == TEST_TOKEN
     # Check the logs.
@@ -138,7 +138,7 @@ def mock_retrieve_instance_identity_token():
     assert responses.calls[0].request.headers['Content-Type'] == 'application/json'
     assert responses.calls[0].request.headers['Accept'] == 'application/json'
     assert responses.calls[0].request.headers['Authorization'] == 'Bearer ' + TEST_TOKEN
-    assert responses.calls[0].request.body == '{"trusted_profile": "{\\"crn\\": \\"crn:iam-profile:123\\"}"}'
+    assert responses.calls[0].request.body == '{"trusted_profile": {"crn": "crn:iam-profile:123"}}'
     assert responses.calls[0].request.params['version'] == '2021-09-20'
     # Check the logs.
     #pylint: disable=line-too-long
@@ -171,7 +171,7 @@ def mock_retrieve_instance_identity_token():
     assert responses.calls[0].request.headers['Content-Type'] == 'application/json'
     assert responses.calls[0].request.headers['Accept'] == 'application/json'
     assert responses.calls[0].request.headers['Authorization'] == 'Bearer ' + TEST_TOKEN
-    assert responses.calls[0].request.body == '{"trusted_profile": "{\\"id\\": \\"iam-id-123\\"}"}'
+    assert responses.calls[0].request.body == '{"trusted_profile": {"id": "iam-id-123"}}'
     assert responses.calls[0].request.params['version'] == '2021-09-20'
     # Check the logs.
     #pylint: disable=line-too-long