New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add compute engine metadata client #11

Merged

theacodes merged 7 commits into master from gce-metadata

Oct 7, 2016

Contributor

theacodes commented Oct 6, 2016

/cc @elibixby (original author)


          Add compute engine metadata client

2b518a2

theacodes added this to the 1.0.0 milestone

theacodes assigned bjwatson and dhermes

dhermes reviewed

View reviewed changes

google/auth/_helpers.py

+              def update_query(url, params):
+                  """Updates a URL's query parameters
+                  Replaces any current values if they are already present in the URL.

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

google/auth/_helpers.py

+                  # Parse the query string.
+                  query_params = urllib.parse.parse_qs(parts.query)
+                  # Update the query parameters with the new parameters.
+                  query_params.update(params)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

google/auth/_helpers.py

+                  query_params = {
+                      key: value for key, value
+                      in six.iteritems(query_params)
+                      if value is not None}

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

google/auth/_helpers.py

+                  # Re-encoded the query string.
+                  new_query = urllib.parse.urlencode(query_params, doseq=True)
+                  # Unsplit the url.
+                  new_parts = parts[:4] + (new_query,) + parts[5:]

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

google/auth/compute_engine/_metadata.py

+                              metadata_flavor == _METADATA_FLAVOR_VALUE)
+                  except exceptions.TransportError:
+                      # logger.info('Timeout attempting to reach GCE metadata service.')

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

google/auth/compute_engine/_metadata.py

+                  if response.status == http_client.OK:
+                      content = _helpers.from_bytes(response.data)
+                      if response.headers['content-type'] == 'application/json':
+                          return json.loads(content)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

tests/compute_engine/test__metadata.py

+                      method='GET',
+                      url=_metadata._METADATA_ROOT + PATH,
+                      headers=_metadata._METADATA_HEADERS)
+                  assert result['foo'] == 'bar'

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

tests/compute_engine/test__metadata.py

		headers=_metadata._METADATA_HEADERS)


		@mock.patch('google.auth._helpers.utcnow', return_value=datetime.datetime.min)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

tests/compute_engine/test__metadata.py

+                      url=_metadata._METADATA_ROOT + PATH + '/token',
+                      headers=_metadata._METADATA_HEADERS)
+                  assert token == 'token'
+                  assert expiry == utcnow() + datetime.timedelta(seconds=500)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

tests/compute_engine/test__metadata.py

+                      url=_metadata._METADATA_ROOT + PATH + '/?recursive=True',
+                      headers=_metadata._METADATA_HEADERS)
+                  assert info['foo'] == 'bar'

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Jon Wayne Parrott added 2 commits

October 6, 2016 12:51


          Address review comments

60eb5b4


          Update pylintrc.tests to allow foo and bar sentinels.

61dbe8e

dhermes reviewed

View reviewed changes

pylintrc.tests

               good-names = i, j, k, ex, Run, _,
-                           fh,
+                           fh, foo, bar

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

dhermes reviewed

View reviewed changes

tests/compute_engine/test__metadata.py



		def test_get_success_json(mock_request):
		foo, bar = 'foo', 'bar'

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Jon Wayne Parrott added 3 commits

October 6, 2016 14:12


          Address review comments

d4b4398


          Address review comments

fb6038e


          Add docstring examples

39b9875

dhermes reviewed

View reviewed changes

google/auth/_helpers.py

+                      http://example.com?a=2
+                      >>> update_query(url, {'b': '3'})
+                      http://example.com?a=1&b=3
+                      >> update_query(url, {'a': None, 'b': '3'})

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view


          Add remove argument to update_query

4debe66

dhermes approved these changes

View reviewed changes

Contributor

dhermes left a comment

LGTM

theacodes merged commit 64a9d6e into master

theacodes deleted the gce-metadata branch

October 7, 2016 21:02

theacodes mentioned this pull request

1.0.0 Roadmap #3

Closed

12 tasks

theacodes unassigned bjwatson and dhermes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment